Fix build andcorrect dept

Author: nsofya

ydb/core/kqp/ut/opt/kqp_ne_ut.cpp

@@ -2,6 +2,7 @@
 
 #include <ydb/public/sdk/cpp/client/ydb_proto/accessor.h>
 #include <ydb/core/kqp/runtime/kqp_read_actor.h>
+#include <ydb/core/tx/datashard/datashard_impl.h>
 
 namespace NKikimr::NKqp {
 

ydb/core/kqp/ut/scan/kqp_scan_ut.cpp

@@ -1,6 +1,7 @@
 #include <ydb/core/kqp/ut/common/kqp_ut_common.h>
 #include <ydb/core/kqp/counters/kqp_counters.h>
 #include <ydb/core/tx/datashard/datashard_failpoints.h>
+#include <ydb/core/tx/datashard/datashard_impl.h>
 #include <ydb/core/tx/scheme_cache/scheme_cache.h>
 
 #include <ydb/library/yql/dq/actors/compute/dq_compute_actor.h>

ydb/core/kqp/ut/scan/kqp_split_ut.cpp

@@ -1,6 +1,7 @@
 #include <ydb/core/kqp/ut/common/kqp_ut_common.h>
 #include <ydb/core/kqp/counters/kqp_counters.h>
 #include <ydb/core/tx/scheme_cache/scheme_cache.h>
+#include <ydb/core/tx/datashard/datashard_impl.h>
 
 #include <ydb/core/base/tablet_pipecache.h>
 #include <ydb/core/kqp/runtime/kqp_read_actor.h>

ydb/core/tx/columnshard/columnshard_impl.h

@@ -28,8 +28,6 @@
 #include <ydb/core/tx/locks/locks.h>
 #include <ydb/services/metadata/service.h>
 
-#include <ydb/core/tx/datashard/datashard_user_table.h>
-
 namespace NKikimr::NOlap {
 class TCleanupColumnEngineChanges;
 class TTTLColumnEngineChanges;
@@ -227,7 +225,7 @@ class TColumnShard
         TabletCounters->Simple()[counter].Add(num);
     }
 
-    // For systable
+    // For syslocks
     void IncCounter(NDataShard::ECumulativeCounters counter, ui64 num = 1) const {
         TabletCounters->Cumulative()[counter].Increment(num);
     }
@@ -247,11 +245,7 @@ class TColumnShard
     ui32 Generation() const { return Executor()->Generation(); }
 
     bool IsUserTable(const TTableId&) const {
-        return false;
-    }
-
-    const THashMap<ui64, NDataShard::TUserTable::TCPtr> &GetUserTables() const {
-        return Default<THashMap<ui64, NDataShard::TUserTable::TCPtr>>();
+        return true;
     }
 
 private:

ydb/core/tx/columnshard/transactions/locks_db.h

@@ -17,6 +17,11 @@ class TColumnShardLocksDb : public NLocks::TShardLocksDb<TColumnShard, NColumnSh
         db.Table<NColumnShard::Schema::Locks>().Key(lockId).Delete();
         HasChanges_ = true;
     }
+
+    bool MayAddLock(ui64) override {
+        return true;
+    }
+
 };
 
 }

ydb/core/tx/datashard/datashard_impl.h

@@ -1586,7 +1586,7 @@ class TDataShard
 
     void AddUserTable(const TPathId& tableId, TUserTable::TPtr tableInfo) {
         TableInfos[tableId.LocalPathId] = tableInfo;
-        SysLocks.UpdateSchema(tableId, *tableInfo);
+        SysLocks.UpdateSchema(tableId, tableInfo->KeyColumnTypes);
         Pipeline.GetDepTracker().UpdateSchema(tableId, *tableInfo);
     }
 

ydb/core/tx/datashard/datashard_locks_db.h

@@ -35,6 +35,17 @@ class TDataShardLocksDb : public NLocks::TShardLocksDb<TDataShard, TDataShard::S
             Self.ScheduleRemoveLockChanges(lockId);
         }
     }
+
+    bool MayAddLock(ui64 lockId) override {
+        for (auto& pr : Self.GetUserTables()) {
+            auto tid = pr.second->LocalTid;
+            // We cannot start a new lockId if it has any uncompacted data
+            if (DB.HasTxData(tid, lockId)) {
+                return false;
+            }
+        }
+        return true;
+    }
 };
 
 } // namespace NKikimr::NDataShard

ydb/core/tx/datashard/datashard_ut_locks.cpp

@@ -152,7 +152,7 @@ namespace NTest {
             TmpLockVec.emplace_back(TCell::Make(TmpLock.SchemeShard));
             TmpLockVec.emplace_back(TCell::Make(TmpLock.PathId));
 
-            Locks.UpdateSchema(tableId.PathId, DataShard.TableInfos[tid]);
+            Locks.UpdateSchema(tableId.PathId, DataShard.TableInfos[tid].KeyColumnTypes);
         }
 
         //

ydb/core/tx/datashard/range_avl_tree.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "range_tree_base.h"
+#include <ydb/core/tx/locks/range_tree_base.h>
 
 #include <util/generic/hash.h>
 #include <util/generic/intrlist.h>