fix kqp/ut/olap build

Author: zverevgeny

Diff for: ydb/core/kqp/ut/olap/blobs_sharing_ut.cpp

@@ -83,7 +83,7 @@ Y_UNIT_TEST_SUITE(KqpOlapBlobsSharing) {
         TTypedLocalHelper Helper;
         NYDBTest::TControllers::TGuard<NYDBTest::NColumnShard::TController> Controller;
         std::vector<ui64> ShardIds;
-        std::vector<ui64> PathIds;
+        std::vector<NColumnShard::TInternalPathId> PathIds;
         YDB_ACCESSOR(bool, RebootTablet, false);
     public:
         const TTypedLocalHelper& GetHelper() const {
@@ -109,12 +109,12 @@ Y_UNIT_TEST_SUITE(KqpOlapBlobsSharing) {
             Helper.CreateTestOlapTable(ShardsCount, ShardsCount);
             ShardIds = Controller->GetShardActualIds();
             AFL_VERIFY(ShardIds.size() == ShardsCount)("count", ShardIds.size())("ids", JoinSeq(",", ShardIds));
-            std::set<ui64> pathIdsSet;
+            std::set<NColumnShard::TInternalPathId> pathIdsSet;
             for (auto&& i : ShardIds) {
                 auto pathIds = Controller->GetPathIds(i);
                 pathIdsSet.insert(pathIds.begin(), pathIds.end());
             }
-            PathIds = std::vector<ui64>(pathIdsSet.begin(), pathIdsSet.end());
+            PathIds = std::vector<NColumnShard::TInternalPathId>(pathIdsSet.begin(), pathIdsSet.end());
             AFL_VERIFY(PathIds.size() == 1)("count", PathIds.size())("ids", JoinSeq(",", PathIds));
         }
 
@@ -140,13 +140,13 @@ Y_UNIT_TEST_SUITE(KqpOlapBlobsSharing) {
                 AFL_VERIFY(i < ShardIds.size());
                 sources.emplace_back(ShardIds[i]);
             }
-            std::set<ui64> pathIds;
+            std::set<NColumnShard::TInternalPathId> pathIds;
             for (auto&& i : pathIdxs) {
                 AFL_VERIFY(i < PathIds.size());
                 AFL_VERIFY(pathIds.emplace(PathIds[i]).second);
             }
             Cerr << "SHARING: " << JoinSeq(",", sources) << "->" << destination << Endl;
-            THashMap<ui64, ui64> pathIdsRemap;
+            THashMap<NColumnShard::TInternalPathId, NColumnShard::TInternalPathId> pathIdsRemap;
             for (auto&& i : pathIds) {
                 pathIdsRemap.emplace(i, i);
             }

Diff for: ydb/core/kqp/ut/olap/indexes_ut.cpp

@@ -245,7 +245,7 @@ Y_UNIT_TEST_SUITE(KqpOlapIndexes) {
             TAutoPtr<IEventHandle> handle;
 
             size_t shard = 0;
-            std::set<ui64> pathids;
+            std::set<NColumnShard::TInternalPathId> pathids;
             for (auto&& i : csController->GetShardActualIds()) {
                 Cerr << ">>> shard actual id: " << i << Endl;
                 for (auto&& j : csController->GetPathIds(i)) {
@@ -258,12 +258,12 @@ Y_UNIT_TEST_SUITE(KqpOlapIndexes) {
             }
 
             UNIT_ASSERT(pathids.size() == 1);
-            ui64 pathId = *pathids.begin();
+            auto pathId = *pathids.begin();
 
             shard = 0;
             for (auto&& i : csController->GetShardActualIds()) {
                 auto request = std::make_unique<NStat::TEvStatistics::TEvStatisticsRequest>();
-                request->Record.MutableTable()->MutablePathId()->SetLocalId(pathId);
+                request->Record.MutableTable()->MutablePathId()->SetLocalId(pathId.GetInternalPathIdValue());
 
                 runtime->Send(MakePipePerNodeCacheID(false), sender, new TEvPipeCache::TEvForward(request.release(), i, false));
                 if (++shard == 3) {

Diff for: ydb/core/kqp/ut/olap/tiering_ut.cpp

@@ -306,8 +306,15 @@ Y_UNIT_TEST_SUITE(KqpOlapTiering) {
         olapHelper.CreateTestOlapTable();
         tieringHelper.WriteSampleData();
         csController->WaitCompactions(TDuration::Seconds(5));
-
-        csController->RegisterLock("table", std::make_shared<NOlap::NDataLocks::TListTablesLock>("table", THashSet<ui64>({0, 1, 2, 3, 4, 5}), NOlap::NDataLocks::ELockCategory::Compaction));
+        THashSet<NColumnShard::TInternalPathId> pathsToLock{
+            NColumnShard::TInternalPathId::FromInternalPathIdValue(0),
+            NColumnShard::TInternalPathId::FromInternalPathIdValue(1),
+            NColumnShard::TInternalPathId::FromInternalPathIdValue(2),
+            NColumnShard::TInternalPathId::FromInternalPathIdValue(3),
+            NColumnShard::TInternalPathId::FromInternalPathIdValue(4),
+            NColumnShard::TInternalPathId::FromInternalPathIdValue(5),
+        };
+        csController->RegisterLock("table", std::make_shared<NOlap::NDataLocks::TListTablesLock>("table", std::move(pathsToLock), NOlap::NDataLocks::ELockCategory::Compaction));
         {
             const TString query = R"(ALTER TABLE `/Root/olapStore/olapTable` SET TTL Interval("PT1S") ON timestamp)";
             auto result = testHelper.GetSession().ExecuteSchemeQuery(query).GetValueSync();