fix an issue with default values (ydb-platform#15862)

Author: gridnevvvit

ydb/core/kqp/opt/physical/effects/kqp_opt_phy_upsert_index.cpp

@@ -391,21 +391,13 @@ RewriteInputForConstraint(const TExprBase& inputRows, const THashSet<TStringBuf>
         const THashSet<TString> indexKeyColumns = CreateKeyColumnSetToRead(indexes);
         const THashSet<TString> indexDataColumns = CreateDataColumnSetToRead(indexes);
 
-        for (const auto& x : indexKeyColumns) {
-            columns.push_back(Build<TCoAtom>(ctx, pos).Value(x).Done());
-        }
+        THashSet<TString> columnsToReadInPrecomputeLookupDict;
+        columnsToReadInPrecomputeLookupDict.insert(indexKeyColumns.begin(), indexKeyColumns.end());
+        columnsToReadInPrecomputeLookupDict.insert(indexDataColumns.begin(), indexDataColumns.end());
+        columnsToReadInPrecomputeLookupDict.insert(mainPk.begin(), mainPk.end());
+        columnsToReadInPrecomputeLookupDict.insert(checkDefaults.begin(), checkDefaults.end());
 
-        for (const auto& x : indexDataColumns) {
-            // Handle the case of multiple indexes
-            // one of them has 'foo' as data column but for another one foo is just indexed column
-            if (indexKeyColumns.contains(x))
-                continue;
-            columns.push_back(Build<TCoAtom>(ctx, pos).Value(x).Done());
-        }
-
-        for (const auto& x : mainPk) {
-            if (indexKeyColumns.contains(x))
-                continue;
+        for (const auto& x : columnsToReadInPrecomputeLookupDict) {
             columns.push_back(Build<TCoAtom>(ctx, pos).Value(x).Done());
         }
 

ydb/core/kqp/ut/scheme/kqp_constraints_ut.cpp

@@ -1290,6 +1290,76 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
 
     }
 
+    Y_UNIT_TEST(DefaultAndIndexesTestDefaultColumnNotIncludedInIndex) {
+        NKikimrConfig::TAppConfig appConfig;
+        TKikimrRunner kikimr(TKikimrSettings().SetPQConfig(DefaultPQConfig()).SetAppConfig(appConfig));
+
+        auto db = kikimr.GetTableClient();
+        auto session = db.CreateSession().GetValueSync().GetSession();
+
+        {
+            auto query = R"(
+                --!syntax_v1
+                CREATE TABLE test (
+                    A Int64 NOT NULL,
+                    B Int64,
+                    Created Int32 DEFAULT 1,
+                    Deleted Int32 DEFAULT 0,
+                    PRIMARY KEY (A ),
+                    INDEX testIndex GLOBAL ON (B, A)
+                )
+            )";
+
+            auto result = session.ExecuteSchemeQuery(query).GetValueSync();
+            UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS,
+                                       result.GetIssues().ToString());
+        }
+
+        auto fQuery = [&](TString query) -> TString {
+            NYdb::NTable::TExecDataQuerySettings execSettings;
+            execSettings.KeepInQueryCache(true);
+            execSettings.CollectQueryStats(ECollectQueryStatsMode::Basic);
+
+            auto result =
+                session
+                    .ExecuteDataQuery(query, TTxControl::BeginTx().CommitTx(),
+                                      execSettings)
+                    .ExtractValueSync();
+
+            UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS,
+                                       result.GetIssues().ToString());
+            if (result.GetResultSets().size() > 0)
+                return NYdb::FormatResultSetYson(result.GetResultSet(0));
+            return "";
+        };
+
+        fQuery(R"(
+            upsert into test (A, B, Created, Deleted) values (5, 15, 1, 0)
+        )");
+
+        fQuery(R"(
+            $to_upsert = (
+                select A from
+                `test`
+                where A = 5
+            );
+
+            upsert into `test` (A, Deleted)
+            select A, 10 as Deleted from $to_upsert;
+        )");
+
+        CompareYson(
+            R"(
+            [
+                [5;[15];[1];[10]]
+            ]
+            )",
+            fQuery(R"(
+                SELECT A, B, Created, Deleted FROM `test` ORDER BY A;
+            )")
+        );
+    }
+
     Y_UNIT_TEST(Utf8AndDefault) {
 
         NKikimrConfig::TAppConfig appConfig;