diff options
| author | ssmike <[email protected]> | 2023-09-01 14:22:56 +0300 |
|---|---|---|
| committer | ssmike <[email protected]> | 2023-09-01 15:11:40 +0300 |
| commit | cdf846dab235441eb6c5d7b9ff7d5dab78f42056 (patch) | |
| tree | 900e44f651727d293be18e3be852b236ae658d30 | |
| parent | 1d0c54d20dfd90b7c7f9794e488968ea59eb0697 (diff) | |
allow literal nulls
56 files changed, 256 insertions, 315 deletions
diff --git a/ydb/core/kqp/opt/kqp_query_plan.cpp b/ydb/core/kqp/opt/kqp_query_plan.cpp index 543047c8836..aaf7c57c78a 100644 --- a/ydb/core/kqp/opt/kqp_query_plan.cpp +++ b/ydb/core/kqp/opt/kqp_query_plan.cpp @@ -628,6 +628,10 @@ private: return literal.Cast().Literal().StringValue(); } + if (auto literal = key.Maybe<TCoNothing>()) { + return TString("null"); + } + return TString("n/a"); }; @@ -1342,6 +1346,10 @@ private: return literal.Cast().Literal().StringValue(); } + if (auto literal = key.Maybe<TCoNothing>()) { + return TString("null"); + } + return TString("n/a"); }; diff --git a/ydb/core/kqp/opt/physical/kqp_opt_phy_build_stage.cpp b/ydb/core/kqp/opt/physical/kqp_opt_phy_build_stage.cpp index e75b949b5a7..3cf59734a43 100644 --- a/ydb/core/kqp/opt/physical/kqp_opt_phy_build_stage.cpp +++ b/ydb/core/kqp/opt/physical/kqp_opt_phy_build_stage.cpp @@ -78,6 +78,27 @@ TMaybeNode<TDqPhyPrecompute> BuildLookupKeysPrecompute(const TExprBase& input, T .Done(); } +bool IsLiteralNothing(TExprBase node) { + if (node.Maybe<TCoNothing>()) { + auto* type = node.Raw()->GetTypeAnn(); + if (type->GetKind() != ETypeAnnotationKind::Optional) { + return false; + } + type = type->Cast<TOptionalExprType>()->GetItemType(); + + if (type->GetKind() != ETypeAnnotationKind::Data) { + return false; + } + + auto slot = type->Cast<TDataExprType>()->GetSlot(); + auto typeId = NKikimr::NUdf::GetDataTypeInfo(slot).TypeId; + + return (NKikimr::NScheme::NTypeIds::IsYqlType(typeId) && NKikimr::NSchemeShard::IsAllowedKeyType(NKikimr::NScheme::TTypeInfo(typeId))); + } else { + return false; + } +} + TExprBase KqpBuildReadTableStage(TExprBase node, TExprContext& ctx, const TKqpOptimizeContext& kqpCtx) { if (!node.Maybe<TKqlReadTable>()) { return node; @@ -97,7 +118,7 @@ TExprBase KqpBuildReadTableStage(TExprBase node, TExprContext& ctx, const TKqpOp return false; } - if (!value.Maybe<TCoDataCtor>() && !value.Maybe<TCoParameter>()) { + if (!value.Maybe<TCoDataCtor>() && !value.Maybe<TCoParameter>() && !IsLiteralNothing(value)) { literalRange = false; } @@ -392,7 +413,7 @@ bool RequireLookupPrecomputeStage(const TKqlLookupTable& lookup) { } else { return true; } - } else { + } else if (!tuple.Value().IsValid() || !IsLiteralNothing(tuple.Value().Cast())) { return true; } } diff --git a/ydb/core/kqp/query_compiler/kqp_query_compiler.cpp b/ydb/core/kqp/query_compiler/kqp_query_compiler.cpp index 0fb3a270589..06a4be2ff93 100644 --- a/ydb/core/kqp/query_compiler/kqp_query_compiler.cpp +++ b/ydb/core/kqp/query_compiler/kqp_query_compiler.cpp @@ -108,7 +108,7 @@ NKqpProto::EKqpPhyTableKind GetPhyTableKind(EKikimrTableKind kind) { case EKikimrTableKind::SysView: return NKqpProto::TABLE_KIND_SYS_VIEW; case EKikimrTableKind::External: - return NKqpProto::TABLE_KIND_EXTERNAL; + return NKqpProto::TABLE_KIND_EXTERNAL; default: return NKqpProto::TABLE_KIND_UNSPECIFIED; } @@ -193,6 +193,33 @@ void FillColumns(const TContainer& columns, const TKikimrTableMetadata& tableMet } } +void FillNothing(TCoNothing expr, NKqpProto::TKqpPhyLiteralValue& value) { + auto* typeann = expr.Raw()->GetTypeAnn(); + YQL_ENSURE(typeann->GetKind() == ETypeAnnotationKind::Optional); + typeann = typeann->Cast<TOptionalExprType>()->GetItemType(); + YQL_ENSURE(typeann->GetKind() == ETypeAnnotationKind::Data); + auto slot = typeann->Cast<TDataExprType>()->GetSlot(); + auto typeId = NKikimr::NUdf::GetDataTypeInfo(slot).TypeId; + + YQL_ENSURE(NKikimr::NScheme::NTypeIds::IsYqlType(typeId) && + NKikimr::NSchemeShard::IsAllowedKeyType(NKikimr::NScheme::TTypeInfo(typeId))); + + value.MutableType()->SetKind(NKikimrMiniKQL::Optional); + auto* toFill = value.MutableType()->MutableOptional()->MutableItem(); + + toFill->SetKind(NKikimrMiniKQL::ETypeKind::Data); + toFill->MutableData()->SetScheme(typeId); + + if (slot == EDataSlot::Decimal) { + const auto paramsDataType = typeann->Cast<TDataExprParamsType>(); + auto precision = FromString<ui8>(paramsDataType->GetParamOne()); + auto scale = FromString<ui8>(paramsDataType->GetParamTwo()); + toFill->MutableData()->MutableDecimalParams()->SetPrecision(precision); + toFill->MutableData()->MutableDecimalParams()->SetScale(scale); + } + + value.MutableValue()->SetNullFlagValue(::google::protobuf::NullValue::NULL_VALUE); +} void FillKeyBound(const TVarArgCallable<TExprBase>& bound, NKqpProto::TKqpPhyKeyBound& boundProto) { if (bound.Maybe<TKqlKeyInc>()) { @@ -217,6 +244,8 @@ void FillKeyBound(const TVarArgCallable<TExprBase>& bound, NKqpProto::TKqpPhyKey paramElementProto.SetElementIndex(FromString<ui32>(key.Cast<TCoNth>().Index().Value())); } else if (auto maybeLiteral = key.Maybe<TCoDataCtor>()) { FillLiteralProto(maybeLiteral.Cast(), *protoValue.MutableLiteralValue()); + } else if (auto maybeNull = key.Maybe<TCoNothing>()) { + FillNothing(maybeNull.Cast(), *protoValue.MutableLiteralValue()); } else { YQL_ENSURE(false, "Unexpected key bound: " << key.Ref().Content()); } @@ -343,6 +372,8 @@ void FillLookup(const TKqpLookupTable& lookup, NKqpProto::TKqpPhyOpLookup& looku if (auto maybeParam = tuple.Value().Maybe<TCoParameter>()) { protoColumn.MutableParamValue()->SetParamName(maybeParam.Cast().Name().StringValue()); + } else if (auto maybeNothing = tuple.Value().Maybe<TCoNothing>()) { + FillNothing(maybeNothing.Cast(), *protoColumn.MutableLiteralValue()); } else { YQL_ENSURE(tuple.Value().Maybe<TCoDataCtor>(), "" << tuple.Value().Ref().Dump()); FillLiteralProto(tuple.Value().Cast<TCoDataCtor>(), *protoColumn.MutableLiteralValue()); diff --git a/ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp b/ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp index 6ebd3e68b46..777eec3497c 100644 --- a/ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp +++ b/ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp @@ -242,9 +242,9 @@ Y_UNIT_TEST_SUITE(KqpIndexes) { UNIT_ASSERT_VALUES_EQUAL(NYdb::FormatResultSetYson(result.GetResultSet(0)), "[[#];[[7]]]"); auto& stats = NYdb::TProtoAccessor::GetProto(*result.GetStats()); - UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 2); + UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 1); - int phase = 1; + int phase = 0; UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(phase).table_access().size(), 1); UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(phase).table_access(0).name(), "/Root/SecondaryKeys/Index/indexImplTable"); UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(phase).table_access(0).reads().rows(), 2); diff --git a/ydb/core/kqp/ut/opt/kqp_extract_predicate_unpack_ut.cpp b/ydb/core/kqp/ut/opt/kqp_extract_predicate_unpack_ut.cpp index 4497b63c811..f32e2edfd27 100644 --- a/ydb/core/kqp/ut/opt/kqp_extract_predicate_unpack_ut.cpp +++ b/ydb/core/kqp/ut/opt/kqp_extract_predicate_unpack_ut.cpp @@ -120,8 +120,7 @@ Y_UNIT_TEST(SimpleRange) { )", R"([ [[100];["Value20"]];[[101];["Value21"]];[[102];["Value22"]];[[103];["Value23"]] - ])", - 2); + ])"); TestRange( R"( diff --git a/ydb/core/kqp/ut/perf/kqp_query_perf_ut.cpp b/ydb/core/kqp/ut/perf/kqp_query_perf_ut.cpp index f4ed0ed2805..7c09a845e2d 100644 --- a/ydb/core/kqp/ut/perf/kqp_query_perf_ut.cpp +++ b/ydb/core/kqp/ut/perf/kqp_query_perf_ut.cpp @@ -770,7 +770,7 @@ Y_UNIT_TEST_SUITE(KqpQueryPerf) { CompareYson(R"([[7u]])", FormatResultSetYson(checkResult.GetResultSet(0))); auto& stats = NYdb::TProtoAccessor::GetProto(*result.GetStats()); - UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 3); + UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 2); AssertTableStats(result, "/Root/Join2", { .ExpectedReads = 3, diff --git a/ydb/core/kqp/ut/query/kqp_query_ut.cpp b/ydb/core/kqp/ut/query/kqp_query_ut.cpp index 386d4f7dcbc..12e10734643 100644 --- a/ydb/core/kqp/ut/query/kqp_query_ut.cpp +++ b/ydb/core/kqp/ut/query/kqp_query_ut.cpp @@ -974,10 +974,9 @@ Y_UNIT_TEST_SUITE(KqpQuery) { UNIT_ASSERT(compile.cpu_time_us() > 0); totalCpuTimeUs += compile.cpu_time_us(); - UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 3); - totalCpuTimeUs += stats.query_phases(0).cpu_time_us(); + UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 2); - auto& phase0 = stats.query_phases(1); + auto& phase0 = stats.query_phases(0); UNIT_ASSERT(phase0.duration_us() > 0); UNIT_ASSERT(phase0.cpu_time_us() > 0); totalCpuTimeUs += phase0.cpu_time_us(); @@ -989,7 +988,7 @@ Y_UNIT_TEST_SUITE(KqpQuery) { UNIT_ASSERT(!phase0.table_access(0).has_updates()); UNIT_ASSERT(!phase0.table_access(0).has_deletes()); - auto& phase1 = stats.query_phases(2); + auto& phase1 = stats.query_phases(1); UNIT_ASSERT(phase1.duration_us() > 0); UNIT_ASSERT(phase1.cpu_time_us() > 0); totalCpuTimeUs += phase1.cpu_time_us(); diff --git a/ydb/core/kqp/ut/service/kqp_query_service_ut.cpp b/ydb/core/kqp/ut/service/kqp_query_service_ut.cpp index 7efc758660c..b594468a7e4 100644 --- a/ydb/core/kqp/ut/service/kqp_query_service_ut.cpp +++ b/ydb/core/kqp/ut/service/kqp_query_service_ut.cpp @@ -244,7 +244,7 @@ Y_UNIT_TEST_SUITE(KqpQueryService) { UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString()); auto& stats = NYdb::TProtoAccessor::GetProto(*result.GetStats()); - UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 2); + UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 1); CompareYson(R"([ [[1];[202u];["Value2"]]; @@ -364,7 +364,7 @@ Y_UNIT_TEST_SUITE(KqpQueryService) { UNIT_ASSERT(!result.GetStats()->GetPlan().Defined()); auto& stats = NYdb::TProtoAccessor::GetProto(*result.GetStats()); - UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 2); + UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 1); } Y_UNIT_TEST(ExecStatsPlan) { diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_bool.sql-plan_/pk_predicate_pk_predicate_bool.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_bool.sql-plan_/pk_predicate_pk_predicate_bool.sql.plan index 418e7dd2b45..a0507cd6ec9 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_bool.sql-plan_/pk_predicate_pk_predicate_bool.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_bool.sql-plan_/pk_predicate_pk_predicate_bool.sql.plan @@ -35,7 +35,7 @@ "Key1 (true)" ], "scan_by": [ - "Key2 (false, true)" + "Key2 (null, true)" ], "type": "Lookup" } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_null.sql-plan_/pk_predicate_pk_predicate_null.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_null.sql-plan_/pk_predicate_pk_predicate_null.sql.plan index b190f77743e..670c0ba7c65 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_null.sql-plan_/pk_predicate_pk_predicate_null.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_null.sql-plan_/pk_predicate_pk_predicate_null.sql.plan @@ -16,10 +16,10 @@ ], "limit": "1001", "lookup_by": [ - "Group (0)" + "Group (null)" ], "scan_by": [ - "Name (\u00ab\u00bb, \u00abName2\u00bb)" + "Name (null, Name2)" ], "type": "Lookup" } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_nonkey_rp.sql-plan_/pk_predicate_pk_predicate_range_nonkey_rp.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_nonkey_rp.sql-plan_/pk_predicate_pk_predicate_range_nonkey_rp.sql.plan index 2cca9acf4ee..c4d76bab62b 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_nonkey_rp.sql-plan_/pk_predicate_pk_predicate_range_nonkey_rp.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_nonkey_rp.sql-plan_/pk_predicate_pk_predicate_range_nonkey_rp.sql.plan @@ -15,7 +15,7 @@ "Name" ], "scan_by": [ - "Group (0, 4)", + "Group (null, 4)", "Name (-\u221e, +\u221e)" ], "type": "Scan" diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_upsert.sql-plan_/write_upsert.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_upsert.sql-plan_/write_upsert.sql.plan index bbb921e1fb2..0e70f924429 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_upsert.sql-plan_/write_upsert.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_upsert.sql-plan_/write_upsert.sql.plan @@ -13,7 +13,7 @@ "subkey" ], "scan_by": [ - "key (0, 5)", + "key (null, 5)", "subkey (-\u221e, +\u221e)" ], "type": "Scan" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_1.plan index ab6a1bb906b..2cb5a567386 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_1.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -52,7 +52,7 @@ ], "ReadLimit": "1001", "ReadRange": [ - "unique1 (0, 10)", + "unique1 (null, 10)", "unique2 (-\u221e, +\u221e)" ], "Table": "postgres_select.test_plan/onek" @@ -103,7 +103,7 @@ ], "limit": "1001", "scan_by": [ - "unique1 (0, 10)", + "unique1 (null, 10)", "unique2 (-\u221e, +\u221e)" ], "type": "Scan" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_2.plan index 3ba19f99901..52094f86e2e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_2.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -38,7 +38,7 @@ ], "ReadLimit": "1001", "ReadRange": [ - "unique1 (0, 20)", + "unique1 (null, 20)", "unique2 (-\u221e, +\u221e)" ], "Reverse": true, @@ -77,7 +77,7 @@ "limit": "1001", "reverse": true, "scan_by": [ - "unique1 (0, 20)", + "unique1 (null, 20)", "unique2 (-\u221e, +\u221e)" ], "type": "Scan" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_6.plan index a6f172f8172..14abde820c1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_6.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -38,7 +38,7 @@ "unique1" ], "ReadRange": [ - "unique1 (0, 20)", + "unique1 (null, 20)", "unique2 (-\u221e, +\u221e)" ], "Table": "postgres_select.test_plan/onek" @@ -75,7 +75,7 @@ "unique1" ], "scan_by": [ - "unique1 (0, 20)", + "unique1 (null, 20)", "unique2 (-\u221e, +\u221e)" ], "type": "Scan" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_7.plan index 872d758d7ff..98d34bd4ae9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_7.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -38,7 +38,7 @@ "unique1" ], "ReadRange": [ - "unique1 (0, 20)", + "unique1 (null, 20)", "unique2 (-\u221e, +\u221e)" ], "Table": "postgres_select.test_plan/onek" @@ -75,7 +75,7 @@ "unique1" ], "scan_by": [ - "unique1 (0, 20)", + "unique1 (null, 20)", "unique2 (-\u221e, +\u221e)" ], "type": "Scan" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_9.plan index 6b284a6c87c..2f426970d13 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_9.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -38,7 +38,7 @@ ], "ReadLimit": "1001", "ReadRange": [ - "unique1 (0, 20)", + "unique1 (null, 20)", "unique2 (-\u221e, +\u221e)" ], "Reverse": true, @@ -77,7 +77,7 @@ "limit": "1001", "reverse": true, "scan_by": [ - "unique1 (0, 20)", + "unique1 (null, 20)", "unique2 (-\u221e, +\u221e)" ], "type": "Scan" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_125.plan index ac0df63f654..feb912ec116 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_125.plan @@ -5,7 +5,7 @@ "Plans": [ { "Node Type": "ResultSet_1", - "PlanNodeId": 11, + "PlanNodeId": 9, "PlanNodeType": "ResultSet", "Plans": [ { @@ -16,11 +16,11 @@ "Name": "Limit" } ], - "PlanNodeId": 10, + "PlanNodeId": 8, "Plans": [ { "Node Type": "Merge", - "PlanNodeId": 9, + "PlanNodeId": 7, "PlanNodeType": "Connection", "Plans": [ { @@ -48,7 +48,7 @@ "e" ], "ReadRange": [ - "a (n/a)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -57,7 +57,7 @@ "Table": "sqllogictest_select2-1.test_plan/t1" } ], - "PlanNodeId": 8, + "PlanNodeId": 6, "Tables": [ "sqllogictest_select2-1.test_plan/t1" ] @@ -76,20 +76,7 @@ ] }, { - "Node Type": "Precompute_0_0", - "Parent Relationship": "InitPlan", - "PlanNodeId": 6, - "PlanNodeType": "Materialize", - "Plans": [ - { - "Node Type": "Stage", - "PlanNodeId": 5 - } - ], - "Subplan Name": "CTE tx_result_binding_0_0" - }, - { - "Node Type": "Precompute_0_1", + "Node Type": "Precompute_0", "Parent Relationship": "InitPlan", "PlanNodeId": 4, "PlanNodeType": "Materialize", @@ -146,7 +133,7 @@ ] } ], - "Subplan Name": "CTE tx_result_binding_0_1" + "Subplan Name": "CTE tx_result_binding_0_0" } ] }, @@ -180,7 +167,7 @@ "e" ], "lookup_by": [ - "a (n/a)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_15.plan index 81c7d49f995..1508fc7cfad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_15.plan @@ -5,7 +5,7 @@ "Plans": [ { "Node Type": "ResultSet_1", - "PlanNodeId": 11, + "PlanNodeId": 9, "PlanNodeType": "ResultSet", "Plans": [ { @@ -16,11 +16,11 @@ "Name": "Limit" } ], - "PlanNodeId": 10, + "PlanNodeId": 8, "Plans": [ { "Node Type": "Merge", - "PlanNodeId": 9, + "PlanNodeId": 7, "PlanNodeType": "Connection", "Plans": [ { @@ -48,7 +48,7 @@ "e" ], "ReadRange": [ - "a (n/a)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -57,7 +57,7 @@ "Table": "sqllogictest_select2-1.test_plan/t1" } ], - "PlanNodeId": 8, + "PlanNodeId": 6, "Tables": [ "sqllogictest_select2-1.test_plan/t1" ] @@ -78,20 +78,7 @@ ] }, { - "Node Type": "Precompute_0_0", - "Parent Relationship": "InitPlan", - "PlanNodeId": 6, - "PlanNodeType": "Materialize", - "Plans": [ - { - "Node Type": "Stage", - "PlanNodeId": 5 - } - ], - "Subplan Name": "CTE tx_result_binding_0_0" - }, - { - "Node Type": "Precompute_0_1", + "Node Type": "Precompute_0", "Parent Relationship": "InitPlan", "PlanNodeId": 4, "PlanNodeType": "Materialize", @@ -148,7 +135,7 @@ ] } ], - "Subplan Name": "CTE tx_result_binding_0_1" + "Subplan Name": "CTE tx_result_binding_0_0" } ] }, @@ -182,7 +169,7 @@ "e" ], "lookup_by": [ - "a (n/a)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_25.plan index 3045c0b2871..e1e97617c11 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_25.plan @@ -5,7 +5,7 @@ "Plans": [ { "Node Type": "ResultSet_1", - "PlanNodeId": 11, + "PlanNodeId": 9, "PlanNodeType": "ResultSet", "Plans": [ { @@ -16,11 +16,11 @@ "Name": "Limit" } ], - "PlanNodeId": 10, + "PlanNodeId": 8, "Plans": [ { "Node Type": "Merge", - "PlanNodeId": 9, + "PlanNodeId": 7, "PlanNodeType": "Connection", "Plans": [ { @@ -48,7 +48,7 @@ "e" ], "ReadRange": [ - "a (n/a)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -57,7 +57,7 @@ "Table": "sqllogictest_select2-1.test_plan/t1" } ], - "PlanNodeId": 8, + "PlanNodeId": 6, "Tables": [ "sqllogictest_select2-1.test_plan/t1" ] @@ -76,20 +76,7 @@ ] }, { - "Node Type": "Precompute_0_0", - "Parent Relationship": "InitPlan", - "PlanNodeId": 6, - "PlanNodeType": "Materialize", - "Plans": [ - { - "Node Type": "Stage", - "PlanNodeId": 5 - } - ], - "Subplan Name": "CTE tx_result_binding_0_0" - }, - { - "Node Type": "Precompute_0_1", + "Node Type": "Precompute_0", "Parent Relationship": "InitPlan", "PlanNodeId": 4, "PlanNodeType": "Materialize", @@ -146,7 +133,7 @@ ] } ], - "Subplan Name": "CTE tx_result_binding_0_1" + "Subplan Name": "CTE tx_result_binding_0_0" } ] }, @@ -180,7 +167,7 @@ "e" ], "lookup_by": [ - "a (n/a)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_30.plan index a6348605837..a1578ce2ce7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_30.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -41,7 +41,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -83,7 +83,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_42.plan index 1818e4e5c2c..58970b84659 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_42.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -41,7 +41,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -88,7 +88,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_57.plan index 49f207f9121..c9945d636a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_57.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -44,7 +44,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -85,7 +85,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_74.plan index 931575f8111..5de1b6e42ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_74.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -45,7 +45,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -91,7 +91,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_75.plan index bf672c947e7..26564109a57 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_75.plan @@ -5,7 +5,7 @@ "Plans": [ { "Node Type": "ResultSet_1", - "PlanNodeId": 11, + "PlanNodeId": 9, "PlanNodeType": "ResultSet", "Plans": [ { @@ -16,11 +16,11 @@ "Name": "Limit" } ], - "PlanNodeId": 10, + "PlanNodeId": 8, "Plans": [ { "Node Type": "Merge", - "PlanNodeId": 9, + "PlanNodeId": 7, "PlanNodeType": "Connection", "Plans": [ { @@ -48,7 +48,7 @@ "e" ], "ReadRange": [ - "a (n/a)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -57,7 +57,7 @@ "Table": "sqllogictest_select2-1.test_plan/t1" } ], - "PlanNodeId": 8, + "PlanNodeId": 6, "Tables": [ "sqllogictest_select2-1.test_plan/t1" ] @@ -76,20 +76,7 @@ ] }, { - "Node Type": "Precompute_0_0", - "Parent Relationship": "InitPlan", - "PlanNodeId": 6, - "PlanNodeType": "Materialize", - "Plans": [ - { - "Node Type": "Stage", - "PlanNodeId": 5 - } - ], - "Subplan Name": "CTE tx_result_binding_0_0" - }, - { - "Node Type": "Precompute_0_1", + "Node Type": "Precompute_0", "Parent Relationship": "InitPlan", "PlanNodeId": 4, "PlanNodeType": "Materialize", @@ -146,7 +133,7 @@ ] } ], - "Subplan Name": "CTE tx_result_binding_0_1" + "Subplan Name": "CTE tx_result_binding_0_0" } ] }, @@ -180,7 +167,7 @@ "e" ], "lookup_by": [ - "a (n/a)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_78.plan index e825ae05444..af76d214f58 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_78.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -45,7 +45,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -89,7 +89,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_124.plan index 49abd162acb..a8f7a0c0695 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_124.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -40,7 +40,7 @@ "d" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -83,7 +83,7 @@ "d" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_134.plan index 5435f86a886..f344ef64172 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_134.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -45,7 +45,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -87,7 +87,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_24.plan index 70fa681f780..3b4f59968ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_24.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -44,7 +44,7 @@ "d" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -86,7 +86,7 @@ "d" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_33.plan index fc1ad2b863f..310a358a125 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_33.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -44,7 +44,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -85,7 +85,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_46.plan index f8462c61ad2..80cddb45893 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_46.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -45,7 +45,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -89,7 +89,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_48.plan index 9136fad743a..463a7dc0082 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_48.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -45,7 +45,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -87,7 +87,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_5.plan index fbac3ae34cd..002ea427630 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_5.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -44,7 +44,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -88,7 +88,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_52.plan index 945a193ed5d..6e7246b94d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_52.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -41,7 +41,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -84,7 +84,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_72.plan index 885fedc7f7f..c009b164c2b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_72.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -41,7 +41,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -88,7 +88,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_84.plan index fb1af9931e0..e56e3a118ed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_84.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -45,7 +45,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -93,7 +93,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_102.plan index 9ab001736e4..0b2bfaf00d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_102.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -45,7 +45,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -89,7 +89,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_109.plan index fe9c4e96835..b85b87e1e11 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_109.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -42,7 +42,7 @@ "d" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -81,7 +81,7 @@ "d" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_24.plan index 10a720e9dce..2c9411980d0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_24.plan @@ -5,7 +5,7 @@ "Plans": [ { "Node Type": "ResultSet_1", - "PlanNodeId": 11, + "PlanNodeId": 9, "PlanNodeType": "ResultSet", "Plans": [ { @@ -16,11 +16,11 @@ "Name": "Limit" } ], - "PlanNodeId": 10, + "PlanNodeId": 8, "Plans": [ { "Node Type": "Merge", - "PlanNodeId": 9, + "PlanNodeId": 7, "PlanNodeType": "Connection", "Plans": [ { @@ -48,7 +48,7 @@ "e" ], "ReadRange": [ - "a (n/a)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -57,7 +57,7 @@ "Table": "sqllogictest_select2-3.test_plan/t1" } ], - "PlanNodeId": 8, + "PlanNodeId": 6, "Tables": [ "sqllogictest_select2-3.test_plan/t1" ] @@ -76,20 +76,7 @@ ] }, { - "Node Type": "Precompute_0_0", - "Parent Relationship": "InitPlan", - "PlanNodeId": 6, - "PlanNodeType": "Materialize", - "Plans": [ - { - "Node Type": "Stage", - "PlanNodeId": 5 - } - ], - "Subplan Name": "CTE tx_result_binding_0_0" - }, - { - "Node Type": "Precompute_0_1", + "Node Type": "Precompute_0", "Parent Relationship": "InitPlan", "PlanNodeId": 4, "PlanNodeType": "Materialize", @@ -146,7 +133,7 @@ ] } ], - "Subplan Name": "CTE tx_result_binding_0_1" + "Subplan Name": "CTE tx_result_binding_0_0" } ] }, @@ -180,7 +167,7 @@ "e" ], "lookup_by": [ - "a (n/a)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_46.plan index fa6d53c2a57..5dfdca1bbfa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_46.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -39,7 +39,7 @@ "c" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -79,7 +79,7 @@ "c" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_51.plan index 0d94964dd02..35bbb51ed2a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_51.plan @@ -5,7 +5,7 @@ "Plans": [ { "Node Type": "ResultSet_1", - "PlanNodeId": 11, + "PlanNodeId": 9, "PlanNodeType": "ResultSet", "Plans": [ { @@ -16,11 +16,11 @@ "Name": "Limit" } ], - "PlanNodeId": 10, + "PlanNodeId": 8, "Plans": [ { "Node Type": "Merge", - "PlanNodeId": 9, + "PlanNodeId": 7, "PlanNodeType": "Connection", "Plans": [ { @@ -46,7 +46,7 @@ "c" ], "ReadRange": [ - "a (n/a)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -55,7 +55,7 @@ "Table": "sqllogictest_select2-3.test_plan/t1" } ], - "PlanNodeId": 8, + "PlanNodeId": 6, "Tables": [ "sqllogictest_select2-3.test_plan/t1" ] @@ -71,20 +71,7 @@ ] }, { - "Node Type": "Precompute_0_0", - "Parent Relationship": "InitPlan", - "PlanNodeId": 6, - "PlanNodeType": "Materialize", - "Plans": [ - { - "Node Type": "Stage", - "PlanNodeId": 5 - } - ], - "Subplan Name": "CTE tx_result_binding_0_0" - }, - { - "Node Type": "Precompute_0_1", + "Node Type": "Precompute_0", "Parent Relationship": "InitPlan", "PlanNodeId": 4, "PlanNodeType": "Materialize", @@ -141,7 +128,7 @@ ] } ], - "Subplan Name": "CTE tx_result_binding_0_1" + "Subplan Name": "CTE tx_result_binding_0_0" } ] }, @@ -173,7 +160,7 @@ "c" ], "lookup_by": [ - "a (n/a)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_85.plan index 496854fdd96..646beb83593 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_85.plan @@ -5,7 +5,7 @@ "Plans": [ { "Node Type": "ResultSet_1", - "PlanNodeId": 11, + "PlanNodeId": 9, "PlanNodeType": "ResultSet", "Plans": [ { @@ -16,11 +16,11 @@ "Name": "Limit" } ], - "PlanNodeId": 10, + "PlanNodeId": 8, "Plans": [ { "Node Type": "Merge", - "PlanNodeId": 9, + "PlanNodeId": 7, "PlanNodeType": "Connection", "Plans": [ { @@ -48,7 +48,7 @@ "e" ], "ReadRange": [ - "a (n/a)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -57,7 +57,7 @@ "Table": "sqllogictest_select2-3.test_plan/t1" } ], - "PlanNodeId": 8, + "PlanNodeId": 6, "Tables": [ "sqllogictest_select2-3.test_plan/t1" ] @@ -76,20 +76,7 @@ ] }, { - "Node Type": "Precompute_0_0", - "Parent Relationship": "InitPlan", - "PlanNodeId": 6, - "PlanNodeType": "Materialize", - "Plans": [ - { - "Node Type": "Stage", - "PlanNodeId": 5 - } - ], - "Subplan Name": "CTE tx_result_binding_0_0" - }, - { - "Node Type": "Precompute_0_1", + "Node Type": "Precompute_0", "Parent Relationship": "InitPlan", "PlanNodeId": 4, "PlanNodeType": "Materialize", @@ -146,7 +133,7 @@ ] } ], - "Subplan Name": "CTE tx_result_binding_0_1" + "Subplan Name": "CTE tx_result_binding_0_0" } ] }, @@ -180,7 +167,7 @@ "e" ], "lookup_by": [ - "a (n/a)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_95.plan index db2d95ff1c4..3e7c0e46779 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_95.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -41,7 +41,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -86,7 +86,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_96.plan index a1e5705033d..7f9fd6dca38 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_96.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -43,7 +43,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -83,7 +83,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_100.plan index 1ad928748e6..375a4921a09 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_100.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -43,7 +43,7 @@ "d" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -84,7 +84,7 @@ "d" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_116.plan index da9dbaa42b7..5ab97e2f4b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_116.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -45,7 +45,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -92,7 +92,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_120.plan index f1500f6962d..5286082bba1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_120.plan @@ -5,7 +5,7 @@ "Plans": [ { "Node Type": "ResultSet_1", - "PlanNodeId": 11, + "PlanNodeId": 9, "PlanNodeType": "ResultSet", "Plans": [ { @@ -16,11 +16,11 @@ "Name": "Limit" } ], - "PlanNodeId": 10, + "PlanNodeId": 8, "Plans": [ { "Node Type": "Merge", - "PlanNodeId": 9, + "PlanNodeId": 7, "PlanNodeType": "Connection", "Plans": [ { @@ -48,7 +48,7 @@ "e" ], "ReadRange": [ - "a (n/a)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -57,7 +57,7 @@ "Table": "sqllogictest_select2-4.test_plan/t1" } ], - "PlanNodeId": 8, + "PlanNodeId": 6, "Tables": [ "sqllogictest_select2-4.test_plan/t1" ] @@ -78,20 +78,7 @@ ] }, { - "Node Type": "Precompute_0_0", - "Parent Relationship": "InitPlan", - "PlanNodeId": 6, - "PlanNodeType": "Materialize", - "Plans": [ - { - "Node Type": "Stage", - "PlanNodeId": 5 - } - ], - "Subplan Name": "CTE tx_result_binding_0_0" - }, - { - "Node Type": "Precompute_0_1", + "Node Type": "Precompute_0", "Parent Relationship": "InitPlan", "PlanNodeId": 4, "PlanNodeType": "Materialize", @@ -148,7 +135,7 @@ ] } ], - "Subplan Name": "CTE tx_result_binding_0_1" + "Subplan Name": "CTE tx_result_binding_0_0" } ] }, @@ -182,7 +169,7 @@ "e" ], "lookup_by": [ - "a (n/a)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_130.plan index 883277100dd..6b89aa135e0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_130.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -45,7 +45,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -91,7 +91,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_132.plan index efa6e9d7d00..051a08a473e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_132.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -44,8 +44,8 @@ "e" ], "ReadRange": [ - "a (0)", - "b (0, +\u221e)", + "a (null)", + "b (null, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", "e (-\u221e, +\u221e)" @@ -90,10 +90,10 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ - "b (0, +\u221e)", + "b (null, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", "e (-\u221e, +\u221e)" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_21.plan index 67b06b59e25..7882d19e7c7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_21.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -45,7 +45,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -87,7 +87,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_44.plan index 6becc8fa049..b84c90d55fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_44.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -45,7 +45,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -89,7 +89,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_62.plan index e2435985628..a664a5c801a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_62.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -45,7 +45,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -87,7 +87,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_73.plan index 33bc72833cd..ff4e4941baf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_73.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -41,7 +41,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -86,7 +86,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_79.plan index 54be255790c..0c39be189e2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_79.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -45,7 +45,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -88,7 +88,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_87.plan index 60589e7a3b9..ea57ab72e0e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_87.plan @@ -4,7 +4,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet_1", + "Node Type": "ResultSet", "PlanNodeId": 4, "PlanNodeType": "ResultSet", "Plans": [ @@ -44,7 +44,7 @@ "e" ], "ReadRange": [ - "a (0)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -87,7 +87,7 @@ "e" ], "lookup_by": [ - "a (0)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_96.plan index cabf19264fb..7fd45edf599 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_96.plan @@ -5,7 +5,7 @@ "Plans": [ { "Node Type": "ResultSet_1", - "PlanNodeId": 11, + "PlanNodeId": 9, "PlanNodeType": "ResultSet", "Plans": [ { @@ -16,11 +16,11 @@ "Name": "Limit" } ], - "PlanNodeId": 10, + "PlanNodeId": 8, "Plans": [ { "Node Type": "Merge", - "PlanNodeId": 9, + "PlanNodeId": 7, "PlanNodeType": "Connection", "Plans": [ { @@ -48,7 +48,7 @@ "e" ], "ReadRange": [ - "a (n/a)", + "a (null)", "b (-\u221e, +\u221e)", "c (-\u221e, +\u221e)", "d (-\u221e, +\u221e)", @@ -57,7 +57,7 @@ "Table": "sqllogictest_select2-4.test_plan/t1" } ], - "PlanNodeId": 8, + "PlanNodeId": 6, "Tables": [ "sqllogictest_select2-4.test_plan/t1" ] @@ -75,20 +75,7 @@ ] }, { - "Node Type": "Precompute_0_0", - "Parent Relationship": "InitPlan", - "PlanNodeId": 6, - "PlanNodeType": "Materialize", - "Plans": [ - { - "Node Type": "Stage", - "PlanNodeId": 5 - } - ], - "Subplan Name": "CTE tx_result_binding_0_0" - }, - { - "Node Type": "Precompute_0_1", + "Node Type": "Precompute_0", "Parent Relationship": "InitPlan", "PlanNodeId": 4, "PlanNodeType": "Materialize", @@ -145,7 +132,7 @@ ] } ], - "Subplan Name": "CTE tx_result_binding_0_1" + "Subplan Name": "CTE tx_result_binding_0_0" } ] }, @@ -179,7 +166,7 @@ "e" ], "lookup_by": [ - "a (n/a)" + "a (null)" ], "scan_by": [ "b (-\u221e, +\u221e)", |