diff --git a/config/benchmarking_latency.conf b/config/benchmarking_latency.conf index a0dfc267d..2eea435cd 100644 --- a/config/benchmarking_latency.conf +++ b/config/benchmarking_latency.conf @@ -32,8 +32,5 @@ # database recovering is disabled by default --snapshot-recover-on-startup=false -# use ast caching ---ast-cache=true - # number of workers --num-workers=1 diff --git a/config/benchmarking_throughput.conf b/config/benchmarking_throughput.conf index 27332280d..e6a128c20 100644 --- a/config/benchmarking_throughput.conf +++ b/config/benchmarking_throughput.conf @@ -24,5 +24,3 @@ # database recovering is disabled by default --snapshot-recover-on-startup=false -# use ast caching ---ast-cache=true diff --git a/config/stress.conf b/config/stress.conf index 0d2fe750c..69e63d465 100644 --- a/config/stress.conf +++ b/config/stress.conf @@ -24,5 +24,3 @@ # database recovering is disabled by default --snapshot-recover-on-startup=false -# use ast caching ---ast-cache=true diff --git a/config/testing.conf b/config/testing.conf index 5d5b04e09..da8c153d8 100644 --- a/config/testing.conf +++ b/config/testing.conf @@ -24,5 +24,3 @@ # database recovering is disabled by default --snapshot-recover-on-startup=false -# use ast caching ---ast-cache=true diff --git a/docs/user_technical/installation.md b/docs/user_technical/installation.md index bd2a5f16e..b9b5d966f 100644 --- a/docs/user_technical/installation.md +++ b/docs/user_technical/installation.md @@ -75,7 +75,6 @@ parameters: --snapshot-recover-on-startup | bool | false | Recover the database on startup using the last
stored snapshot. --query-execution-time-sec | integer | 180 | Maximum allowed query execution time.
Queries exceeding this limit will be aborted. Value of -1 means no limit. --memory-warning-threshold | integer | 1024 | Memory warning threshold, in MB. If Memgraph detects there is less available RAM available it will log a warning. Set to 0 to disable. - --ast-cache | bool | true | Use AST caching. --query-plan-cache | bool Cache generated query plans. --query-plan-cache-ttl | int | 60 | Time to live for cached query plans, in seconds. --query-cost-planner | bool | true | Use the cost-estimating query planner. diff --git a/src/query/interpreter.cpp b/src/query/interpreter.cpp index 116f22caf..cc3cd42d1 100644 --- a/src/query/interpreter.cpp +++ b/src/query/interpreter.cpp @@ -5,10 +5,6 @@ #include "query/plan/vertex_count_cache.hpp" #include "utils/flag_validation.hpp" -// TODO: Remove this flag. Ast caching can be disabled by setting this flag to -// false, this is useful for recerating antlr crashes in highly concurrent test. -// Once antlr bugs are fixed, or real test is written this flag can be removed. -DEFINE_bool(ast_cache, true, "Use ast caching."); DEFINE_bool(query_cost_planner, true, "Use the cost-estimating query planner."); DEFINE_bool(query_plan_cache, true, "Cache generated query plans"); diff --git a/src/query/interpreter.hpp b/src/query/interpreter.hpp index ef7696f88..0c1b7fadf 100644 --- a/src/query/interpreter.hpp +++ b/src/query/interpreter.hpp @@ -18,8 +18,6 @@ #include "threading/sync/spinlock.hpp" #include "utils/timer.hpp" -// TODO: Remove ast_cache flag and add flag that limits cache size. -DECLARE_bool(ast_cache); DECLARE_bool(query_cost_planner); DECLARE_bool(query_plan_cache); DECLARE_int32(query_plan_cache_ttl); @@ -62,15 +60,9 @@ class Interpreter { void Interpret(const std::string &query, GraphDbAccessor &db_accessor, Stream &stream, const std::map ¶ms) { - if (!FLAGS_ast_cache && !params.empty()) { - // This is totally fine, since we don't really expect anyone to turn off - // the cache. - throw utils::NotYetImplemented( - "Params not implemented if ast cache is turned off"); - } utils::Timer frontend_timer; Context ctx(db_accessor); - ctx.is_query_cached_ = FLAGS_ast_cache; + ctx.is_query_cached_ = true; std::map summary; // query -> stripped query diff --git a/tests/public_benchmark/ldbc/config/memgraph.conf b/tests/public_benchmark/ldbc/config/memgraph.conf index 9dd75a5ab..d45d5f0c7 100644 --- a/tests/public_benchmark/ldbc/config/memgraph.conf +++ b/tests/public_benchmark/ldbc/config/memgraph.conf @@ -23,8 +23,5 @@ --snapshot-recover-on-startup=true -# use ast caching ---ast-cache=true - # number of workers --num-workers=8