incapsulate sharding logic into special class and remove declaration … (#3964)

Author: ivanmorozov333

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

@@ -1424,7 +1424,7 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         auto sender = runtime->AllocateEdgeActor();
 
         InitRoot(server, sender);
-        Tests::NCommon::TLoggerInit(runtime).Initialize();
+//        Tests::NCommon::TLoggerInit(runtime).Initialize();
 
         ui32 numShards = NSan::PlainOrUnderSanitizer(1000, 10);
         ui32 numIterations = NSan::PlainOrUnderSanitizer(50, 10);
@@ -1554,7 +1554,7 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         auto sender = runtime->AllocateEdgeActor();
 
         InitRoot(server, sender);
-        Tests::NCommon::TLoggerInit(runtime).Initialize();
+//        Tests::NCommon::TLoggerInit(runtime).Initialize();
 
         ui32 numShards = NSan::PlainOrUnderSanitizer(100, 10);
         ui32 numIterations = NSan::PlainOrUnderSanitizer(100, 10);

ydb/core/tx/data_events/columnshard_splitter.cpp

@@ -45,20 +45,22 @@ NKikimr::NEvWrite::IShardsSplitter::TYdbConclusionStatus TColumnShardShardsSplit
         }
     }
 
-    return SplitImpl(batch, sharding);
-}
-
-NKikimr::NEvWrite::IShardsSplitter::TYdbConclusionStatus TColumnShardShardsSplitter::SplitImpl(const std::shared_ptr<arrow::RecordBatch>& batch, const NKikimrSchemeOp::TColumnTableSharding& descSharding) {
-    Y_ABORT_UNLESS(batch);
-
-    const std::vector<ui64> tabletIds(descSharding.GetColumnShards().begin(), descSharding.GetColumnShards().end());
-    auto shardingConclusion = NSharding::TShardingBase::BuildShardingOperator(descSharding);
+    NSchemeShard::TOlapSchema olapSchema;
+    olapSchema.ParseFromLocalDB(scheme);
+    auto shardingConclusion = NSharding::TShardingBase::BuildFromProto(olapSchema, sharding);
     if (shardingConclusion.IsFail()) {
         return TYdbConclusionStatus::Fail(Ydb::StatusIds::SCHEME_ERROR, shardingConclusion.GetErrorMessage());
     }
     AFL_VERIFY(!!shardingConclusion.GetResult());
-    auto sharding = shardingConclusion.DetachResult();
-    auto split = sharding->SplitByShards(batch, tabletIds, NColumnShard::TLimits::GetMaxBlobSize() * 0.875);
+    return SplitImpl(batch, shardingConclusion.DetachResult());
+}
+
+NKikimr::NEvWrite::IShardsSplitter::TYdbConclusionStatus TColumnShardShardsSplitter::SplitImpl(const std::shared_ptr<arrow::RecordBatch>& batch,
+    const std::shared_ptr<NSharding::TShardingBase>& sharding)
+{
+    Y_ABORT_UNLESS(batch);
+
+    auto split = sharding->SplitByShards(batch, NColumnShard::TLimits::GetMaxBlobSize() * 0.875);
     if (split.IsFail()) {
         return TYdbConclusionStatus::Fail(Ydb::StatusIds::SCHEME_ERROR, split.GetErrorMessage());
     }

ydb/core/tx/data_events/columnshard_splitter.h

@@ -45,7 +45,7 @@ class TColumnShardShardsSplitter : public IShardsSplitter {
     TYdbConclusionStatus DoSplitData(const NSchemeCache::TSchemeCacheNavigate::TEntry& schemeEntry, const IEvWriteDataAccessor& data) override;
 
 private:
-    TYdbConclusionStatus SplitImpl(const std::shared_ptr<arrow::RecordBatch>& batch, const NKikimrSchemeOp::TColumnTableSharding& descSharding);
+    TYdbConclusionStatus SplitImpl(const std::shared_ptr<arrow::RecordBatch>& batch, const std::shared_ptr<NSharding::TShardingBase>& sharding);
 
     std::shared_ptr<arrow::Schema> ExtractArrowSchema(const NKikimrSchemeOp::TColumnTableSchema& schema);
 };

ydb/core/tx/schemeshard/olap/operations/alter_table.cpp

@@ -538,8 +538,8 @@ class TAlterColumnTable: public TSubOperation {
         }
 
         TOlapStoreInfo::TPtr storeInfo;
-        if (tableInfo->OlapStorePathId) {
-            auto& storePathId = *tableInfo->OlapStorePathId;
+        if (!tableInfo->IsStandalone()) {
+            const auto storePathId = tableInfo->GetOlapStorePathIdVerified();
             TPath storePath = TPath::Init(storePathId, context.SS);
             {
                 TPath::TChecker checks = storePath.Check();
@@ -593,7 +593,7 @@ class TAlterColumnTable: public TSubOperation {
         context.SS->PersistLastTxId(db, path.Base());
 
         if (storeInfo) {
-            auto& storePathId = *tableInfo->OlapStorePathId;
+            const auto storePathId = tableInfo->GetOlapStorePathIdVerified();
             TPath storePath = TPath::Init(storePathId, context.SS);
 
             Y_ABORT_UNLESS(storeInfo->ColumnTables.contains(path->PathId));