Merge e268dff into 72213a0

Author: VPolka

ydb/core/kqp/compile_service/kqp_compile_service.cpp

@@ -41,6 +41,9 @@ class TKqpQueryCache {
         YQL_ENSURE(compileResult->PreparedQuery);
 
         auto queryIt = QueryIndex.emplace(query, compileResult->Uid);
+        if (!queryIt.second) {
+            EraseByUid(compileResult->Uid);
+        }
         Y_ENSURE(queryIt.second);
     }
 
@@ -943,6 +946,9 @@ class TKqpCompileService : public TActorBootstrapped<TKqpCompileService> {
         if (QueryCache.FindByUid(compileResult->Uid, false)) {
             QueryCache.Replace(compileResult);
         } else if (keepInCache) {
+            if (QueryCache.FindByQuery(query, keepInCache)) {
+                LOG_ERROR_S(ctx, NKikimrServices::KQP_COMPILE_SERVICE, "Trying to insert query into compile cache when it is already there");
+            }
             if (QueryCache.Insert(compileResult, TableServiceConfig.GetEnableAstCache(), isPerStatementExecution)) {
                 Counters->CompileQueryCacheEvicted->Inc();
             }
@@ -1048,6 +1054,9 @@ class TKqpCompileService : public TActorBootstrapped<TKqpCompileService> {
         if (compileResult->Ast && QueryCache.FindByAst(query, *compileResult->Ast, keepInCache)) {
             return false;
         }
+        if (QueryCache.FindByQuery(query, keepInCache)) {
+            LOG_ERROR_S(ctx, NKikimrServices::KQP_COMPILE_SERVICE, "Trying to insert query into compile cache when it is already there");
+        }
         auto newCompileResult = TKqpCompileResult::Make(CreateGuidAsString(), compileResult->Status, compileResult->Issues, compileResult->MaxReadType, std::move(query), compileResult->Ast);
         newCompileResult->AllowCache = compileResult->AllowCache;
         newCompileResult->PreparedQuery = compileResult->PreparedQuery;