Fixes

ydb-platform · Jan 24, 2024 · 526bd01 · 526bd01
1 parent f97111f
commit 526bd01
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 20 deletions.
diff --git a/ydb/core/kqp/provider/yql_kikimr_provider.cpp b/ydb/core/kqp/provider/yql_kikimr_provider.cpp
@@ -121,11 +121,13 @@ struct TKikimrData {
 const TKikimrTableDescription* TKikimrTablesData::EnsureTableExists(const TString& cluster,
     const TString& table, TPositionHandle pos, TExprContext& ctx) const
 {
-    auto tempTableInfoIt = TempTablesState->FindInfo(table, true);
-
     auto tablePath = table;
-    if (tempTableInfoIt != TempTablesState->TempTables.end()) {
-        tablePath = tempTableInfoIt->first;
+    if (TempTablesState) {
+        auto tempTableInfoIt = TempTablesState->FindInfo(table, true);
+
+        if (tempTableInfoIt != TempTablesState->TempTables.end()) {
+            tablePath = tempTableInfoIt->first;
+        }
     }
 
     auto desc = Tables.FindPtr(std::make_pair(cluster, tablePath));
@@ -141,11 +143,13 @@ const TKikimrTableDescription* TKikimrTablesData::EnsureTableExists(const TStrin
 }
 
 TKikimrTableDescription& TKikimrTablesData::GetOrAddTable(const TString& cluster, const TString& database, const TString& table, ETableType tableType) {
-    auto tempTableInfoIt = TempTablesState->FindInfo(table, true);
-
     auto tablePath = table;
-    if (tempTableInfoIt != TempTablesState->TempTables.end()) {
-        tablePath = tempTableInfoIt->first;
+    if (TempTablesState) {
+        auto tempTableInfoIt = TempTablesState->FindInfo(table, true);
+
+        if (tempTableInfoIt != TempTablesState->TempTables.end()) {
+            tablePath = tempTableInfoIt->first;
+        }
     }
 
     if (!Tables.FindPtr(std::make_pair(cluster, tablePath))) {
@@ -165,11 +169,13 @@ TKikimrTableDescription& TKikimrTablesData::GetOrAddTable(const TString& cluster
 }
 
 TKikimrTableDescription& TKikimrTablesData::GetTable(const TString& cluster, const TString& table) {
-    auto tempTableInfoIt = TempTablesState->FindInfo(table, true);
-
     auto tablePath = table;
-    if (tempTableInfoIt != TempTablesState->TempTables.end()) {
-        tablePath = tempTableInfoIt->first;
+    if (TempTablesState) {
+        auto tempTableInfoIt = TempTablesState->FindInfo(table, true);
+
+        if (tempTableInfoIt != TempTablesState->TempTables.end()) {
+            tablePath = tempTableInfoIt->first;
+        }
     }
 
     auto desc = Tables.FindPtr(std::make_pair(cluster, tablePath));
@@ -181,11 +187,13 @@ TKikimrTableDescription& TKikimrTablesData::GetTable(const TString& cluster, con
 const TKikimrTableDescription& TKikimrTablesData::ExistingTable(const TStringBuf& cluster,
     const TStringBuf& table) const
 {
-    auto tempTableInfoIt = TempTablesState->FindInfo(table, true);
-
     auto tablePath = table;
-    if (tempTableInfoIt != TempTablesState->TempTables.end()) {
-        tablePath = tempTableInfoIt->first;
+    if (TempTablesState) {
+        auto tempTableInfoIt = TempTablesState->FindInfo(table, true);
+
+        if (tempTableInfoIt != TempTablesState->TempTables.end()) {
+            tablePath = tempTableInfoIt->first;
+        }
     }
 
     auto desc = Tables.FindPtr(std::make_pair(TString(cluster), TString(tablePath)));

diff --git a/ydb/core/kqp/provider/yql_kikimr_provider.h b/ydb/core/kqp/provider/yql_kikimr_provider.h
@@ -319,10 +319,12 @@ class TKikimrTransactionContextBase : public TThrRefBase {
             auto newOp = TYdbOperation(op.GetOperation());
             TPosition pos(op.GetPosition().GetColumn(), op.GetPosition().GetRow());
 
-            auto tempTableInfoIt = TempTablesState->FindInfo(table, false);
+            if (TempTablesState) {
+                auto tempTableInfoIt = TempTablesState->FindInfo(table, false);
 
-            if (tempTableInfoIt != TempTablesState->TempTables.end()) {
-                table = tempTableInfoIt->first + TempTablesState->SessionId;
+                if (tempTableInfoIt != TempTablesState->TempTables.end()) {
+                    table = tempTableInfoIt->first + TempTablesState->SessionId;
+                }
             }
 
             const auto info = tableInfoMap.FindPtr(table);

diff --git a/ydb/core/kqp/session_actor/kqp_session_actor.cpp b/ydb/core/kqp/session_actor/kqp_session_actor.cpp
@@ -1180,7 +1180,7 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
             return {{true, {JoinPath({path.first, path.second}), {path.second, path.first, userToken}}}};
         }
 
-        auto it = TempTablesState.FindInfo(JoinPath({path.first, path.second}));
+        auto it = TempTablesState.FindInfo(JoinPath({path.first, path.second}), true);
         if (it == TempTablesState.TempTables.end()) {
             return std::nullopt;
         }