tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix usages of constexpr (#367)

Browse Source 
* Fix usages of constexpr
This commit is contained in:
János Benjamin Antal
2022-03-31 13:52:43 +02:00
committed by GitHub
parent 5822b44b15
commit 537855a0b2
75 changed files with 372 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
tests/unit/cypher_main_visitor.cpp
View File

@@ -3019,8 +3019,8 @@ void CheckParsedCallProcedure(const CypherQuery &query, Base &ast_generator,
TEST_P(CypherMainVisitorTest, CallProcedureMultipleQueryPartsAfter) {
auto &ast_generator = *GetParam();
constexpr std::string_view fst{"fst"};
constexpr std::string_view snd{"snd"};
static constexpr std::string_view fst{"fst"};
static constexpr std::string_view snd{"snd"};
const std::vector args{fst, snd};
const auto read_proc = CreateProcByType(ProcedureType::READ, args);
@@ -3035,8 +3035,8 @@ TEST_P(CypherMainVisitorTest, CallProcedureMultipleQueryPartsAfter) {
SCOPED_TRACE("Read query part");
{
SCOPED_TRACE("With WITH");
constexpr std::string_view kQueryWithWith{"CALL {}() YIELD {},{} WITH {},{} UNWIND {} as u RETURN u"};
constexpr size_t kQueryParts{4};
static constexpr std::string_view kQueryWithWith{"CALL {}() YIELD {},{} WITH {},{} UNWIND {} as u RETURN u"};
static constexpr size_t kQueryParts{4};
{
SCOPED_TRACE("Write proc");
const auto query_str = fmt::format(kQueryWithWith, write_proc, fst, snd, fst, snd, fst);
@@ -3054,8 +3054,8 @@ TEST_P(CypherMainVisitorTest, CallProcedureMultipleQueryPartsAfter) {
}
{
SCOPED_TRACE("Without WITH");
constexpr std::string_view kQueryWithoutWith{"CALL {}() YIELD {},{} UNWIND {} as u RETURN u"};
constexpr size_t kQueryParts{3};
static constexpr std::string_view kQueryWithoutWith{"CALL {}() YIELD {},{} UNWIND {} as u RETURN u"};
static constexpr size_t kQueryParts{3};
{
SCOPED_TRACE("Write proc");
const auto query_str = fmt::format(kQueryWithoutWith, write_proc, fst, snd, fst);
@@ -3076,8 +3076,9 @@ TEST_P(CypherMainVisitorTest, CallProcedureMultipleQueryPartsAfter) {
SCOPED_TRACE("Write query part");
{
SCOPED_TRACE("With WITH");
constexpr std::string_view kQueryWithWith{"CALL {}() YIELD {},{} WITH {},{} CREATE(n {{prop : {}}}) RETURN n"};
constexpr size_t kQueryParts{4};
static constexpr std::string_view kQueryWithWith{
"CALL {}() YIELD {},{} WITH {},{} CREATE(n {{prop : {}}}) RETURN n"};
static constexpr size_t kQueryParts{4};
{
SCOPED_TRACE("Write proc");
const auto query_str = fmt::format(kQueryWithWith, write_proc, fst, snd, fst, snd, fst);
@@ -3095,8 +3096,8 @@ TEST_P(CypherMainVisitorTest, CallProcedureMultipleQueryPartsAfter) {
}
{
SCOPED_TRACE("Without WITH");
constexpr std::string_view kQueryWithoutWith{"CALL {}() YIELD {},{} CREATE(n {{prop : {}}}) RETURN n"};
constexpr size_t kQueryParts{3};
static constexpr std::string_view kQueryWithoutWith{"CALL {}() YIELD {},{} CREATE(n {{prop : {}}}) RETURN n"};
static constexpr size_t kQueryParts{3};
{
SCOPED_TRACE("Write proc");
const auto query_str = fmt::format(kQueryWithoutWith, write_proc, fst, snd, fst);
@@ -3117,8 +3118,8 @@ TEST_P(CypherMainVisitorTest, CallProcedureMultipleQueryPartsAfter) {
TEST_P(CypherMainVisitorTest, CallProcedureMultipleQueryPartsBefore) {
auto &ast_generator = *GetParam();
constexpr std::string_view fst{"fst"};
constexpr std::string_view snd{"snd"};
static constexpr std::string_view fst{"fst"};
static constexpr std::string_view snd{"snd"};
const std::vector args{fst, snd};
const auto read_proc = CreateProcByType(ProcedureType::READ, args);
@@ -3131,8 +3132,8 @@ TEST_P(CypherMainVisitorTest, CallProcedureMultipleQueryPartsBefore) {
};
{
SCOPED_TRACE("Read query part");
constexpr std::string_view kQueryWithReadQueryPart{"MATCH (n) CALL {}() YIELD * RETURN *"};
constexpr size_t kQueryParts{3};
static constexpr std::string_view kQueryWithReadQueryPart{"MATCH (n) CALL {}() YIELD * RETURN *"};
static constexpr size_t kQueryParts{3};
{
SCOPED_TRACE("Write proc");
const auto query_str = fmt::format(kQueryWithReadQueryPart, write_proc);
@@ -3150,8 +3151,8 @@ TEST_P(CypherMainVisitorTest, CallProcedureMultipleQueryPartsBefore) {
}
{
SCOPED_TRACE("Write query part");
constexpr std::string_view kQueryWithWriteQueryPart{"CREATE (n) WITH n CALL {}() YIELD * RETURN *"};
constexpr size_t kQueryParts{4};
static constexpr std::string_view kQueryWithWriteQueryPart{"CREATE (n) WITH n CALL {}() YIELD * RETURN *"};
static constexpr size_t kQueryParts{4};
{
SCOPED_TRACE("Write proc");
const auto query_str = fmt::format(kQueryWithWriteQueryPart, write_proc, fst, snd, fst);
@@ -3170,8 +3171,8 @@ TEST_P(CypherMainVisitorTest, CallProcedureMultipleQueryPartsBefore) {
TEST_P(CypherMainVisitorTest, CallProcedureMultipleProcedures) {
auto &ast_generator = *GetParam();
constexpr std::string_view fst{"fst"};
constexpr std::string_view snd{"snd"};
static constexpr std::string_view fst{"fst"};
static constexpr std::string_view snd{"snd"};
const std::vector args{fst, snd};
const auto read_proc = CreateProcByType(ProcedureType::READ, args);
@@ -3180,7 +3181,7 @@ TEST_P(CypherMainVisitorTest, CallProcedureMultipleProcedures) {
{
SCOPED_TRACE("Read then write");
const auto query_str = fmt::format("CALL {}() YIELD * CALL {}() YIELD * RETURN *", read_proc, write_proc);
constexpr size_t kQueryParts{3};
static constexpr size_t kQueryParts{3};
const auto *query = dynamic_cast<CypherQuery *>(ast_generator.ParseQuery(query_str));
ASSERT_NE(query, nullptr);
@@ -3501,22 +3502,22 @@ TEST_P(CypherMainVisitorTest, CreateTriggers) {
TestInvalidQuery("CREATE TRIGGER trigger ON UPDTE AFTER COMMIT EXECUTE a", ast_generator);
TestInvalidQuery("CREATE TRIGGER trigger ON UPDATE COMMIT EXECUTE a", ast_generator);
constexpr std::string_view query_template = "CREATE TRIGGER trigger {} {} COMMIT EXECUTE {}";
static constexpr std::string_view query_template = "CREATE TRIGGER trigger {} {} COMMIT EXECUTE {}";
constexpr std::array events{std::pair{"", memgraph::query::TriggerQuery::EventType::ANY},
std::pair{"ON CREATE", memgraph::query::TriggerQuery::EventType::CREATE},
std::pair{"ON () CREATE", memgraph::query::TriggerQuery::EventType::VERTEX_CREATE},
std::pair{"ON --> CREATE", memgraph::query::TriggerQuery::EventType::EDGE_CREATE},
std::pair{"ON DELETE", memgraph::query::TriggerQuery::EventType::DELETE},
std::pair{"ON () DELETE", memgraph::query::TriggerQuery::EventType::VERTEX_DELETE},
std::pair{"ON --> DELETE", memgraph::query::TriggerQuery::EventType::EDGE_DELETE},
std::pair{"ON UPDATE", memgraph::query::TriggerQuery::EventType::UPDATE},
std::pair{"ON () UPDATE", memgraph::query::TriggerQuery::EventType::VERTEX_UPDATE},
std::pair{"ON --> UPDATE", memgraph::query::TriggerQuery::EventType::EDGE_UPDATE}};
static constexpr std::array events{std::pair{"", memgraph::query::TriggerQuery::EventType::ANY},
std::pair{"ON CREATE", memgraph::query::TriggerQuery::EventType::CREATE},
std::pair{"ON () CREATE", memgraph::query::TriggerQuery::EventType::VERTEX_CREATE},
std::pair{"ON --> CREATE", memgraph::query::TriggerQuery::EventType::EDGE_CREATE},
std::pair{"ON DELETE", memgraph::query::TriggerQuery::EventType::DELETE},
std::pair{"ON () DELETE", memgraph::query::TriggerQuery::EventType::VERTEX_DELETE},
std::pair{"ON --> DELETE", memgraph::query::TriggerQuery::EventType::EDGE_DELETE},
std::pair{"ON UPDATE", memgraph::query::TriggerQuery::EventType::UPDATE},
std::pair{"ON () UPDATE", memgraph::query::TriggerQuery::EventType::VERTEX_UPDATE},
std::pair{"ON --> UPDATE", memgraph::query::TriggerQuery::EventType::EDGE_UPDATE}};
constexpr std::array phases{"BEFORE", "AFTER"};
static constexpr std::array phases{"BEFORE", "AFTER"};
constexpr std::array statements{
static constexpr std::array statements{
"", "SOME SUPER\nSTATEMENT", "Statement with 12312321 3 ", " Statement with 12312321 3 "
};
@@ -3553,15 +3554,16 @@ TEST_P(CypherMainVisitorTest, SetIsolationLevelQuery) {
TestInvalidQuery("SET GLOBAL TRANSACTION ISOLATION LEVEL READ_COMITTED", ast_generator);
TestInvalidQuery("SET SESSION TRANSACTION ISOLATION LEVEL READCOMITTED", ast_generator);
constexpr std::array scopes{std::pair{"GLOBAL", memgraph::query::IsolationLevelQuery::IsolationLevelScope::GLOBAL},
std::pair{"SESSION", memgraph::query::IsolationLevelQuery::IsolationLevelScope::SESSION},
std::pair{"NEXT", memgraph::query::IsolationLevelQuery::IsolationLevelScope::NEXT}};
constexpr std::array isolation_levels{
static constexpr std::array scopes{
std::pair{"GLOBAL", memgraph::query::IsolationLevelQuery::IsolationLevelScope::GLOBAL},
std::pair{"SESSION", memgraph::query::IsolationLevelQuery::IsolationLevelScope::SESSION},
std::pair{"NEXT", memgraph::query::IsolationLevelQuery::IsolationLevelScope::NEXT}};
static constexpr std::array isolation_levels{
std::pair{"READ UNCOMMITTED", memgraph::query::IsolationLevelQuery::IsolationLevel::READ_UNCOMMITTED},
std::pair{"READ COMMITTED", memgraph::query::IsolationLevelQuery::IsolationLevel::READ_COMMITTED},
std::pair{"SNAPSHOT ISOLATION", memgraph::query::IsolationLevelQuery::IsolationLevel::SNAPSHOT_ISOLATION}};
constexpr const auto *query_template = "SET {} TRANSACTION ISOLATION LEVEL {}";
static constexpr const auto *query_template = "SET {} TRANSACTION ISOLATION LEVEL {}";
for (const auto &[scope_string, scope] : scopes) {
for (const auto &[isolation_level_string, isolation_level] : isolation_levels) {
@@ -3765,14 +3767,14 @@ TEST_P(CypherMainVisitorTest, CreateKafkaStream) {
const std::vector<std::string> topic_names{"topic1_name.with_dot", "topic1_name.with_multiple.dots",
"topic-name.with-multiple.dots-and-dashes"};
constexpr std::string_view kStreamName{"SomeSuperStream"};
constexpr std::string_view kTransformName{"moreAwesomeTransform"};
static constexpr std::string_view kStreamName{"SomeSuperStream"};
static constexpr std::string_view kTransformName{"moreAwesomeTransform"};
auto check_topic_names = [&](const std::vector<std::string> &topic_names) {
constexpr std::string_view kConsumerGroup{"ConsumerGru"};
constexpr int kBatchInterval = 324;
static constexpr std::string_view kConsumerGroup{"ConsumerGru"};
static constexpr int kBatchInterval = 324;
const TypedValue batch_interval_value{kBatchInterval};
constexpr int kBatchSize = 1;
static constexpr int kBatchSize = 1;
const TypedValue batch_size_value{kBatchSize};
const auto topic_names_as_str = memgraph::utils::Join(topic_names, ",");
@@ -3855,8 +3857,8 @@ TEST_P(CypherMainVisitorTest, CreateKafkaStream) {
};
using namespace std::literals;
constexpr std::array consumer_groups{"consumergru"sv, "consumer-group-with-dash"sv, "consumer_group.with.dot"sv,
"consumer-group.With-Dot-and.dash"sv};
static constexpr std::array consumer_groups{"consumergru"sv, "consumer-group-with-dash"sv,
"consumer_group.with.dot"sv, "consumer-group.With-Dot-and.dash"sv};
for (const auto consumer_group : consumer_groups) {
EXPECT_NO_FATAL_FAILURE(check_consumer_group(consumer_group));
@@ -3958,11 +3960,11 @@ TEST_P(CypherMainVisitorTest, CreatePulsarStream) {
const std::vector<std::string> topic_names{"topic1", "topic2"};
const std::string topic_names_str = memgraph::utils::Join(topic_names, ",");
constexpr std::string_view kStreamName{"PulsarStream"};
constexpr std::string_view kTransformName{"boringTransformation"};
constexpr std::string_view kServiceUrl{"localhost"};
constexpr int kBatchSize{1000};
constexpr int kBatchInterval{231321};
static constexpr std::string_view kStreamName{"PulsarStream"};
static constexpr std::string_view kTransformName{"boringTransformation"};
static constexpr std::string_view kServiceUrl{"localhost"};
static constexpr int kBatchSize{1000};
static constexpr int kBatchInterval{231321};
{
SCOPED_TRACE("single topic");