[Stable-25-3-1] More CTAS fixes (#26314)

nikvas0 · web-flow · commit 0509cfa5f127 · 2025-10-03T16:14:12.000+03:00
diff --git a/ydb/core/grpc_services/rpc_export.cpp b/ydb/core/grpc_services/rpc_export.cpp
@@ -294,6 +294,7 @@ class TExportRPC: public TRpcOperationRequestActor<TDerived, TEvRequest, true>,
                         // Skip children that we don't want to export
                         if (child.Name.StartsWith("~")
                             || child.Name.StartsWith(".sys")
+                            || child.Name.StartsWith(".tmp")
                             || child.Name.StartsWith(".metadata")
                             || child.Name.StartsWith("export-"))
                         {
diff --git a/ydb/core/kqp/common/simple/temp_tables.cpp b/ydb/core/kqp/common/simple/temp_tables.cpp
@@ -10,7 +10,7 @@ TKqpTempTablesState::FindInfo(const std::string_view& path, bool withSessionId)
         return TempTables.find(path);
     }
 
-    const auto temporaryStoragePrefix = CanonizePath(GetSessionDirPath(Database, SessionId)) + "/";
+    const auto temporaryStoragePrefix = CanonizePath(GetSessionDirPath(Database, TempDirName)) + "/";
 
     if (path.size() < temporaryStoragePrefix.size()) {
         return TempTables.end();
@@ -40,16 +40,16 @@ TString GetSessionDirsBasePath(const TString& database) {
     return CanonizePath(JoinPath({database, TmpDirectoryName, SessionsDirectoryName}));
 }
 
-TString GetSessionDirPath(const TString& database, const TString& sessionId) {
-    return CanonizePath(JoinPath({database, TmpDirectoryName, SessionsDirectoryName, sessionId}));
+TString GetSessionDirPath(const TString& database, const TString& tmpDirName) {
+    return CanonizePath(JoinPath({database, TmpDirectoryName, SessionsDirectoryName, tmpDirName}));
 }
 
-TString GetTempTablePath(const TString& database, const TString& sessionId, const TString tablePath) {
-    return CanonizePath(JoinPath({database, TmpDirectoryName, SessionsDirectoryName, sessionId, tablePath}));
+TString GetTempTablePath(const TString& database, const TString& tmpDirName, const TString tablePath) {
+    return CanonizePath(JoinPath({database, TmpDirectoryName, SessionsDirectoryName, tmpDirName, tablePath}));
 }
 
-TString GetCreateTempTablePath(const TString& database, const TString& sessionId, const TString tablePath) {
-    return CanonizePath(JoinPath({TmpDirectoryName, SessionsDirectoryName, sessionId, database, tablePath}));
+TString GetCreateTempTablePath(const TString& database, const TString& tmpDirName, const TString tablePath) {
+    return CanonizePath(JoinPath({TmpDirectoryName, SessionsDirectoryName, tmpDirName, database, tablePath}));
 }
 
 bool IsSessionsDirPath(const TStringBuf database, const TStringBuf path) {
diff --git a/ydb/core/kqp/common/simple/temp_tables.h b/ydb/core/kqp/common/simple/temp_tables.h
@@ -17,10 +17,10 @@ struct TKqpTempTablesState {
         TString WorkingDir;
         TIntrusiveConstPtr<NACLib::TUserToken> UserToken;
     };
-    TString SessionId;
     TString Database;
+    TString TempDirName;
     THashMap<TString, TTempTableInfo> TempTables;
-    bool HasCreateTableAs = false;
+    bool NeedCleaning = false;
 
     using TConstPtr = std::shared_ptr<const TKqpTempTablesState>;
 
@@ -31,9 +31,10 @@ struct TKqpTempTablesState {
 TString GetTmpDirPath(const TString& database);
 TString GetSessionDirName();
 TString GetSessionDirsBasePath(const TString& database);
-TString GetSessionDirPath(const TString& database, const TString& sessionId);
-TString GetTempTablePath(const TString& database, const TString& sessionId, const TString tablePath);
-TString GetCreateTempTablePath(const TString& database, const TString& sessionId, const TString tablePath);
+TString GetSessionDirPath(const TString& database, const TString& tmpDirName);
+TString GetTempTablePath(const TString& database, const TString& tmpDirName, const TString tablePath);
+TString GetCreateTempTablePath(const TString& database, const TString& tmpDirName
+, const TString tablePath);
 
 bool IsSessionsDirPath(const TStringBuf database, const TStringBuf path);
 bool IsSessionsDirPath(const TStringBuf database, const TString& workingDir, const TString& name);
diff --git a/ydb/core/kqp/executer_actor/kqp_executer.h b/ydb/core/kqp/executer_actor/kqp_executer.h
@@ -160,7 +160,7 @@ IActor* CreateKqpSchemeExecuter(
     TKqpPhyTxHolder::TConstPtr phyTx, NKikimrKqp::EQueryType queryType, const TActorId& target,
     const TMaybe<TString>& requestType, const TString& database,
     TIntrusiveConstPtr<NACLib::TUserToken> userToken, const TString& clientAddress,
-    bool temporary, bool isCreateTableAs, TString SessionId, TIntrusivePtr<TUserRequestContext> ctx,
+    bool temporary, bool createTmpDir, bool isCreateTableAs, TString tempDirName, TIntrusivePtr<TUserRequestContext> ctx,
     const TActorId& kqpTempTablesAgentActor = TActorId());
 
 std::unique_ptr<TEvKqpExecuter::TEvTxResponse> ExecuteLiteral(
diff --git a/ydb/core/kqp/executer_actor/kqp_scheme_executer.cpp b/ydb/core/kqp/executer_actor/kqp_scheme_executer.cpp
@@ -76,7 +76,7 @@ class TKqpSchemeExecuter : public TActorBootstrapped<TKqpSchemeExecuter> {
     TKqpSchemeExecuter(
         TKqpPhyTxHolder::TConstPtr phyTx, NKikimrKqp::EQueryType queryType, const TActorId& target, const TMaybe<TString>& requestType,
         const TString& database, TIntrusiveConstPtr<NACLib::TUserToken> userToken, const TString& clientAddress,
-        bool temporary, bool isCreateTableAs, TString sessionId, TIntrusivePtr<TUserRequestContext> ctx,
+        bool temporary, bool createTmpDir, bool isCreateTableAs, TString tempDirName, TIntrusivePtr<TUserRequestContext> ctx,
         const TActorId& kqpTempTablesAgentActor)
         : PhyTx(phyTx)
         , QueryType(queryType)
@@ -85,8 +85,9 @@ class TKqpSchemeExecuter : public TActorBootstrapped<TKqpSchemeExecuter> {
         , UserToken(userToken)
         , ClientAddress(clientAddress)
         , Temporary(temporary)
+        , CreateTmpDir(createTmpDir)
         , IsCreateTableAs(isCreateTableAs)
-        , SessionId(sessionId)
+        , TempDirName(tempDirName)
         , RequestContext(std::move(ctx))
         , RequestType(requestType)
         , KqpTempTablesAgentActor(kqpTempTablesAgentActor)
@@ -153,9 +154,10 @@ class TKqpSchemeExecuter : public TActorBootstrapped<TKqpSchemeExecuter> {
         modifyScheme->SetWorkingDir(GetSessionDirsBasePath(Database));
         modifyScheme->SetOperationType(NKikimrSchemeOp::EOperationType::ESchemeOpMkDir);
         modifyScheme->SetAllowCreateInTempDir(false);
+        modifyScheme->SetFailOnExist(true);
 
         auto* makeDir = modifyScheme->MutableMkDir();
-        makeDir->SetName(SessionId);
+        makeDir->SetName(TempDirName);
         ActorIdToProto(KqpTempTablesAgentActor, modifyScheme->MutableTempDirOwnerActorId());
 
         if (UserToken) {
@@ -327,11 +329,12 @@ class TKqpSchemeExecuter : public TActorBootstrapped<TKqpSchemeExecuter> {
         switch (schemeOp.GetOperationCase()) {
             case NKqpProto::TKqpSchemeOperation::kCreateTable: {
                 auto modifyScheme = schemeOp.GetCreateTable();
+                AFL_ENSURE(!IsCreateTableAs || Temporary);
                 if (Temporary) {
                     auto changePath = [this](NKikimrSchemeOp::TTableDescription* tableDesc) {
                         const auto fullPath = JoinPath({tableDesc->GetPath(), tableDesc->GetName()});
                         YQL_ENSURE(fullPath.size() > 1);
-                        tableDesc->SetName(GetCreateTempTablePath(Database, SessionId, fullPath));
+                        tableDesc->SetName(GetCreateTempTablePath(Database, TempDirName, fullPath));
                         tableDesc->SetPath(Database);
                     };
 
@@ -346,7 +349,7 @@ class TKqpSchemeExecuter : public TActorBootstrapped<TKqpSchemeExecuter> {
                         }
                         case NKikimrSchemeOp::ESchemeOpCreateColumnTable: {
                             modifyScheme.MutableCreateColumnTable()->SetName(
-                                GetCreateTempTablePath(Database, SessionId, modifyScheme.GetCreateColumnTable().GetName()));
+                                GetCreateTempTablePath(Database, TempDirName, modifyScheme.GetCreateColumnTable().GetName()));
                             break;
                         }
                         default:
@@ -367,6 +370,7 @@ class TKqpSchemeExecuter : public TActorBootstrapped<TKqpSchemeExecuter> {
 
             case NKqpProto::TKqpSchemeOperation::kAlterTable: {
                 const auto& modifyScheme = schemeOp.GetAlterTable();
+                AFL_ENSURE(!IsCreateTableAs || modifyScheme.GetOperationType() == NKikimrSchemeOp::ESchemeOpMoveTable);
                 ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
                 break;
             }
@@ -741,7 +745,8 @@ class TKqpSchemeExecuter : public TActorBootstrapped<TKqpSchemeExecuter> {
         } else if (IsCreateTableAs && schemeOp.GetOperationCase() == NKqpProto::TKqpSchemeOperation::kAlterTable) {
             FindWorkingDirForCTAS();
         } else {
-            if (Temporary) {
+            if (CreateTmpDir) {
+                AFL_ENSURE(Temporary);
                 CreateTmpDirectory();
             } else {
                 MakeSchemeOperationRequest();
@@ -800,7 +805,7 @@ class TKqpSchemeExecuter : public TActorBootstrapped<TKqpSchemeExecuter> {
     void Handle(TEvPrivate::TEvMakeSessionDirResult::TPtr& result) {
         if (!result->Get()->Result.Success()) {
             InternalError(TStringBuilder()
-                << "Error creating directory for session " << SessionId
+                << "Error creating directory for session " << TempDirName
                 << ": " << result->Get()->Result.Issues().ToString(true));
         }
         MakeSchemeOperationRequest();
@@ -1097,8 +1102,9 @@ class TKqpSchemeExecuter : public TActorBootstrapped<TKqpSchemeExecuter> {
     const TString ClientAddress;
     std::unique_ptr<TEvKqpExecuter::TEvTxResponse> ResponseEv;
     bool Temporary;
+    bool CreateTmpDir;
     bool IsCreateTableAs;
-    TString SessionId;
+    TString TempDirName;
     ui64 TxId = 0;
     TActorId SchemePipeActorId_;
     ui64 SchemeShardTabletId = 0;
@@ -1113,12 +1119,12 @@ IActor* CreateKqpSchemeExecuter(
     TKqpPhyTxHolder::TConstPtr phyTx, NKikimrKqp::EQueryType queryType, const TActorId& target,
     const TMaybe<TString>& requestType, const TString& database,
     TIntrusiveConstPtr<NACLib::TUserToken> userToken, const TString& clientAddress,
-    bool temporary, bool isCreateTableAs,
-    TString sessionId, TIntrusivePtr<TUserRequestContext> ctx, const TActorId& kqpTempTablesAgentActor)
+    bool temporary, bool createTmpDir, bool isCreateTableAs,
+    TString tempDirName, TIntrusivePtr<TUserRequestContext> ctx, const TActorId& kqpTempTablesAgentActor)
 {
     return new TKqpSchemeExecuter(
         phyTx, queryType, target, requestType, database, userToken, clientAddress,
-        temporary, isCreateTableAs, sessionId, std::move(ctx), kqpTempTablesAgentActor);
+        temporary, createTmpDir, isCreateTableAs, tempDirName, std::move(ctx), kqpTempTablesAgentActor);
 }
 
 } // namespace NKikimr::NKqp
diff --git a/ydb/core/kqp/gateway/kqp_ic_gateway.cpp b/ydb/core/kqp/gateway/kqp_ic_gateway.cpp
@@ -615,7 +615,7 @@ class TKqpSchemeExecuterRequestHandler: public TActorBootstrapped<TKqpSchemeExec
     void Bootstrap() {
         auto ctx = MakeIntrusive<TUserRequestContext>();
         ctx->DatabaseId = DatabaseId;
-        IActor* actor = CreateKqpSchemeExecuter(PhyTx, QueryType, SelfId(), RequestType, Database, UserToken, ClientAddress, false /* temporary */, false /* isCreateTableAs */, TString() /* sessionId */, ctx);
+        IActor* actor = CreateKqpSchemeExecuter(PhyTx, QueryType, SelfId(), RequestType, Database, UserToken, ClientAddress, false /* temporary */, false /* createTmpDir */, false /* isCreateTableAs */, TString() /* sessionId */, ctx);
         Register(actor);
         Become(&TThis::WaitState);
     }
diff --git a/ydb/core/kqp/gateway/kqp_metadata_loader.cpp b/ydb/core/kqp/gateway/kqp_metadata_loader.cpp
@@ -45,7 +45,7 @@ NavigateEntryResult CreateNavigateEntry(const TString& path,
         auto tempTablesInfoIt = tempTablesState->FindInfo(currentPath, false);
         if (tempTablesInfoIt != tempTablesState->TempTables.end()) {
             queryName = currentPath;
-            currentPath = GetTempTablePath(tempTablesState->Database, tempTablesState->SessionId, tempTablesInfoIt->first);
+            currentPath = GetTempTablePath(tempTablesState->Database, tempTablesState->TempDirName, tempTablesInfoIt->first);
         }
     }
     entry.Path = SplitPath(currentPath);
diff --git a/ydb/core/kqp/host/kqp_host.cpp b/ydb/core/kqp/host/kqp_host.cpp
@@ -1130,7 +1130,6 @@ class TKqpHost : public IKqpHost {
         SessionCtx->SetDatabaseId(Gateway->GetDatabaseId());
         SessionCtx->SetCluster(cluster);
         if (tempTablesState) {
-            SessionCtx->SetSessionId(tempTablesState->SessionId);
             SessionCtx->SetTempTables(std::move(tempTablesState));
         }
 
diff --git a/ydb/core/kqp/host/kqp_statement_rewrite.cpp b/ydb/core/kqp/host/kqp_statement_rewrite.cpp
@@ -262,14 +262,14 @@ namespace {
         }
 
         const TString tmpTableName = TStringBuilder()
-            << tableName
-            << "_cas_"
-            << TAppData::RandomProvider->GenUuid4().AsUuidString();
+                << tableName
+                << "_"
+                << TAppData::RandomProvider->GenUuid4().AsUuidString();
 
         const TString createTableName = (TStringBuilder()
                 << CanonizePath(sessionCtx->GetDatabase())
                 << "/.tmp/sessions/"
-                << sessionCtx->GetSessionId()
+                << sessionCtx->GetTempTablesState()->TempDirName
                 << CanonizePath(tmpTableName));
 
         create = exprCtx.ReplaceNode(std::move(create), *columns, exprCtx.NewList(pos, std::move(columnNodes)));
diff --git a/ydb/core/kqp/provider/yql_kikimr_provider.cpp b/ydb/core/kqp/provider/yql_kikimr_provider.cpp
@@ -273,7 +273,7 @@ std::optional<TString> TKikimrTablesData::GetTempTablePath(const TStringBuf& tab
     auto tempTableInfoIt = TempTablesState->FindInfo(table, false);
 
     if (tempTableInfoIt != TempTablesState->TempTables.end()) {
-        return NKikimr::NKqp::GetTempTablePath(TempTablesState->Database, TempTablesState->SessionId, tempTableInfoIt->first);
+        return NKikimr::NKqp::GetTempTablePath(TempTablesState->Database, TempTablesState->TempDirName, tempTableInfoIt->first);
     }
     return std::nullopt;
 }
diff --git a/ydb/core/kqp/provider/yql_kikimr_provider.h b/ydb/core/kqp/provider/yql_kikimr_provider.h
@@ -377,7 +377,7 @@ class TKikimrTransactionContextBase : public TThrRefBase {
             if (TempTablesState) {
                 auto tempTableInfoIt = TempTablesState->FindInfo(table, false);
                 if (tempTableInfoIt != TempTablesState->TempTables.end()) {
-                    table = NKikimr::NKqp::GetTempTablePath(TempTablesState->Database, TempTablesState->SessionId, tempTableInfoIt->first);
+                    table = NKikimr::NKqp::GetTempTablePath(TempTablesState->Database, TempTablesState->TempDirName, tempTableInfoIt->first);
                 }
             }
 
@@ -523,10 +523,6 @@ class TKikimrSessionContext : public TThrRefBase {
         return DatabaseId;
     }
 
-    const TString& GetSessionId() const {
-        return SessionId;
-    }
-
     void SetCluster(const TString& cluster) {
         Cluster = cluster;
     }
@@ -539,10 +535,6 @@ class TKikimrSessionContext : public TThrRefBase {
         DatabaseId = databaseId;
     }
 
-    void SetSessionId(const TString& sessionId) {
-        SessionId = sessionId;
-    }
-
     NKikimr::NKqp::TKqpTempTablesState::TConstPtr GetTempTablesState() const {
         return TempTablesState;
     }
@@ -578,7 +570,6 @@ class TKikimrSessionContext : public TThrRefBase {
     TString Cluster;
     TString Database;
     TString DatabaseId;
-    TString SessionId;
     TKikimrConfiguration::TPtr Configuration;
     TIntrusivePtr<TKikimrTablesData> TablesData;
     TIntrusivePtr<TKikimrQueryContext> QueryCtx;
diff --git a/ydb/core/kqp/runtime/kqp_write_table.cpp b/ydb/core/kqp/runtime/kqp_write_table.cpp
@@ -517,8 +517,6 @@ class TColumnShardPayloadSerializer : public IPayloadSerializer {
                     i64 nextRowSize = rowCalculator.GetRowBytesSize(index);
 
                     if (toPrepareSize + nextRowSize >= (i64)ColumnShardMaxOperationBytes) {
-                        AFL_ENSURE(index > 0);
-
                         toPrepare.push_back(batch->Slice(0, index));
                         unpreparedBatch.Batches.push_front(batch->Slice(index, batch->num_rows() - index));
 
@@ -541,6 +539,7 @@ class TColumnShardPayloadSerializer : public IPayloadSerializer {
                 toPrepare.push_back(batch);
             }
 
+            AFL_ENSURE(!toPrepare.empty() && toPrepare.front()->num_rows() > 0);
             auto batch = MakeIntrusive<TColumnBatch>(NArrow::CombineBatches(toPrepare), Alloc);
             Batches[shardId].emplace_back(batch);
             Memory += batch->GetMemory();
diff --git a/ydb/core/kqp/session_actor/kqp_session_actor.cpp b/ydb/core/kqp/session_actor/kqp_session_actor.cpp
@@ -217,9 +217,9 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
         auto optSessionId = TryDecodeYdbSessionId(SessionId);
         YQL_ENSURE(optSessionId, "Can't decode ydb session Id");
 
-        TempTablesState.SessionId = *optSessionId;
         TempTablesState.Database = Settings.Database;
-        LOG_D("Create session actor with id " << TempTablesState.SessionId);
+        TempTablesState.TempDirName = TAppData::RandomProvider->GenUuid4().AsUuidString();
+        LOG_D("Create session actor with id " <<  *optSessionId << " (tmp dir name: " << TempTablesState.TempDirName << ")");
     }
 
     void Bootstrap() {
@@ -1631,8 +1631,10 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
         const TString requestType = QueryState->GetRequestType();
         const bool temporary = GetTemporaryTableInfo(tx).has_value();
 
-        auto executerActor = CreateKqpSchemeExecuter(tx, QueryState->GetType(), SelfId(), requestType, Settings.Database, userToken, clientAddress,
-            temporary, QueryState->IsCreateTableAs(), TempTablesState.SessionId, QueryState->UserRequestContext, KqpTempTablesAgentActor);
+        auto executerActor = CreateKqpSchemeExecuter(
+            tx, QueryState->GetType(), SelfId(), requestType, Settings.Database, userToken, clientAddress,
+            temporary, /* createTmpDir */ temporary && !TempTablesState.NeedCleaning,
+            QueryState->IsCreateTableAs(), TempTablesState.TempDirName, QueryState->UserRequestContext, KqpTempTablesAgentActor);
 
         ExecuterId = RegisterWithSameMailbox(executerActor);
 
@@ -1908,7 +1910,7 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
             return;
         }
         if (QueryState->IsCreateTableAs()) {
-            TempTablesState.HasCreateTableAs = true;
+            TempTablesState.NeedCleaning = true;
             QueryState->UpdateTempTablesState(TempTablesState);
             return;
         }
@@ -1917,6 +1919,7 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
         if (optInfo) {
             auto [isCreate, info] = *optInfo;
             if (isCreate) {
+                TempTablesState.NeedCleaning = true;
                 TempTablesState.TempTables[info.first] = info.second;
             } else {
                 TempTablesState.TempTables.erase(info.first);
diff --git a/ydb/core/kqp/session_actor/kqp_temp_tables_manager.cpp b/ydb/core/kqp/session_actor/kqp_temp_tables_manager.cpp
@@ -59,13 +59,14 @@ class TKqpTempTablesManager : public TActorBootstrapped<TKqpTempTablesManager> {
     {}
 
     void Bootstrap() {
-        if (TempTablesState.TempTables.empty() && !TempTablesState.HasCreateTableAs) {
+        if (!TempTablesState.NeedCleaning) {
+            AFL_ENSURE(TempTablesState.TempTables.empty());
             Finish();
             return;
         }
 
         PathsToTraverse.push_back(
-            NKikimr::SplitPath(GetSessionDirPath(Database, TempTablesState.SessionId)));
+            NKikimr::SplitPath(GetSessionDirPath(Database, TempTablesState.TempDirName)));
         TraverseNext();
         Become(&TKqpTempTablesManager::PathSearchState);
     }
diff --git a/ydb/core/kqp/ut/scheme/kqp_acl_ut.cpp b/ydb/core/kqp/ut/scheme/kqp_acl_ut.cpp
diff --git a/ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp b/ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp
diff --git a/ydb/core/sys_view/ut_kqp.cpp b/ydb/core/sys_view/ut_kqp.cpp
diff --git a/ydb/core/tx/replication/controller/target_discoverer.cpp b/ydb/core/tx/replication/controller/target_discoverer.cpp

Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,7 @@ class TExportRPC: public TRpcOperationRequestActor<TDerived, TEvRequest, true>,`
`294`	`294`	`// Skip children that we don't want to export`
`295`	`295`	`if (child.Name.StartsWith("~")`
`296`	`296`	`\|\| child.Name.StartsWith(".sys")`
	`297`	`+ \|\| child.Name.StartsWith(".tmp")`
`297`	`298`	`\|\| child.Name.StartsWith(".metadata")`
`298`	`299`	`\|\| child.Name.StartsWith("export-"))`
`299`	`300`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ TKqpTempTablesState::FindInfo(const std::string_view& path, bool withSessionId)`
`10`	`10`	`return TempTables.find(path);`
`11`	`11`	`}`
`12`	`12`
`13`		`- const auto temporaryStoragePrefix = CanonizePath(GetSessionDirPath(Database, SessionId)) + "/";`
	`13`	`+ const auto temporaryStoragePrefix = CanonizePath(GetSessionDirPath(Database, TempDirName)) + "/";`
`14`	`14`
`15`	`15`	`if (path.size() < temporaryStoragePrefix.size()) {`
`16`	`16`	`return TempTables.end();`
`@@ -40,16 +40,16 @@ TString GetSessionDirsBasePath(const TString& database) {`
`40`	`40`	`return CanonizePath(JoinPath({database, TmpDirectoryName, SessionsDirectoryName}));`
`41`	`41`	`}`
`42`	`42`
`43`		`-TString GetSessionDirPath(const TString& database, const TString& sessionId) {`
`44`		`- return CanonizePath(JoinPath({database, TmpDirectoryName, SessionsDirectoryName, sessionId}));`
	`43`	`+TString GetSessionDirPath(const TString& database, const TString& tmpDirName) {`
	`44`	`+ return CanonizePath(JoinPath({database, TmpDirectoryName, SessionsDirectoryName, tmpDirName}));`
`45`	`45`	`}`
`46`	`46`
`47`		`-TString GetTempTablePath(const TString& database, const TString& sessionId, const TString tablePath) {`
`48`		`- return CanonizePath(JoinPath({database, TmpDirectoryName, SessionsDirectoryName, sessionId, tablePath}));`
	`47`	`+TString GetTempTablePath(const TString& database, const TString& tmpDirName, const TString tablePath) {`
	`48`	`+ return CanonizePath(JoinPath({database, TmpDirectoryName, SessionsDirectoryName, tmpDirName, tablePath}));`
`49`	`49`	`}`
`50`	`50`
`51`		`-TString GetCreateTempTablePath(const TString& database, const TString& sessionId, const TString tablePath) {`
`52`		`- return CanonizePath(JoinPath({TmpDirectoryName, SessionsDirectoryName, sessionId, database, tablePath}));`
	`51`	`+TString GetCreateTempTablePath(const TString& database, const TString& tmpDirName, const TString tablePath) {`
	`52`	`+ return CanonizePath(JoinPath({TmpDirectoryName, SessionsDirectoryName, tmpDirName, database, tablePath}));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`bool IsSessionsDirPath(const TStringBuf database, const TStringBuf path) {`
Original file line number	Diff line number	Diff line change
`@@ -615,7 +615,7 @@ class TKqpSchemeExecuterRequestHandler: public TActorBootstrapped<TKqpSchemeExec`
`615`	`615`	`void Bootstrap() {`
`616`	`616`	`auto ctx = MakeIntrusive<TUserRequestContext>();`
`617`	`617`	`ctx->DatabaseId = DatabaseId;`
`618`		`- IActor* actor = CreateKqpSchemeExecuter(PhyTx, QueryType, SelfId(), RequestType, Database, UserToken, ClientAddress, false /* temporary /, false / isCreateTableAs /, TString() / sessionId */, ctx);`
	`618`	`+ IActor* actor = CreateKqpSchemeExecuter(PhyTx, QueryType, SelfId(), RequestType, Database, UserToken, ClientAddress, false /* temporary /, false / createTmpDir /, false / isCreateTableAs /, TString() / sessionId */, ctx);`
`619`	`619`	`Register(actor);`
`620`	`620`	`Become(&TThis::WaitState);`
`621`	`621`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ NavigateEntryResult CreateNavigateEntry(const TString& path,`
`45`	`45`	`auto tempTablesInfoIt = tempTablesState->FindInfo(currentPath, false);`
`46`	`46`	`if (tempTablesInfoIt != tempTablesState->TempTables.end()) {`
`47`	`47`	`queryName = currentPath;`
`48`		`- currentPath = GetTempTablePath(tempTablesState->Database, tempTablesState->SessionId, tempTablesInfoIt->first);`
	`48`	`+ currentPath = GetTempTablePath(tempTablesState->Database, tempTablesState->TempDirName, tempTablesInfoIt->first);`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`entry.Path = SplitPath(currentPath);`
Original file line number	Diff line number	Diff line change
`@@ -1130,7 +1130,6 @@ class TKqpHost : public IKqpHost {`
`1130`	`1130`	`SessionCtx->SetDatabaseId(Gateway->GetDatabaseId());`
`1131`	`1131`	`SessionCtx->SetCluster(cluster);`
`1132`	`1132`	`if (tempTablesState) {`
`1133`		`- SessionCtx->SetSessionId(tempTablesState->SessionId);`
`1134`	`1133`	`SessionCtx->SetTempTables(std::move(tempTablesState));`
`1135`	`1134`	`}`
`1136`	`1135`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ std::optional<TString> TKikimrTablesData::GetTempTablePath(const TStringBuf& tab`
`273`	`273`	`auto tempTableInfoIt = TempTablesState->FindInfo(table, false);`
`274`	`274`
`275`	`275`	`if (tempTableInfoIt != TempTablesState->TempTables.end()) {`
`276`		`- return NKikimr::NKqp::GetTempTablePath(TempTablesState->Database, TempTablesState->SessionId, tempTableInfoIt->first);`
	`276`	`+ return NKikimr::NKqp::GetTempTablePath(TempTablesState->Database, TempTablesState->TempDirName, tempTableInfoIt->first);`
`277`	`277`	`}`
`278`	`278`	`return std::nullopt;`
`279`	`279`	`}`