use TabletId

Author: zverevgeny

ydb/core/kqp/common/kqp_yql.cpp

@@ -169,9 +169,9 @@ TKqpReadTableSettings ParseInternal(const TCoNameValueTupleList& node) {
             YQL_ENSURE(tuple.Ref().ChildrenSize() == 1);
             settings.ForcePrimary = true;
         } else if (name == TKqpReadTableSettings::GroupByFieldNames) {
-        } else if (name == TKqpReadTableSettings::ShardIdName) {
+        } else if (name == TKqpReadTableSettings::TabletIdName) {
             YQL_ENSURE(tuple.Ref().ChildrenSize() == 2);
-            settings.ShardId = FromString<ui64>(tuple.Value().Cast<TCoAtom>().Value());
+            settings.TabletId = FromString<ui64>(tuple.Value().Cast<TCoAtom>().Value());
         }else {
             YQL_ENSURE(false, "Unknown KqpReadTable setting name '" << name << "'");
         }
@@ -259,13 +259,13 @@ NNodes::TCoNameValueTupleList TKqpReadTableSettings::BuildNode(TExprContext& ctx
                 .Done());
     }
 
-    if (ShardId) {
+    if (TabletId) {
         settings.emplace_back(
             Build<TCoNameValueTuple>(ctx, pos)
                 .Name()
-                    .Build(ShardIdName)
+                    .Build(TabletIdName)
                 .Value<TCoAtom>()
-                    .Value(ToString(*ShardId))
+                    .Value(ToString(*TabletId))
                     .Build()
                 .Done());
     }

ydb/core/kqp/common/kqp_yql.h

@@ -80,14 +80,14 @@ struct TKqpReadTableSettings {
     static constexpr TStringBuf SequentialSettingName = "Sequential";
     static constexpr TStringBuf ForcePrimaryName = "ForcePrimary";
     static constexpr TStringBuf GroupByFieldNames = "GroupByFieldNames";
-    static constexpr TStringBuf ShardIdName = "ShardId";
+    static constexpr TStringBuf TabletIdName = "TabletId";
 
     TVector<TString> SkipNullKeys;
     TExprNode::TPtr ItemsLimit;
     bool Reverse = false;
     bool Sorted = false;
     TMaybe<ui64> SequentialInFlight;
-    TMaybe<ui64> ShardId;
+    TMaybe<ui64> TabletId;
     bool ForcePrimary = false;
 
     void AddSkipNullKey(const TString& key);

ydb/core/kqp/executer_actor/kqp_partition_helper.cpp

@@ -712,7 +712,7 @@ THashMap<ui64, TShardInfo> PrunePartitions(const NKqpProto::TKqpPhyOpReadOlapRan
         return shardInfoMap;
 
     for (const auto& partition :  stageInfo.Meta.ShardKey->GetPartitions()) {
-        if (!readRanges.HasShardId() || readRanges.GetShardId() == partition.ShardId) {
+        if (!readRanges.HasTabletId() || readRanges.GetTabletId() == partition.ShardId) {
             auto& shardInfo = shardInfoMap[partition.ShardId];
 
             YQL_ENSURE(!shardInfo.KeyReadRanges);

ydb/core/kqp/opt/kqp_opt_kql.cpp

@@ -90,15 +90,15 @@ bool HasIndexesToWrite(const TKikimrTableDescription& tableData) {
     return hasIndexesToWrite;
 }
 
-TExprBase BuildReadTable(const TCoAtomList& columns, TPositionHandle pos, const TKikimrTableDescription& tableData, bool forcePrimary, TMaybe<ui64> shardId,
+TExprBase BuildReadTable(const TCoAtomList& columns, TPositionHandle pos, const TKikimrTableDescription& tableData, bool forcePrimary, TMaybe<ui64> tabletId,
     TExprContext& ctx)
 {
     TExprNode::TPtr readTable;
     const auto& tableMeta = BuildTableMeta(tableData, pos, ctx);
 
     TKqpReadTableSettings settings;
     settings.ForcePrimary = forcePrimary;
-    settings.ShardId = shardId;
+    settings.TabletId = tabletId;
 
     readTable = Build<TKqlReadTableRanges>(ctx, pos)
         .Table(tableMeta)
@@ -118,10 +118,10 @@ TExprBase BuildReadTable(const TKiReadTable& read, const TKikimrTableDescription
     bool withSystemColumns, TExprContext& ctx)
 {
     const auto& columns = read.GetSelectColumns(ctx, tableData, withSystemColumns);
-    const auto shardId =  NYql::HasSetting(read.Settings().Ref(), "shardid")
-        ? TMaybe<ui64>{FromString<ui64>(NYql::GetSetting(read.Settings().Ref(), "shardid")->Child(1)->Content())}
+    const auto tabletId =  NYql::HasSetting(read.Settings().Ref(), "tabletid")
+        ? TMaybe<ui64>{FromString<ui64>(NYql::GetSetting(read.Settings().Ref(), "tabletid")->Child(1)->Content())}
         : TMaybe<ui64>{};
-    auto readNode = BuildReadTable(columns, read.Pos(), tableData, forcePrimary, shardId, ctx);
+    auto readNode = BuildReadTable(columns, read.Pos(), tableData, forcePrimary, tabletId, ctx);
 
     return readNode;
 }

ydb/core/kqp/query_compiler/kqp_query_compiler.cpp

@@ -397,8 +397,8 @@ void FillReadRanges(const TReader& read, const TKikimrTableMetadata&, TProto& re
 
     if constexpr (std::is_same_v<TProto, NKqpProto::TKqpPhyOpReadOlapRanges>) {
         readProto.SetSorted(settings.Sorted);
-        if (settings.ShardId) {
-            readProto.SetShardId(*settings.ShardId);
+        if (settings.TabletId) {
+            readProto.SetTabletId(*settings.TabletId);
         }
     }
 

ydb/core/kqp/ut/olap/kqp_olap_ut.cpp

@@ -3275,7 +3275,7 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
                     PRIMARY KEY (Name, Id)
                 ) WITH (
                     STORE = COLUMN,
-                    AUTO_PARTITIONING_MIN_PARTITIONS_COUNT = 3
+                    PARTITION_COUNT = 3
                 );
 
             )", noTx).GetValueSync();
@@ -3297,13 +3297,13 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         UNIT_ASSERT_C(result.GetStatus() == NYdb::EStatus::SUCCESS, result.GetIssues().ToString());
         //TODO USE shard ids from the table description. Not avaiable now
         {
-            auto result = queryClient.ExecuteQuery("SELECT * FROM Test WITH (ShardId = '72075186224037888')", noTx).GetValueSync();
+            auto result = queryClient.ExecuteQuery("SELECT * FROM Test WITH TabletId = '72075186224037888'", noTx).GetValueSync();
             UNIT_ASSERT_C(result.GetStatus() == NYdb::EStatus::SUCCESS, result.GetIssues().ToString());
             CompareYson("[[[\"bb\"];20u;\"n2\"];[[\"dd\"];40u;\"n4\"]]", FormatResultSetYson(result.GetResultSet(0)));
-            result = queryClient.ExecuteQuery("SELECT * FROM Test WITH ShardId = '72075186224037889'", noTx).GetValueSync();
+            result = queryClient.ExecuteQuery("SELECT * FROM Test WITH TabletId = '72075186224037889'", noTx).GetValueSync();
             UNIT_ASSERT_C(result.GetStatus() == NYdb::EStatus::SUCCESS, result.GetIssues().ToString());
             CompareYson("[[[\"ee\"];50u;\"n5\"]]", FormatResultSetYson(result.GetResultSet(0)));
-            result = queryClient.ExecuteQuery("SELECT * FROM Test WITH (ShardId = '72075186224037890')", noTx).GetValueSync();
+            result = queryClient.ExecuteQuery("SELECT * FROM Test WITH TabletId = '72075186224037890'", noTx).GetValueSync();
             UNIT_ASSERT_C(result.GetStatus() == NYdb::EStatus::SUCCESS, result.GetIssues().ToString());
             CompareYson("[[[\"aa\"];10u;\"n1\"];[[\"cc\"];30u;\"n3\"]]", FormatResultSetYson(result.GetResultSet(0)));
         }