delete query from queryIndex if error during insert (#9231)

ydb-platform · Sep 19, 2024 · 8d55710 · 8d55710
1 parent 89c4688
commit 8d55710
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/ydb/core/kqp/compile_service/kqp_compile_service.cpp b/ydb/core/kqp/compile_service/kqp_compile_service.cpp
@@ -43,6 +43,7 @@ class TKqpQueryCache {
         auto queryIt = QueryIndex.emplace(query, compileResult->Uid);
         if (!queryIt.second) {
             EraseByUid(compileResult->Uid);
+            QueryIndex.erase(query);
         }
         Y_ENSURE(queryIt.second);
     }
@@ -787,6 +788,12 @@ class TKqpCompileService : public TActorBootstrapped<TKqpCompileService> {
             auto query = request.Query ? *request.Query : *compileResult->Query;
             if (compileResult) {
                 query.UserSid = compileResult->Query->UserSid;
+                if (query != *compileResult->Query) {
+                    LOG_WARN_S(ctx, NKikimrServices::KQP_COMPILE_SERVICE, "queryId in recompile request and queryId in cache are different"
+                      << ", queryId in request: " << query.SerializeToString()
+                      << ", queryId in cache: " << compileResult->Query->SerializeToString()
+                    );
+                }
             }
             TKqpCompileRequest compileRequest(ev->Sender, request.Uid, query,
                 compileSettings, request.UserToken, dbCounters, request.GUCSettings, request.ApplicationName,