Better storage format for query views. No need to use proto here.

Author: jepett0

ydb/core/kqp/query_data/kqp_prepared_query.cpp

@@ -267,20 +267,12 @@ void TPreparedQueryHolder::FillTables(const google::protobuf::RepeatedPtrField<
         }
     }
 }
-    
+
 void TPreparedQueryHolder::FillViews(const TVector<NKikimrKqp::TKqpTableMetadataProto>& viewsMetadata) {
     for (const auto& view : viewsMetadata) {
         const auto& pathId = view.GetPathId();
         const auto schemaVersion = view.GetSchemaVersion();
-        const auto& tableName = view.GetName();
-
-        NKqpProto::TKqpTableInfo tableInfo;
-        tableInfo.MutableTableId()->SetOwnerId(pathId.GetOwnerId());
-        tableInfo.MutableTableId()->SetTableId(pathId.GetTableId());
-        tableInfo.SetSchemaVersion(schemaVersion);
-        tableInfo.SetTableName(tableName);
-
-        QueryViews.emplace_back(std::move(tableInfo));
+        QueryViews.emplace_back(pathId.GetOwnerId(), pathId.GetTableId(), schemaVersion);
     }
 }
 

ydb/core/kqp/query_data/kqp_prepared_query.h

@@ -137,7 +137,7 @@ class TPreparedQueryHolder {
     std::shared_ptr<const NKikimrKqp::TPreparedQuery> Proto;
     std::shared_ptr<TPreparedQueryAllocHolder> Alloc;
     TVector<TString> QueryTables;
-    TVector<NKqpProto::TKqpTableInfo> QueryViews;
+    TVector<TTableId> QueryViews;
     std::vector<TKqpPhyTxHolder::TConstPtr> Transactions;
     TIntrusivePtr<TTableConstInfoMap> TableConstInfoById;
 
@@ -181,7 +181,7 @@ class TPreparedQueryHolder {
         return QueryTables;
     }
 
-    const TVector<NKqpProto::TKqpTableInfo>& GetQueryViews() const {
+    const TVector<TTableId>& GetQueryViews() const {
         return QueryViews;
     }
 

ydb/core/kqp/session_actor/kqp_query_state.h

@@ -205,13 +205,12 @@ class TKqpQueryState : public TNonCopyable {
                 TableVersions.emplace(tableId, table.GetVersion());
             }
         };
-        auto addView = [&](const NKqpProto::TKqpTableInfo& view) {
-            NKikimr::TTableId tableId(view.GetTableId().GetOwnerId(), view.GetTableId().GetTableId());
-            auto it = TableVersions.find(tableId);
+        auto addView = [&](const TTableId& view) {
+            auto it = TableVersions.find(view);
             if (it != TableVersions.end()) {
-                Y_ENSURE(it->second == view.GetSchemaVersion());
+                Y_ENSURE(it->second == view.SchemaVersion);
             } else {
-                TableVersions.emplace(tableId, view.GetSchemaVersion());
+                TableVersions.emplace(view, view.SchemaVersion);
             }
         };