fix loading ttl settings (#14393)

Author: swalrus1

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

@@ -19,6 +19,8 @@ class TTieringTestHelper {
     std::optional<TLocalHelper> OlapHelper;
     std::optional<NYDBTest::TControllers::TGuard<NOlap::TWaitCompactionController>> CsController;
 
+    YDB_ACCESSOR(TString, TablePath, "/Root/olapStore/olapTable");
+
 public:
     TTieringTestHelper() {
         CsController.emplace(NYDBTest::TControllers::RegisterCSControllerGuard<NOlap::TWaitCompactionController>());
@@ -53,8 +55,8 @@ class TTieringTestHelper {
 
     void WriteSampleData() {
         for (ui64 i = 0; i < 100; ++i) {
-            WriteTestData(TestHelper->GetKikimr(), "/Root/olapStore/olapTable", 0, 3600000000 + i * 10000, 1000);
-            WriteTestData(TestHelper->GetKikimr(), "/Root/olapStore/olapTable", 0, 3600000000 + i * 10000, 1000);
+            WriteTestData(TestHelper->GetKikimr(), TablePath, 0, 3600000000 + i * 10000, 1000);
+            WriteTestData(TestHelper->GetKikimr(), TablePath, 0, 3600000000 + i * 10000, 1000);
         }
     }
 
@@ -65,7 +67,7 @@ class TTieringTestHelper {
         selectQuery << R"(
             SELECT
                 TierName, SUM(ColumnRawBytes) AS RawBytes, SUM(Rows) AS Rows
-            FROM `/Root/olapStore/olapTable/.sys/primary_index_portion_stats`)";
+            FROM `)" << TablePath << R"(/.sys/primary_index_portion_stats`)";
         if (onlyActive) {
             selectQuery << " WHERE Activity == 1";
         }
@@ -127,6 +129,29 @@ Y_UNIT_TEST_SUITE(KqpOlapTiering) {
         tieringHelper.CheckAllDataInTier("__DEFAULT");
     }
 
+    Y_UNIT_TEST(LoadTtlSettings) {
+        TTieringTestHelper tieringHelper;
+        auto& csController = tieringHelper.GetCsController();
+        auto& olapHelper = tieringHelper.GetOlapHelper();
+        auto& testHelper = tieringHelper.GetTestHelper();
+        tieringHelper.SetTablePath("/Root/olapTable");
+
+        olapHelper.CreateTestOlapTableWithoutStore();
+        testHelper.CreateTier("tier1");
+        testHelper.SetTiering("/Root/olapTable", "/Root/tier1", "timestamp");
+        {
+            const TString query = R"(ALTER TABLE `/Root/olapTable` ADD COLUMN f Int32)";
+            auto result = testHelper.GetSession().ExecuteSchemeQuery(query).GetValueSync();
+            UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), NYdb::EStatus::SUCCESS, result.GetIssues().ToOneLineString());
+        }
+        testHelper.RebootTablets("/Root/olapTable");
+
+        tieringHelper.WriteSampleData();
+        csController->WaitCompactions(TDuration::Seconds(5));
+        csController->WaitActualization(TDuration::Seconds(5));
+        tieringHelper.CheckAllDataInTier("/Root/tier1");
+    }
+
     Y_UNIT_TEST(EvictionWithStrippedEdsPath) {
         TTieringTestHelper tieringHelper;
         auto& csController = tieringHelper.GetCsController();

ydb/core/tx/columnshard/columnshard_impl.cpp

@@ -455,16 +455,16 @@ void TColumnShard::RunAlterTable(const NKikimrTxColumnShard::TAlterTable& alterP
         schema = alterProto.GetSchema();
     }
 
-    THashSet<NTiers::TExternalStorageId> usedTiers;
     if (alterProto.HasTtlSettings()) {
         const auto& ttlSettings = alterProto.GetTtlSettings();
         *tableVerProto.MutableTtlSettings() = ttlSettings;
 
+        THashSet<NTiers::TExternalStorageId> usedTiers;
         if (ttlSettings.HasEnabled()) {
             usedTiers = NOlap::TTiering::GetUsedTiers(ttlSettings.GetEnabled());
         }
+        ActivateTiering(pathId, usedTiers);
     }
-    ActivateTiering(pathId, usedTiers);
 
     tableVerProto.SetSchemaPresetVersionAdj(alterProto.GetSchemaPresetVersionAdj());
     TablesManager.AddTableVersion(pathId, version, tableVerProto, schema, db);

ydb/core/tx/columnshard/tables_manager.cpp

@@ -126,7 +126,7 @@ bool TTablesManager::InitFromDB(NIceDb::TNiceDb& db) {
             AFL_VERIFY(preset);
             AFL_VERIFY(preset->Id == versionInfo.GetSchemaPresetId())("preset", preset->Id)("table", versionInfo.GetSchemaPresetId());
 
-            if (!table.IsDropped()) {
+            if (!table.IsDropped() && versionInfo.HasTtlSettings()) {
                 auto& ttlSettings = versionInfo.GetTtlSettings();
                 auto vIt = lastVersion.find(pathId);
                 if (vIt == lastVersion.end()) {