diff --git a/ydb/core/kqp/opt/kqp_query_plan.cpp b/ydb/core/kqp/opt/kqp_query_plan.cpp index 3dd70e1f2120..fbebd4bca6b6 100644 --- a/ydb/core/kqp/opt/kqp_query_plan.cpp +++ b/ydb/core/kqp/opt/kqp_query_plan.cpp @@ -23,6 +23,7 @@ #include #include +#include #include namespace NKikimr { @@ -239,9 +240,39 @@ class TxPlanSerializer { } private: + struct TArgContext { + TVector stack; + + TArgContext(){} + + TArgContext AddArg(TExprNode* a) { + TArgContext res; + res.stack = stack; + res.stack.push_back(a); + return res; + } + + bool operator==(const TArgContext& other) const + { + return stack == other.stack; + } + + struct HashFunction + { + size_t operator()(const TArgContext& e) const + { + size_t res = 0; + for (auto el : e.stack) { + res += std::hash{}(el); + } + return res; + } + }; + }; + struct TOperator { TMap Properties; - TSet Inputs; + TVector> Inputs; }; enum class EPlanNodeType { @@ -300,17 +331,39 @@ class TxPlanSerializer { writer.WriteJsonValue(&value, true); } - if (op.Inputs.size() > 1) { - writer.WriteKey("Inputs"); - writer.BeginList(); + writer.WriteKey("Inputs"); + writer.BeginList(); - for (const auto& input : op.Inputs) { - writer.WriteInt(input); - } + for (const auto& input : op.Inputs) { - writer.EndList(); + if (std::holds_alternative(input)) { + writer.BeginObject(); + writer.WriteKey("InternalOperatorId"); + writer.WriteInt(std::get(input)); + writer.EndObject(); + } + else { + TArgContext c = std::get(input); + writer.BeginObject(); + auto input = LambdaInputs.find(c); + if (input != LambdaInputs.end()){ + if (std::holds_alternative(input->second)) { + writer.WriteKey("InternalOperatorId"); + writer.WriteInt(std::get(input->second)); + } else { + writer.WriteKey("ExternalPlanNodeId"); + writer.WriteInt(std::get(input->second)->NodeId); + } + } else { + writer.WriteKey("Other"); + writer.WriteString("ConstantExpression"); + } + writer.EndObject(); + } } + writer.EndList(); + writer.EndObject(); } @@ -824,21 +877,14 @@ class TxPlanSerializer { YQL_ENSURE(stagePlanNode.StageProto, "Could not find a stage with id " << stageGuid); SerializerCtx.StageGuidToId[stageGuid] = SerializerCtx.PlanNodeId; VisitedStages.insert(expr.Raw()); - auto node = expr.Cast().Program().Body().Ptr(); - Visit(node, stagePlanNode); - /* is that collect stage? */ - if (stagePlanNode.TypeName.Empty()) { - if (expr.Cast().Program().Body().Maybe()) { - stagePlanNode.TypeName = "Collect"; - } else { - stagePlanNode.TypeName = "Stage"; - } - } + TVector inputIds; for (const auto& input : expr.Cast().Inputs()) { if (auto source = input.Maybe()) { - Visit(source.Cast(), stagePlanNode); + auto& inputSourceNode = AddPlanNode(stagePlanNode); + Visit(source.Cast(), inputSourceNode); + inputIds.emplace_back(&inputSourceNode); } else { auto inputCn = input.Cast(); @@ -846,6 +892,30 @@ class TxPlanSerializer { FillConnectionPlanNode(inputCn, inputPlanNode); Visit(inputCn.Output().Stage(), inputPlanNode); + inputIds.emplace_back(&inputPlanNode); + } + } + + CurrentArgContext.stack.push_back(expr.Ptr().Get()); + + if (inputIds.size() == expr.Cast().Program().Args().Size()) { + for (const auto& arg : expr.Cast().Program().Args()) { + LambdaInputs[CurrentArgContext.AddArg(arg.Ptr().Get())] = inputIds[0]; + inputIds.erase(inputIds.begin()); + } + } + + auto node = expr.Cast().Program().Body().Ptr(); + Visit(node, stagePlanNode); + + CurrentArgContext.stack.pop_back(); + + /* is that collect stage? */ + if (stagePlanNode.TypeName.Empty()) { + if (expr.Cast().Program().Body().Maybe()) { + stagePlanNode.TypeName = "Collect"; + } else { + stagePlanNode.TypeName = "Stage"; } } @@ -865,8 +935,9 @@ class TxPlanSerializer { } } - TVector Visit(TExprNode::TPtr node, TQueryPlanNode& planNode) { - TMaybe operatorId; + TVector> Visit(TExprNode::TPtr node, TQueryPlanNode& planNode) { + TMaybe> operatorId; + if (auto maybeRead = TMaybeNode(node)) { operatorId = Visit(maybeRead.Cast(), planNode); } else if (auto maybeReadRanges = TMaybeNode(node)) { @@ -936,44 +1007,85 @@ class TxPlanSerializer { operatorId = Visit(maybeUpsert.Cast(), planNode); } else if (auto maybeDelete = TMaybeNode(node)) { operatorId = Visit(maybeDelete.Cast(), planNode); + } else if (auto maybeArg = TMaybeNode(node)) { + return {CurrentArgContext.AddArg(node.Get())}; } - TVector inputIds; + TVector> inputIds; if (auto maybeEffects = TMaybeNode(node)) { for (const auto& effect : maybeEffects.Cast().Args()) { auto ids = Visit(effect, planNode); inputIds.insert(inputIds.end(), ids.begin(), ids.end()); } } else { - for (const auto& child : node->Children()) { - auto ids = Visit(child, planNode); - inputIds.insert(inputIds.end(), ids.begin(), ids.end()); + if (TMaybeNode(node)) { + + auto flatMap = TExprBase(node).Cast(); + auto flatMapInputs = Visit(flatMap, planNode); + + inputIds.insert(inputIds.end(), flatMapInputs.begin(), flatMapInputs.end()); + + auto flatMapLambdaInputs = Visit(flatMap.Lambda().Body().Ptr(), planNode); + inputIds.insert(inputIds.end(), flatMapLambdaInputs.begin(), flatMapLambdaInputs.end()); + + } + else { + for (const auto& child : node->Children()) { + if(!child->IsLambda()) { + auto ids = Visit(child, planNode); + inputIds.insert(inputIds.end(), ids.begin(), ids.end()); + } + } } } if (operatorId) { - planNode.Operators[*operatorId].Inputs.insert(inputIds.begin(), inputIds.end()); - return {*operatorId}; + if (std::holds_alternative(*operatorId)) { + TVector>& opInputs = planNode.Operators[std::get(*operatorId)].Inputs; + opInputs.insert(opInputs.begin(), inputIds.begin(), inputIds.end()); + return {std::get(*operatorId)}; + } + else { + return {std::get(*operatorId)}; + } } return inputIds; } - ui32 Visit(const TCoCondense1& /*condense*/, TQueryPlanNode& planNode) { + TVector> Visit(const TCoFlatMapBase& flatMap, TQueryPlanNode& planNode) { + auto flatMapInputs = Visit(flatMap.Input().Ptr(), planNode); + + if (flatMapInputs.size() == 1) { + auto input = flatMapInputs[0]; + auto newContext = CurrentArgContext.AddArg(flatMap.Lambda().Args().Arg(0).Ptr().Get()); + + if (std::holds_alternative(input)) { + LambdaInputs[newContext] = std::get(input); + } else { + auto content = std::get(input); + LambdaInputs[newContext] = LambdaInputs.at(std::get(input)); + } + } + + return flatMapInputs; + } + + std::variant Visit(const TCoCondense1& /*condense*/, TQueryPlanNode& planNode) { TOperator op; op.Properties["Name"] = "Aggregate"; return AddOperator(planNode, "Aggregate", std::move(op)); } - ui32 Visit(const TCoCondense& /*condense*/, TQueryPlanNode& planNode) { + std::variant Visit(const TCoCondense& /*condense*/, TQueryPlanNode& planNode) { TOperator op; op.Properties["Name"] = "Aggregate"; return AddOperator(planNode, "Aggregate", std::move(op)); } - ui32 Visit(const TCoCombineCore& combiner, TQueryPlanNode& planNode) { + std::variant Visit(const TCoCombineCore& combiner, TQueryPlanNode& planNode) { TOperator op; op.Properties["Name"] = "Aggregate"; op.Properties["GroupBy"] = NPlanUtils::PrettyExprStr(combiner.KeyExtractor()); @@ -982,7 +1094,7 @@ class TxPlanSerializer { return AddOperator(planNode, "Aggregate", std::move(op)); } - ui32 Visit(const TCoSort& sort, TQueryPlanNode& planNode) { + std::variant Visit(const TCoSort& sort, TQueryPlanNode& planNode) { TOperator op; op.Properties["Name"] = "Sort"; op.Properties["SortBy"] = NPlanUtils::PrettyExprStr(sort.KeySelectorLambda()); @@ -990,7 +1102,7 @@ class TxPlanSerializer { return AddOperator(planNode, "Sort", std::move(op)); } - ui32 Visit(const TCoTop& top, TQueryPlanNode& planNode) { + std::variant Visit(const TCoTop& top, TQueryPlanNode& planNode) { TOperator op; op.Properties["Name"] = "Top"; op.Properties["TopBy"] = NPlanUtils::PrettyExprStr(top.KeySelectorLambda()); @@ -999,7 +1111,7 @@ class TxPlanSerializer { return AddOperator(planNode, "Top", std::move(op)); } - ui32 Visit(const TCoTopSort& topSort, TQueryPlanNode& planNode) { + std::variant Visit(const TCoTopSort& topSort, TQueryPlanNode& planNode) { TOperator op; op.Properties["Name"] = "TopSort"; op.Properties["TopSortBy"] = NPlanUtils::PrettyExprStr(topSort.KeySelectorLambda()); @@ -1008,7 +1120,7 @@ class TxPlanSerializer { return AddOperator(planNode, "TopSort", std::move(op)); } - ui32 Visit(const TCoTake& take, TQueryPlanNode& planNode) { + std::variant Visit(const TCoTake& take, TQueryPlanNode& planNode) { TOperator op; op.Properties["Name"] = "Limit"; op.Properties["Limit"] = NPlanUtils::PrettyExprStr(take.Count()); @@ -1016,7 +1128,7 @@ class TxPlanSerializer { return AddOperator(planNode, "Limit", std::move(op)); } - ui32 Visit(const TCoSkip& skip, TQueryPlanNode& planNode) { + std::variant Visit(const TCoSkip& skip, TQueryPlanNode& planNode) { TOperator op; op.Properties["Name"] = "Offset"; op.Properties["Offset"] = NPlanUtils::PrettyExprStr(skip.Count()); @@ -1024,14 +1136,14 @@ class TxPlanSerializer { return AddOperator(planNode, "Offset", std::move(op)); } - ui32 Visit(const TCoExtendBase& /*extend*/, TQueryPlanNode& planNode) { + std::variant Visit(const TCoExtendBase& /*extend*/, TQueryPlanNode& planNode) { TOperator op; op.Properties["Name"] = "Union"; return AddOperator(planNode, "Union", std::move(op)); } - TMaybe Visit(const TCoToFlow& toflow, TQueryPlanNode& planNode) { + TMaybe> Visit(const TCoToFlow& toflow, TQueryPlanNode& planNode) { const auto toflowValue = NPlanUtils::PrettyExprStr(toflow.Input()); TOperator op; @@ -1042,13 +1154,18 @@ class TxPlanSerializer { planNode.CteRefName = TStringBuilder() << "precompute_" << txId << "_" << resId; op.Properties["ToFlow"] = *planNode.CteRefName; } else { - return TMaybe(); + auto inputs = Visit(toflow.Input().Ptr(), planNode); + if (inputs.size() == 1) { + return inputs[0]; + } else { + return TMaybe> (); + } } return AddOperator(planNode, "ConstantExpr", std::move(op)); } - ui32 Visit(const TCoIterator& iter, TQueryPlanNode& planNode) { + std::variant Visit(const TCoIterator& iter, TQueryPlanNode& planNode) { const auto iterValue = NPlanUtils::PrettyExprStr(iter.List()); TOperator op; @@ -1065,7 +1182,7 @@ class TxPlanSerializer { return AddOperator(planNode, "ConstantExpr", std::move(op)); } - ui32 Visit(const TCoPartitionByKey& partitionByKey, TQueryPlanNode& planNode) { + std::variant Visit(const TCoPartitionByKey& partitionByKey, TQueryPlanNode& planNode) { const auto inputValue = NPlanUtils::PrettyExprStr(partitionByKey.Input()); TOperator op; @@ -1082,7 +1199,7 @@ class TxPlanSerializer { return AddOperator(planNode, "Aggregate", std::move(op)); } - ui32 Visit(const TKqpUpsertRows& upsert, TQueryPlanNode& planNode) { + std::variant Visit(const TKqpUpsertRows& upsert, TQueryPlanNode& planNode) { const auto table = upsert.Table().Path().StringValue(); TOperator op; @@ -1101,7 +1218,7 @@ class TxPlanSerializer { return AddOperator(planNode, "Upsert", std::move(op)); } - ui32 Visit(const TKqpDeleteRows& del, TQueryPlanNode& planNode) { + std::variant Visit(const TKqpDeleteRows& del, TQueryPlanNode& planNode) { const auto table = del.Table().Path().StringValue(); TOperator op; @@ -1117,7 +1234,7 @@ class TxPlanSerializer { return AddOperator(planNode, "Delete", std::move(op)); } - ui32 Visit(const TCoFlatMapBase& flatMap, const TCoMapJoinCore& join, TQueryPlanNode& planNode) { + std::variant Visit(const TCoFlatMapBase& flatMap, const TCoMapJoinCore& join, TQueryPlanNode& planNode) { const auto name = TStringBuilder() << join.JoinKind().Value() << "Join (MapJoin)"; TOperator op; @@ -1127,12 +1244,12 @@ class TxPlanSerializer { auto operatorId = AddOperator(planNode, name, std::move(op)); - auto inputs = Visit(flatMap.Input().Ptr(), planNode); - planNode.Operators[operatorId].Inputs.insert(inputs.begin(), inputs.end()); + Visit(flatMap, planNode); + return operatorId; } - ui32 Visit(const TCoMapJoinCore& join, TQueryPlanNode& planNode) { + std::variant Visit(const TCoMapJoinCore& join, TQueryPlanNode& planNode) { const auto name = TStringBuilder() << join.JoinKind().Value() << "Join (MapJoin)"; TOperator op; @@ -1143,7 +1260,7 @@ class TxPlanSerializer { return AddOperator(planNode, name, std::move(op)); } - ui32 Visit(const TCoFlatMapBase& flatMap, const TCoJoinDict& join, TQueryPlanNode& planNode) { + std::variant Visit(const TCoFlatMapBase& flatMap, const TCoJoinDict& join, TQueryPlanNode& planNode) { const auto name = TStringBuilder() << join.JoinKind().Value() << "Join (JoinDict)"; TOperator op; @@ -1153,12 +1270,12 @@ class TxPlanSerializer { auto operatorId = AddOperator(planNode, name, std::move(op)); - auto inputs = Visit(flatMap.Input().Ptr(), planNode); - planNode.Operators[operatorId].Inputs.insert(inputs.begin(), inputs.end()); + Visit(flatMap, planNode); + return operatorId; } - ui32 Visit(const TCoJoinDict& join, TQueryPlanNode& planNode) { + std::variant Visit(const TCoJoinDict& join, TQueryPlanNode& planNode) { const auto name = TStringBuilder() << join.JoinKind().Value() << "Join (JoinDict)"; TOperator op; @@ -1169,7 +1286,7 @@ class TxPlanSerializer { return AddOperator(planNode, name, std::move(op)); } - ui32 Visit(const TCoFlatMapBase& flatMap, const TCoGraceJoinCore& join, TQueryPlanNode& planNode) { + std::variant Visit(const TCoFlatMapBase& flatMap, const TCoGraceJoinCore& join, TQueryPlanNode& planNode) { const auto name = TStringBuilder() << join.JoinKind().Value() << "Join (Grace)"; TOperator op; @@ -1178,12 +1295,12 @@ class TxPlanSerializer { AddOptimizerEstimates(op, join); - auto inputs = Visit(flatMap.Input().Ptr(), planNode); - planNode.Operators[operatorId].Inputs.insert(inputs.begin(), inputs.end()); + Visit(flatMap, planNode); + return operatorId; } - ui32 Visit(const TCoGraceJoinCore& join, TQueryPlanNode& planNode) { + std::variant Visit(const TCoGraceJoinCore& join, TQueryPlanNode& planNode) { const auto name = TStringBuilder() << join.JoinKind().Value() << "Join (Grace)"; TOperator op; @@ -1210,7 +1327,7 @@ class TxPlanSerializer { } } - ui32 Visit(const TCoFilterBase& filter, TQueryPlanNode& planNode) { + std::variant Visit(const TCoFilterBase& filter, TQueryPlanNode& planNode) { TOperator op; op.Properties["Name"] = "Filter"; @@ -1226,7 +1343,7 @@ class TxPlanSerializer { return AddOperator(planNode, "Filter", std::move(op)); } - ui32 Visit(const TKqlLookupTableBase& lookup, TQueryPlanNode& planNode) { + std::variant Visit(const TKqlLookupTableBase& lookup, TQueryPlanNode& planNode) { auto table = TString(lookup.Table().Path().Value()); auto& tableData = SerializerCtx.TablesData->GetTable(SerializerCtx.Cluster, table); @@ -1265,7 +1382,7 @@ class TxPlanSerializer { return AddOperator(planNode, readName, std::move(op)); } - ui32 Visit(const TKqlReadTableRangesBase& read, TQueryPlanNode& planNode) { + std::variant Visit(const TKqlReadTableRangesBase& read, TQueryPlanNode& planNode) { const auto table = TString(read.Table().Path()); const auto explainPrompt = TKqpReadTableExplainPrompt::Parse(read); @@ -1371,7 +1488,7 @@ class TxPlanSerializer { return operatorId; } - ui32 Visit(const TKqlReadTableBase& read, TQueryPlanNode& planNode) { + std::variant Visit(const TKqlReadTableBase& read, TQueryPlanNode& planNode) { auto table = TString(read.Table().Path()); auto range = read.Range(); @@ -1512,6 +1629,8 @@ class TxPlanSerializer { TMap QueryPlanNodes; TNodeSet VisitedStages; + std::unordered_map, TArgContext::HashFunction> LambdaInputs; + TArgContext CurrentArgContext; }; using ModifyFunction = std::function; diff --git a/ydb/core/kqp/ut/federated_query/s3/kqp_s3_plan_ut.cpp b/ydb/core/kqp/ut/federated_query/s3/kqp_s3_plan_ut.cpp index 110d559a75a8..c29075f12c73 100644 --- a/ydb/core/kqp/ut/federated_query/s3/kqp_s3_plan_ut.cpp +++ b/ydb/core/kqp/ut/federated_query/s3/kqp_s3_plan_ut.cpp @@ -66,8 +66,8 @@ Y_UNIT_TEST_SUITE(KqpS3PlanTest) { UNIT_ASSERT(NJson::ReadJsonTree(*queryResult.GetStats()->GetPlan(), &plan)); const auto& stagePlan = plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]; - UNIT_ASSERT_VALUES_EQUAL(stagePlan["Node Type"].GetStringSafe(), "Stage-Source"); - const auto& sourceOp = stagePlan["Operators"].GetArraySafe()[0]; + UNIT_ASSERT_VALUES_EQUAL(stagePlan["Node Type"].GetStringSafe(), "Stage"); + const auto& sourceOp = stagePlan["Plans"][0]["Operators"].GetArraySafe()[0]; UNIT_ASSERT_VALUES_EQUAL(sourceOp["ExternalDataSource"].GetStringSafe(), "external_data_source"); UNIT_ASSERT_VALUES_EQUAL(sourceOp["Format"].GetStringSafe(), "json_each_row"); UNIT_ASSERT_VALUES_EQUAL(sourceOp["Name"].GetStringSafe(), "Parse from external data source"); @@ -150,10 +150,11 @@ Y_UNIT_TEST_SUITE(KqpS3PlanTest) { UNIT_ASSERT_VALUES_EQUAL(sinkOp["ExternalDataSource"].GetStringSafe(), "write_data_source"); UNIT_ASSERT_VALUES_EQUAL(sinkOp["Compression"].GetStringSafe(), "gzip"); - const auto& readStagePlan = plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]; - UNIT_ASSERT_VALUES_EQUAL(readStagePlan["Node Type"].GetStringSafe(), "Limit-Source"); - const auto& sourceOp = readStagePlan["Operators"].GetArraySafe()[1]; + const auto& readStagePlan = plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]; + UNIT_ASSERT_VALUES_EQUAL(readStagePlan["Node Type"].GetStringSafe(), "Source"); + const auto& sourceOp = readStagePlan["Operators"].GetArraySafe()[0]; UNIT_ASSERT_VALUES_EQUAL(sourceOp["ExternalDataSource"].GetStringSafe(), "read_data_source"); + UNIT_ASSERT_VALUES_EQUAL(sourceOp["RowsLimitHint"].GetStringSafe(), "10"); UNIT_ASSERT_VALUES_EQUAL(sourceOp["ReadColumns"].GetArraySafe()[0].GetStringSafe(), "key"); UNIT_ASSERT_VALUES_EQUAL(sourceOp["ReadColumns"].GetArraySafe()[1].GetStringSafe(), "value"); diff --git a/ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp b/ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp index 509e4b2bc7ff..6574e7a8a093 100644 --- a/ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp +++ b/ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp @@ -249,10 +249,10 @@ Y_UNIT_TEST_SUITE(KqpIndexMetadata) { auto indexTableAccess = CountPlanNodesByKv(plan, "Table", "tg/tg_index/indexImplTable"); UNIT_ASSERT_VALUES_EQUAL(indexTableAccess, 1); - auto filterOnIndex = CountPlanNodesByKv(plan, "Node Type", "Limit-Filter-TableRangeScan"); + auto filterOnIndex = CountPlanNodesByKv(plan, "Node Type", "Limit-Filter"); UNIT_ASSERT_VALUES_EQUAL(filterOnIndex, 1); - auto limitFilterNode = FindPlanNodeByKv(plan, "Node Type", "Limit-Filter-TableRangeScan"); + auto limitFilterNode = FindPlanNodeByKv(plan, "Node Type", "Limit-Filter"); auto val = FindPlanNodes(limitFilterNode, "Limit"); UNIT_ASSERT_VALUES_EQUAL(val.size(), 1); UNIT_ASSERT_VALUES_EQUAL(val[0], "11"); diff --git a/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp b/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp index adc7addeac75..1c7ca308fcbd 100644 --- a/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp +++ b/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp @@ -2073,7 +2073,7 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) { NJson::TJsonValue plan; NJson::ReadJsonTree(result.GetPlan(), &plan, true); - auto node = FindPlanNodeByKv(plan, "Node Type", "Limit-TableFullScan"); + auto node = FindPlanNodeByKv(plan, "Node Type", "TableFullScan"); UNIT_ASSERT(node.IsDefined()); TStringBuilder readLimitValue; diff --git a/ydb/core/kqp/ut/opt/kqp_sort_ut.cpp b/ydb/core/kqp/ut/opt/kqp_sort_ut.cpp index 50118820a687..df342c525fcf 100644 --- a/ydb/core/kqp/ut/opt/kqp_sort_ut.cpp +++ b/ydb/core/kqp/ut/opt/kqp_sort_ut.cpp @@ -25,7 +25,8 @@ Y_UNIT_TEST_SUITE(KqpSort) { NJson::TJsonValue plan; NJson::ReadJsonTree(result.GetPlan(), &plan, true); - auto node = FindPlanNodeByKv(plan, "Node Type", "Limit-TableFullScan"); // without `Sort` + Cout << plan; + auto node = FindPlanNodeByKv(plan, "Node Type", "TableFullScan"); // without `Sort` UNIT_ASSERT(node.IsDefined()); auto read = FindPlanNodeByKv(node, "Name", "TableFullScan"); UNIT_ASSERT(read.IsDefined()); @@ -60,13 +61,8 @@ Y_UNIT_TEST_SUITE(KqpSort) { NJson::TJsonValue plan; NJson::ReadJsonTree(result.GetPlan(), &plan, true); - auto node = FindPlanNodeByKv(plan, "Node Type", "Limit-Filter-TableRangeScan"); // without `Sort` - if (!node.IsDefined()) { - node = FindPlanNodeByKv(plan, "Node Type", "Filter-TableRangeScan"); // without `Sort` - } - if (!node.IsDefined()) { - node = FindPlanNodeByKv(plan, "Node Type", "Limit-TableRangeScan"); // without `Sort` - } + Cout << plan; + auto node = FindPlanNodeByKv(plan, "Node Type", "TableRangeScan"); // without `Sort` UNIT_ASSERT_C(node.IsDefined(), result.GetPlan()); auto read = FindPlanNodeByKv(node, "Name", "TableRangeScan"); UNIT_ASSERT(read.IsDefined()); @@ -100,7 +96,8 @@ Y_UNIT_TEST_SUITE(KqpSort) { NJson::TJsonValue plan; NJson::ReadJsonTree(result.GetPlan(), &plan, true); - auto node = FindPlanNodeByKv(plan, "Node Type", "Limit-TableFullScan"); // without `Sort` + Cout << plan; + auto node = FindPlanNodeByKv(plan, "Node Type", "TableFullScan"); // without `Sort` UNIT_ASSERT_C(node.IsDefined(), result.GetPlan()); auto read = FindPlanNodeByKv(node, "Name", "TableFullScan"); UNIT_ASSERT(read.IsDefined()); @@ -137,7 +134,8 @@ Y_UNIT_TEST_SUITE(KqpSort) { NJson::TJsonValue plan; NJson::ReadJsonTree(result.GetPlan(), &plan, true); - auto node = FindPlanNodeByKv(plan, "Node Type", "TopSort-TableFullScan"); + Cout << plan; + auto node = FindPlanNodeByKv(plan, "Node Type", "TableFullScan"); UNIT_ASSERT_C(node.IsDefined(), result.GetPlan()); UNIT_ASSERT(!node.GetMapSafe().contains("Reverse")); } @@ -173,13 +171,8 @@ Y_UNIT_TEST_SUITE(KqpSort) { NJson::TJsonValue plan; NJson::ReadJsonTree(result.GetPlan(), &plan, true); - auto node = FindPlanNodeByKv(plan, "Node Type", "Limit-Filter-TableRangeScan"); - if (!node.IsDefined()) { - node = FindPlanNodeByKv(plan, "Node Type", "Filter-TableRangeScan"); - } - if (!node.IsDefined()) { - node = FindPlanNodeByKv(plan, "Node Type", "Limit-TableRangeScan"); - } + Cout << plan; + auto node = FindPlanNodeByKv(plan, "Node Type", "TableRangeScan"); UNIT_ASSERT_C(node.IsDefined(), result.GetPlan()); auto read = FindPlanNodeByKv(node, "Name", "TableRangeScan"); UNIT_ASSERT(read.IsDefined()); @@ -218,12 +211,13 @@ Y_UNIT_TEST_SUITE(KqpSort) { NJson::TJsonValue plan; NJson::ReadJsonTree(result.GetPlan(), &plan, true); - auto node = FindPlanNodeByKv(plan, "Node Type", "Limit-TableFullScan"); + Cout << plan; + auto node = FindPlanNodeByKv(plan, "Node Type", "TableFullScan"); UNIT_ASSERT_C(node.IsDefined(), result.GetPlan()); auto read = FindPlanNodeByKv(node, "Name", "TableFullScan"); UNIT_ASSERT(read.IsDefined()); UNIT_ASSERT(read.GetMapSafe().contains("Reverse")); - auto limit = FindPlanNodeByKv(node, "Name", "Limit"); + auto limit = FindPlanNodeByKv(plan, "Name", "Limit"); UNIT_ASSERT(limit.IsDefined()); UNIT_ASSERT(limit.GetMapSafe().contains("Limit")); } @@ -258,26 +252,15 @@ Y_UNIT_TEST_SUITE(KqpSort) { NJson::TJsonValue plan; NJson::ReadJsonTree(result.GetPlan(), &plan, true); - auto node = FindPlanNodeByKv(plan, "Node Type", "Limit-Filter-TableRangeScan"); - if (!node.IsDefined()) { - node = FindPlanNodeByKv(plan, "Node Type", "Filter-TableRangeScan"); - } - if (!node.IsDefined()) { - node = FindPlanNodeByKv(plan, "Node Type", "Limit-TableRangeScan"); - } + Cout << plan; + auto node = FindPlanNodeByKv(plan, "Node Type", "TableRangeScan"); + UNIT_ASSERT_C(node.IsDefined(), result.GetPlan()); auto read = FindPlanNodeByKv(node, "Name", "TableRangeScan"); UNIT_ASSERT(read.IsDefined()); UNIT_ASSERT(read.GetMapSafe().contains("Reverse")); - auto limit = FindPlanNodeByKv(node, "Name", "Limit"); - if (!limit.IsDefined()) { - limit = FindPlanNodeByKv(node, "Name", "Filter"); - UNIT_ASSERT(limit.GetMapSafe().contains("Limit")); - } else { - UNIT_ASSERT(limit.IsDefined()); - UNIT_ASSERT(limit.GetMapSafe().contains("Limit")); - UNIT_ASSERT_C(result.GetAst().Contains("'\"ItemsLimit\""), result.GetAst()); - } + + UNIT_ASSERT_C(result.GetAst().Contains("'\"ItemsLimit\""), result.GetAst()); } { @@ -311,7 +294,8 @@ Y_UNIT_TEST_SUITE(KqpSort) { NJson::TJsonValue plan; NJson::ReadJsonTree(result.GetPlan(), &plan, true); - auto node = FindPlanNodeByKv(plan, "Node Type", "Limit-TableFullScan"); + Cout << plan; + auto node = FindPlanNodeByKv(plan, "Node Type", "TableFullScan"); UNIT_ASSERT_C(node.IsDefined(), result.GetPlan()); auto read = FindPlanNodeByKv(node, "Name", "TableFullScan"); UNIT_ASSERT(read.IsDefined()); @@ -358,10 +342,8 @@ Y_UNIT_TEST_SUITE(KqpSort) { NJson::TJsonValue plan; NJson::ReadJsonTree(result.GetPlan(), &plan, true); - auto node = FindPlanNodeByKv(plan, "Node Type", "TopSort-TableRangeScan"); - if (!node.IsDefined()) { - node = FindPlanNodeByKv(plan, "Node Type", "TopSort-Filter-TableRangeScan"); - } + Cout << plan; + auto node = FindPlanNodeByKv(plan, "Node Type", "TableRangeScan"); UNIT_ASSERT_C(node.IsDefined(), result.GetPlan()); } @@ -415,10 +397,8 @@ Y_UNIT_TEST_SUITE(KqpSort) { NJson::TJsonValue plan; NJson::ReadJsonTree(result.GetPlan(), &plan, true); - auto node = FindPlanNodeByKv(plan, "Node Type", "TopSort-TableRangeScan"); - if (!node.IsDefined()) { - node = FindPlanNodeByKv(plan, "Node Type", "TopSort-Filter-TableRangeScan"); - } + Cout << plan; + auto node = FindPlanNodeByKv(plan, "Node Type", "TableRangeScan"); UNIT_ASSERT_C(node.IsDefined(), result.GetPlan()); } @@ -920,7 +900,8 @@ Y_UNIT_TEST_SUITE(KqpSort) { NJson::TJsonValue plan; NJson::ReadJsonTree(result.GetPlan(), &plan, true); - auto node = FindPlanNodeByKv(plan, "Node Type", "Limit-TableFullScan"); + Cout << plan; + auto node = FindPlanNodeByKv(plan, "Node Type", "TableFullScan"); UNIT_ASSERT_C(node.IsDefined(), result.GetPlan()); } @@ -966,8 +947,10 @@ Y_UNIT_TEST_SUITE(KqpSort) { NJson::TJsonValue plan; NJson::ReadJsonTree(result.GetPlan(), &plan, true); - auto node = FindPlanNodeByKv(plan, "Node Type", "Limit-Filter-TableFullScan"); + Cout << plan; + auto node = FindPlanNodeByKv(plan, "Node Type", "TableFullScan"); UNIT_ASSERT_C(node.IsDefined(), result.GetPlan()); + node = FindPlanNodeByKv(plan, "Node Type", "Limit-Filter"); auto limit = FindPlanNodeByKv(node, "Limit", "Min(1001,$limit)"); UNIT_ASSERT(limit.IsDefined()); } @@ -1053,20 +1036,12 @@ Y_UNIT_TEST_SUITE(KqpSort) { NJson::TJsonValue plan; NJson::ReadJsonTree(result.GetPlan(), &plan, true); + Cout << plan; - auto tableRangeRead = FindPlanNodeByKv(plan, "Node Type", "Limit-Filter-TableRangeScan"); - size_t lookupIndex = 2; - if (!tableRangeRead.IsDefined()) { - tableRangeRead = FindPlanNodeByKv(plan, "Node Type", "Limit-TableRangeScan"); - lookupIndex = 1; - } + auto tableRangeRead = FindPlanNodeByKv(plan, "Node Type", "TableRangeScan"); UNIT_ASSERT(tableRangeRead.IsDefined()); - auto& limitOp = tableRangeRead.GetMapSafe().at("Operators").GetArraySafe().at(0).GetMapSafe(); - UNIT_ASSERT_VALUES_EQUAL("Limit", limitOp.at("Name").GetStringSafe()); - UNIT_ASSERT_VALUES_EQUAL("$limit", limitOp.at("Limit").GetStringSafe()); - - auto& rangeReadOp = tableRangeRead.GetMapSafe().at("Operators").GetArraySafe().at(lookupIndex).GetMapSafe(); + auto& rangeReadOp = tableRangeRead.GetMapSafe().at("Operators").GetArraySafe().at(0).GetMapSafe(); UNIT_ASSERT_VALUES_EQUAL("TableRangeScan", rangeReadOp.at("Name").GetStringSafe()); UNIT_ASSERT_VALUES_EQUAL("index", rangeReadOp.at("Table").GetStringSafe()); } 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 ddf538058fd2..694e7f32793e 100644 --- a/ydb/core/kqp/ut/perf/kqp_query_perf_ut.cpp +++ b/ydb/core/kqp/ut/perf/kqp_query_perf_ut.cpp @@ -174,11 +174,13 @@ Y_UNIT_TEST_SUITE(KqpQueryPerf) { NJson::ReadJsonTree(stats.query_plan(), &plan, true); auto stages = FindPlanStages(plan); - UNIT_ASSERT_VALUES_EQUAL(stages.size(), 1); + UNIT_ASSERT_VALUES_EQUAL(stages.size(), 2); i64 totalTasks = 0; for (const auto& stage : stages) { - totalTasks += stage.GetMapSafe().at("Stats").GetMapSafe().at("Tasks").GetIntegerSafe(); + if (stage.GetMapSafe().contains("Stats")) { + totalTasks += stage.GetMapSafe().at("Stats").GetMapSafe().at("Tasks").GetIntegerSafe(); + } } UNIT_ASSERT_VALUES_EQUAL(totalTasks, 1); @@ -224,11 +226,13 @@ Y_UNIT_TEST_SUITE(KqpQueryPerf) { NJson::ReadJsonTree(stats.query_plan(), &plan, true); auto stages = FindPlanStages(plan); - UNIT_ASSERT_VALUES_EQUAL(stages.size(), 3); + UNIT_ASSERT_VALUES_EQUAL(stages.size(), 4); i64 totalTasks = 0; for (const auto& stage : stages) { - totalTasks += stage.GetMapSafe().at("Stats").GetMapSafe().at("Tasks").GetIntegerSafe(); + if (stage.GetMapSafe().contains("Stats")) { + totalTasks += stage.GetMapSafe().at("Stats").GetMapSafe().at("Tasks").GetIntegerSafe(); + } } UNIT_ASSERT_VALUES_EQUAL(totalTasks, 3); } @@ -269,11 +273,13 @@ Y_UNIT_TEST_SUITE(KqpQueryPerf) { NJson::ReadJsonTree(stats.query_plan(), &plan, true); auto stages = FindPlanStages(plan); - UNIT_ASSERT_VALUES_EQUAL(stages.size(), 2); + UNIT_ASSERT_VALUES_EQUAL(stages.size(), 3); i64 totalTasks = 0; for (const auto& stage : stages) { - totalTasks += stage.GetMapSafe().at("Stats").GetMapSafe().at("Tasks").GetIntegerSafe(); + if (stage.GetMapSafe().contains("Stats")) { + totalTasks += stage.GetMapSafe().at("Stats").GetMapSafe().at("Tasks").GetIntegerSafe(); + } } UNIT_ASSERT_VALUES_EQUAL(totalTasks, 2); } diff --git a/ydb/core/kqp/ut/query/kqp_explain_ut.cpp b/ydb/core/kqp/ut/query/kqp_explain_ut.cpp index f359d21f7e35..33bacf0385f7 100644 --- a/ydb/core/kqp/ut/query/kqp_explain_ut.cpp +++ b/ydb/core/kqp/ut/query/kqp_explain_ut.cpp @@ -526,17 +526,14 @@ Y_UNIT_TEST_SUITE(KqpExplain) { auto deletesCount = CountPlanNodesByKv(plan, "Node Type", "Delete-ConstantExpr"); UNIT_ASSERT_VALUES_EQUAL(deletesCount, 1); - auto fullScansCount = CountPlanNodesByKv(plan, "Node Type", "TableFullScan") + - CountPlanNodesByKv(plan, "Node Type", "Stage-TableFullScan"); + auto fullScansCount = CountPlanNodesByKv(plan, "Node Type", "TableFullScan"); UNIT_ASSERT_VALUES_EQUAL(fullScansCount, 1); - auto rangeScansCount = CountPlanNodesByKv(plan, "Node Type", "TableRangeScan") + - CountPlanNodesByKv(plan, "Name", "TableRangeScan"); + auto rangeScansCount = CountPlanNodesByKv(plan, "Node Type", "TableRangeScan"); UNIT_ASSERT_VALUES_EQUAL(rangeScansCount, 1); ui32 lookupsCount = 0; - lookupsCount = CountPlanNodesByKv(plan, "Node Type", "Stage-TablePointLookup"); - lookupsCount += CountPlanNodesByKv(plan, "Node Type", "TablePointLookup-ConstantExpr"); + lookupsCount = CountPlanNodesByKv(plan, "Node Type", "TablePointLookup-ConstantExpr"); UNIT_ASSERT_VALUES_EQUAL(lookupsCount, 1); /* check tables section */ diff --git a/ydb/core/kqp/ut/query/kqp_limits_ut.cpp b/ydb/core/kqp/ut/query/kqp_limits_ut.cpp index 91f145356b73..2c7f85a4854f 100644 --- a/ydb/core/kqp/ut/query/kqp_limits_ut.cpp +++ b/ydb/core/kqp/ut/query/kqp_limits_ut.cpp @@ -849,9 +849,10 @@ Y_UNIT_TEST_SUITE(KqpLimits) { NJson::TJsonValue plan; NJson::ReadJsonTree(*result.GetStats()->GetPlan(), &plan, true); + Cout << plan; - UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Node Type"].GetStringSafe(), "Aggregate-TableFullScan"); - UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Tables"][0].GetStringSafe(), "ManyShardsTable"); + UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Node Type"].GetStringSafe(), "TableFullScan"); + UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Tables"][0].GetStringSafe(), "ManyShardsTable"); UNIT_ASSERT(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Stats"]["Tasks"].GetIntegerSafe() < 100); UNIT_ASSERT(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Stats"]["Tasks"].GetIntegerSafe() > 1); } @@ -887,8 +888,8 @@ Y_UNIT_TEST_SUITE(KqpLimits) { UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Node Type"].GetStringSafe(), "Merge"); UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["SortColumns"].GetArraySafe()[0], "Key (Asc)"); - UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Node Type"].GetStringSafe(), "Collect-TableFullScan"); - UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Tables"][0].GetStringSafe(), "ManyShardsTable"); + UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Node Type"].GetStringSafe(), "TableFullScan"); + UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Tables"][0].GetStringSafe(), "ManyShardsTable"); UNIT_ASSERT(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Stats"]["Tasks"].GetIntegerSafe() < 100); UNIT_ASSERT(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Stats"]["Tasks"].GetIntegerSafe() > 1); @@ -927,6 +928,7 @@ Y_UNIT_TEST_SUITE(KqpLimits) { NJson::TJsonValue plan; NJson::ReadJsonTree(*result.GetStats()->GetPlan(), &plan, true); + Cout << plan; UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Node Type"].GetStringSafe(), "Query"); UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Node Type"].GetStringSafe(), "ResultSet"); @@ -934,8 +936,8 @@ Y_UNIT_TEST_SUITE(KqpLimits) { UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Node Type"].GetStringSafe(), "Merge"); UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["SortColumns"].GetArraySafe()[0], "Key (Asc)"); - UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Node Type"].GetStringSafe(), "Limit-TableFullScan"); - UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Tables"][0].GetStringSafe(), "ManyShardsTable"); + UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Node Type"].GetStringSafe(), "TableFullScan"); + UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Tables"][0].GetStringSafe(), "ManyShardsTable"); UNIT_ASSERT_VALUES_EQUAL(plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Stats"]["Tasks"].GetIntegerSafe(), 1); const auto resultSet = result.GetResultSet(0); diff --git a/ydb/core/kqp/ut/query/kqp_stats_ut.cpp b/ydb/core/kqp/ut/query/kqp_stats_ut.cpp index bf19a63de4d8..0ecbfc415322 100644 --- a/ydb/core/kqp/ut/query/kqp_stats_ut.cpp +++ b/ydb/core/kqp/ut/query/kqp_stats_ut.cpp @@ -175,10 +175,8 @@ void MultiTxStatsFull( UNIT_ASSERT(res.PlanJson); NJson::TJsonValue plan; NJson::ReadJsonTree(*res.PlanJson, &plan, true); - auto node = FindPlanNodeByKv(plan, "Node Type", "TopSort-TableRangeScan"); - if (!node.IsDefined()) { - node = FindPlanNodeByKv(plan, "Node Type", "TopSort-Filter-TableRangeScan"); - } + Cout << plan; + auto node = FindPlanNodeByKv(plan, "Node Type", "TopSort"); UNIT_ASSERT_EQUAL(node.GetMap().at("Stats").GetMapSafe().at("Tasks").GetIntegerSafe(), 2); } @@ -395,7 +393,7 @@ Y_UNIT_TEST(StatsProfile) { NJson::TJsonValue plan; NJson::ReadJsonTree(result.GetQueryPlan(), &plan, true); - auto node1 = FindPlanNodeByKv(plan, "Node Type", "Aggregate-TableFullScan"); + auto node1 = FindPlanNodeByKv(plan, "Node Type", "Aggregate"); UNIT_ASSERT_EQUAL(node1.GetMap().at("Stats").GetMapSafe().at("ComputeNodes").GetArraySafe().size(), 2); //auto node2 = FindPlanNodeByKv(plan, "Node Type", "Aggregate"); diff --git a/ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp b/ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp index 087409521421..9caf25a81d4d 100644 --- a/ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp +++ b/ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp @@ -544,7 +544,9 @@ Y_UNIT_TEST_SUITE(KqpQueryService) { i64 totalTasks = 0; for (const auto& stage : stages) { - totalTasks += stage.GetMapSafe().at("Stats").GetMapSafe().at("Tasks").GetIntegerSafe(); + if (stage.GetMapSafe().contains("Stats")) { + totalTasks += stage.GetMapSafe().at("Stats").GetMapSafe().at("Tasks").GetIntegerSafe(); + } } UNIT_ASSERT_VALUES_EQUAL(totalTasks, 2); } diff --git a/ydb/core/kqp/ut/yql/kqp_scripting_ut.cpp b/ydb/core/kqp/ut/yql/kqp_scripting_ut.cpp index 07d27b41b601..077bab42893b 100644 --- a/ydb/core/kqp/ut/yql/kqp_scripting_ut.cpp +++ b/ydb/core/kqp/ut/yql/kqp_scripting_ut.cpp @@ -616,7 +616,7 @@ Y_UNIT_TEST_SUITE(KqpScripting) { NJson::TJsonValue plan; NJson::ReadJsonTree(planJson, &plan, true); - auto node = FindPlanNodeByKv(plan.GetMap().at("queries").GetArray()[2], "Node Type", "Aggregate-TableFullScan"); + auto node = FindPlanNodeByKv(plan.GetMap().at("queries").GetArray()[2], "Node Type", "Aggregate"); UNIT_ASSERT_EQUAL(node.GetMap().at("Stats").GetMapSafe().at("Tasks").GetIntegerSafe(), 1); } diff --git a/ydb/public/lib/ydb_cli/commands/ydb_service_table.cpp b/ydb/public/lib/ydb_cli/commands/ydb_service_table.cpp index 4fce576e4025..bb5960fb7543 100644 --- a/ydb/public/lib/ydb_cli/commands/ydb_service_table.cpp +++ b/ydb/public/lib/ydb_cli/commands/ydb_service_table.cpp @@ -817,7 +817,8 @@ void TCommandExplain::Config(TConfig& config) { EOutputFormat::Pretty, EOutputFormat::PrettyTable, EOutputFormat::JsonUnicode, - EOutputFormat::JsonBase64 + EOutputFormat::JsonBase64, + EOutputFormat::JsonBase64Simplify }); config.SetFreeArgsNum(0); diff --git a/ydb/public/lib/ydb_cli/common/format.cpp b/ydb/public/lib/ydb_cli/common/format.cpp index 49042d95f796..5afc65e7367e 100644 --- a/ydb/public/lib/ydb_cli/common/format.cpp +++ b/ydb/public/lib/ydb_cli/common/format.cpp @@ -39,6 +39,9 @@ namespace { "Every row is a separate json on a separate line." }, { EOutputFormat::JsonBase64, "Output in json format, binary strings are encoded with base64. " "Every row is a separate json on a separate line." }, + { EOutputFormat::JsonBase64Simplify, "Output in json format, binary strings are encoded with base64. " + "Every row is a separate json on a separate line. " + "Output only basic information about plan." }, { EOutputFormat::JsonBase64Array, "Output in json format, binary strings are encoded with base64. " "Every resultset is a json array of rows. " "Every row is a separate json on a separate line." }, @@ -234,6 +237,7 @@ void TCommandWithFormat::ParseMessagingFormats() { void TQueryPlanPrinter::Print(const TString& plan) { switch (Format) { case EOutputFormat::Default: + case EOutputFormat::JsonBase64Simplify: case EOutputFormat::Pretty: case EOutputFormat::PrettyTable: { NJson::TJsonValue planJson; @@ -252,13 +256,17 @@ void TQueryPlanPrinter::Print(const TString& plan) { if (Format == EOutputFormat::PrettyTable) { PrintPrettyTable(query); - } else { + } else if (Format == EOutputFormat::JsonBase64Simplify) { + PrintSimplifyJson(query); + } else{ PrintPretty(query); } } } else { if (Format == EOutputFormat::PrettyTable) { PrintPrettyTable(planJson); + } else if (Format == EOutputFormat::JsonBase64Simplify) { + PrintSimplifyJson(planJson); } else { PrintPretty(planJson); } @@ -362,6 +370,17 @@ void TQueryPlanPrinter::PrintPrettyImpl(const NJson::TJsonValue& plan, TVector explainColumnNames = {"Operation", "E-Cost", "E-Rows"}; static const TVector explainAnalyzeColumnNames = {"Operation", "DurationMs", "Rows", "E-Cost", "E-Rows"}; @@ -466,7 +485,7 @@ TVector TQueryPlanPrinter::RemoveRedundantNodes(NJson::TJsonV auto& planMap = plan.GetMapSafe(); TVector children; - if (planMap.contains("Plans")) { + if (planMap.contains("Plans") && planMap.at("Plans").IsArray()) { for (auto& child : planMap.at("Plans").GetArraySafe()) { auto newChildren = RemoveRedundantNodes(child, redundantNodes); children.insert(children.end(), newChildren.begin(), newChildren.end()); @@ -547,6 +566,9 @@ void TQueryPlanPrinter::ResolvePrecomputeLinks(NJson::TJsonValue& plan, const TH } else if (op.GetMapSafe().contains("Input")) { op.GetMapSafe().erase("Input"); } + if (op.GetMapSafe().contains("ToFlow")) { + op.GetMapSafe().erase("ToFlow"); + } } } @@ -556,137 +578,123 @@ void TQueryPlanPrinter::ResolvePrecomputeLinks(NJson::TJsonValue& plan, const TH planMap.erase("CTE Name"); } - if (planMap.contains("Plans")) { + if (planMap.contains("Plans") && planMap.at("Plans").IsArray()) { for (auto& child : planMap.at("Plans").GetArraySafe()) { ResolvePrecomputeLinks(child, precomputes); } } } +void TQueryPlanPrinter::DeleteSplitNodes(NJson::TJsonValue& plan) { + auto& planMap = plan.GetMapSafe(); + + if (planMap.contains("Ready")) { + planMap.erase("Ready"); + } + + if (planMap.contains("Operators")) { + for (auto &op : planMap.at("Operators").GetArraySafe()) { + if (op.GetMapSafe().contains("Inputs")) { + op.GetMapSafe().erase("Inputs"); + } + } + } + + if (planMap.contains("Plans") && planMap.at("Plans").IsArray()) { + for (auto& child : planMap.at("Plans").GetArraySafe()) { + DeleteSplitNodes(child); + } + } +} + /** - * Several joins fall into a single stage, so you need to split such stages to do this. - * To do this, you'll need to look through all of the nodes on the initial plan. - * As soon as you find at least two joins in a single node, divide the node into as many sections as there are joins, - * and distribute the inputs from the original section to each of the new sections. - * Each subsequent joint should be fed into the previous section, so they are connected in sequence from the end. - * After that, we change the stage with several joints to the stage with first join. + * Need to transform json plan into a tree + * Need to creating new nodes and connect them with nodes from inputs **/ -void TQueryPlanPrinter::SplitJoinsPlan(NJson::TJsonValue& plan) { +void TQueryPlanPrinter::SplitPlanInTree(NJson::TJsonValue& plan) { auto& planMap = plan.GetMapSafe(); - if (planMap.contains("Plans")) { - NJson::TJsonValue joins; - - TVector grandchilds; + // Array of newNodes + NJson::TJsonValue newNodes; + // Array of connection for each Nodes + TVector> connections; + TMap grandchilds; + + // Look at every child for (auto& child : planMap.at("Plans").GetArray()) { - const auto& nodeName = child.GetMapSafe().at("Node Type").GetStringSafe(); - // trying find 2 Join in 1 Node - auto pos = nodeName.find("MapJoin", nodeName.find("MapJoin") + 1); + if (child.GetMapSafe().contains("Operators") && not child.GetMapSafe().contains("Ready")) { - if (pos != TString::npos) { - // save inputs - grandchilds.insert(grandchilds.end(), child.GetMapSafe().at("Plans").GetArray().begin(), child.GetMapSafe().at("Plans").GetArray().end()); - std::sort(grandchilds.begin(), grandchilds.end(), [](NJson::TJsonValue& a, NJson::TJsonValue& b) { - return a.GetMapSafe().at("PlanNodeId").GetIntegerSafe() > b.GetMapSafe().at("PlanNodeId").GetIntegerSafe(); - }); - - NJson::TJsonValue inputs; - // convert vector to TJsonValue - for (size_t i = 0; i < grandchilds.size(); i++) { - NJson::TJsonValue inp; - inp.AppendValue(grandchilds[i]); - inputs.AppendValue(inp); + if (child.GetMapSafe().contains("Plans")) { + for (auto& grandchild : child.GetMapSafe().at("Plans").GetArray()) { + grandchilds[grandchild.GetMapSafe().at("PlanNodeId").GetIntegerSafe()].AppendValue(grandchild); + } } - size_t inputsSize = inputs.GetArraySafe().size(); - - NJson::TJsonValue operators; - - TString name = ""; - // counter of meeting joins, value from 0 to 2 - int meetJoins = 0; // counter of creating nodes - size_t newNodeCount = 0; - // counter not typed operators - size_t opUncount = 0; - - NJson::TJsonValue temp; - - for (auto &op : child.GetMapSafe().at("Operators").GetArray()) { - opUncount++; + int newNodeCount = 0; + + for (auto &op : child.GetMapSafe().at("Operators").GetArraySafe()) { const auto& opName = op.GetMapSafe().at("Name").GetStringSafe(); - pos = opName.find("Join"); - if (pos != TString::npos) { - meetJoins++; - } - if (meetJoins < 2) { - // if we met less then 2 joins then complement name of node (op1-op2-...-opN) - if (name == "") { - name += opName; - } else { - name += "-" + opName; - } - operators.AppendValue(op); - } else { - // if we met 2 joins then create new Node - temp["Node Type"] = name; - temp["Operators"] = operators; - temp["PlanNodeId"] = child.GetMapSafe().at("PlanNodeId").GetIntegerSafe(); - temp["Plans"] = inputs[newNodeCount]; - - NJson::TJsonValue arrayTemp; - arrayTemp.AppendValue(temp); - joins.AppendValue(arrayTemp); - - name = opName; - - operators.SetType(NJson::JSON_MAP); - operators.AppendValue(op); - - meetJoins = 1; - newNodeCount++; - - opUncount = 0; - - if (newNodeCount >= inputsSize) { - ythrow NJson::TJsonException() << "Too few inputs"; - } - } - } - - if (opUncount != 0) { - temp["Node Type"] = name; + NJson::TJsonValue operators; + + operators.AppendValue(op); + + // Creating new Node + NJson::TJsonValue temp; + temp["Node Type"] = opName; temp["Operators"] = operators; - temp["PlanNodeId"] = child.GetMapSafe().at("PlanNodeId").GetIntegerSafe(); - temp["Plans"] = inputs[newNodeCount]; + temp["PlanNodeId"] = -(child.GetMapSafe().at("PlanNodeId").GetIntegerSafe() * 1000 + newNodeCount); + + // Array of internal inputs for each Node + TVector intInputNodes; + + // Collect inputs + if (op.GetMapSafe().contains("Inputs")) { + for (auto &inp : op.GetMapSafe().at("Inputs").GetArraySafe()) { + if (inp.GetMapSafe().contains("ExternalPlanNodeId")) { + if (temp.GetMapSafe().contains("Plans")) { + temp["Plans"].AppendValue(grandchilds[inp.GetMapSafe().at("ExternalPlanNodeId").GetIntegerSafe()]); + } else { + temp["Plans"] = grandchilds[inp.GetMapSafe().at("ExternalPlanNodeId").GetIntegerSafe()]; + } + } + if (inp.GetMapSafe().contains("InternalOperatorId")) { + intInputNodes.push_back(inp.GetMapSafe().at("InternalOperatorId").GetIntegerSafe()); + } + } + } + + connections.push_back(intInputNodes); + + // Flag that we already change node + temp["Ready"] = 1; + NJson::TJsonValue arrayTemp; arrayTemp.AppendValue(temp); - joins.AppendValue(arrayTemp); - } + newNodes.AppendValue(arrayTemp); - if (joins.GetArraySafe().size() != inputsSize) { - ythrow NJson::TJsonException() << "Too many inputs"; + newNodeCount++; } } } - // connecting Joins - if (joins.GetArray().size() > 1) { - for (size_t i = joins.GetArray().size() - 1; i > 0; --i) { - // add join[i] to join[i - 1]["Plans"] - auto& currentPlans = joins[i].GetArraySafe(); - auto& prevPlans = joins[i - 1][0].GetMapSafe().at("Plans").GetArraySafe(); - prevPlans.insert(prevPlans.end(), currentPlans.begin(), currentPlans.end()); + // Connecting new Nodes + if (newNodes.IsArray() && newNodes.GetArray().size() > 1) { + for (long long i = newNodes.GetArray().size() - 1; i >= 0; --i) { + for (size_t j = 0; j < connections[i].size(); ++j) { + newNodes[i][0]["Plans"].AppendValue(newNodes[connections[i][j]][0]); + } } - // replacing the original join with the first element of the joins array (now it contains all the added joins with plans) - // planMap["Plans"] must be a TArray, so there is a TArray in Joins[0] - planMap["Plans"] = joins[0]; + planMap["Plans"] = newNodes[0]; } - - for (auto& child : planMap.at("Plans").GetArraySafe()) { - SplitJoinsPlan(child); + + if (planMap.contains("Plans")) { + for (auto& child : planMap.at("Plans").GetArraySafe()) { + SplitPlanInTree(child); + } } + } } @@ -701,10 +709,11 @@ void TQueryPlanPrinter::SimplifyQueryPlan(NJson::TJsonValue& plan) { "Stage" }; - RemoveRedundantNodes(plan, redundantNodes); auto precomputes = ExtractPrecomputes(plan); ResolvePrecomputeLinks(plan, precomputes); - SplitJoinsPlan(plan); + SplitPlanInTree(plan); + DeleteSplitNodes(plan); + RemoveRedundantNodes(plan, redundantNodes); } TString TQueryPlanPrinter::JsonToString(const NJson::TJsonValue& jsonValue) { diff --git a/ydb/public/lib/ydb_cli/common/format.h b/ydb/public/lib/ydb_cli/common/format.h index 6d6f1a634a66..1e588f0e035c 100644 --- a/ydb/public/lib/ydb_cli/common/format.h +++ b/ydb/public/lib/ydb_cli/common/format.h @@ -105,13 +105,16 @@ class TQueryPlanPrinter { void PrintPrettyTable(const NJson::TJsonValue& plan); void PrintPrettyTableImpl(const NJson::TJsonValue& plan, TString& offset, TPrettyTable& table); void PrintJson(const TString& plan); + void PrintSimplifyJson(const NJson::TJsonValue& plan); TString JsonToString(const NJson::TJsonValue& jsonValue); - void SplitJoinsPlan(NJson::TJsonValue& plan); + void SplitPlanInTree(NJson::TJsonValue& plan); void SimplifyQueryPlan(NJson::TJsonValue& plan); TVector RemoveRedundantNodes(NJson::TJsonValue& plan, const THashSet& redundantNodes); THashMap ExtractPrecomputes(NJson::TJsonValue& planJson); void ResolvePrecomputeLinks(NJson::TJsonValue& planJson, const THashMap& precomputes); + void DeleteSplitNodes(NJson::TJsonValue& planJson); + private: EOutputFormat Format; diff --git a/ydb/public/lib/ydb_cli/common/formats.h b/ydb/public/lib/ydb_cli/common/formats.h index d7aef93699cc..c7f7f4d05ece 100644 --- a/ydb/public/lib/ydb_cli/common/formats.h +++ b/ydb/public/lib/ydb_cli/common/formats.h @@ -12,6 +12,7 @@ enum class EOutputFormat { JsonUnicode /* "json-unicode" */, JsonUnicodeArray /* "json-unicode-array" */, JsonBase64 /* "json-base64" */, + JsonBase64Simplify /* "json-base64-simplify" */, JsonBase64Array /* "json-base64-array" */, JsonRawArray /* "json-raw-array" */, ProtoJsonBase64 /* "proto-json-base64" */, diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_explain.script-script_/explain.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_explain.script-script_/explain.script.plan index 4d049450339c..c5dda80ae1a3 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_explain.script-script_/explain.script.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_explain.script-script_/explain.script.plan @@ -23,6 +23,7 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [], "Iterator": "[{column0: 1 * 2 * 3 * 4 * 5}]", "Name": "Iterator" } @@ -70,9 +71,15 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "ReadRanges": [ "Key (-\u221e, +\u221e)" ], @@ -90,9 +97,19 @@ ], "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Limit", "Limit": "1" } @@ -131,6 +148,7 @@ "PlanNodeId": 6, "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -159,9 +177,15 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "ReadRanges": [ "Key (-\u221e, +\u221e)" ], @@ -179,9 +203,19 @@ ], "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Limit", "Limit": "1" } @@ -230,9 +264,15 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "ReadRanges": [ "Key (-\u221e, +\u221e)" ], @@ -250,9 +290,19 @@ ], "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Limit", "Limit": "1" } @@ -291,6 +341,7 @@ "PlanNodeId": 6, "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -319,9 +370,15 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "ReadRanges": [ "Key (-\u221e, +\u221e)" ], @@ -339,9 +396,19 @@ ], "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Limit", "Limit": "1" } @@ -385,10 +452,16 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Upsert", "Table": "base_explain_script_script/ScriptingTest" }, { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -431,10 +504,16 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Upsert", "Table": "base_explain_script_script/ScriptingTest" }, { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan index 7666f2d5ce74..f70a61b06ac0 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan @@ -55,6 +55,7 @@ "PlanNodeId": 15, "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -82,10 +83,20 @@ "PlanNodeId": 11, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Predicate": "Exist(item.Group)", "Name": "Filter" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "ReadColumns": [ "Group", "Value" @@ -94,6 +105,7 @@ "Table": "base_join_group_by_lookup_script_script/Temp" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -115,11 +127,24 @@ ], "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "TopSort", "Limit": "1001", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -137,6 +162,11 @@ ], "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 18 + } + ], "Name": "Limit", "Limit": "1001" } @@ -155,19 +185,12 @@ "PlanNodeId": 8, "Operators": [ { + "Inputs": [], "Name": "PartitionByKey", "Input": "precompute_0_0" - }, - { - "Predicate": "Exist(item.Group)", - "Name": "Filter" - }, - { - "Name": "Limit", - "Limit": "1" } ], - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "CTE Name": "precompute_0_0" } ], @@ -198,11 +221,17 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "GroupBy": "item.Group", "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "Name": "Aggregate" }, { + "Inputs": [], "ReadRanges": [ "Group (-\u221e, +\u221e)", "Name (-\u221e, +\u221e)" @@ -270,10 +299,16 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Upsert", "Table": "base_join_group_by_lookup_script_script/Temp" }, { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_ct.script-script_/simple_ct.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_ct.script-script_/simple_ct.script.plan index 713c94335172..b09ff151b380 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_ct.script-script_/simple_ct.script.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_ct.script-script_/simple_ct.script.plan @@ -31,10 +31,16 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Upsert", "Table": "base_simple_ct_script_script/Questions" }, { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_script_params.script-script_/simple_script_params.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_script_params.script-script_/simple_script_params.script.plan index 278e1076f612..7dabfadc22a3 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_script_params.script-script_/simple_script_params.script.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_script_params.script-script_/simple_script_params.script.plan @@ -15,6 +15,7 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [], "Iterator": "[{value: $value}]", "Name": "Iterator" } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_table_types.script-script_/table_types.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_table_types.script-script_/table_types.script.plan index e16d92f48c0d..fe0c3aa5fd5a 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_table_types.script-script_/table_types.script.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_table_types.script-script_/table_types.script.plan @@ -57,10 +57,16 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Limit", "Limit": "1001" }, { + "Inputs": [], "ReadRanges": [ "Key (-\u221e, +\u221e)" ], @@ -98,6 +104,11 @@ ], "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Limit", "Limit": "1001" } @@ -157,10 +168,16 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Upsert", "Table": "base_table_types_script_script/TableTypes" }, { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_usage.script-script_/write_multi_usage.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_usage.script-script_/write_multi_usage.script.plan index 53a0de4f01d1..0189bdb5bd67 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_usage.script-script_/write_multi_usage.script.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_usage.script-script_/write_multi_usage.script.plan @@ -60,10 +60,16 @@ "PlanNodeId": 5, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Limit", "Limit": "1001" }, { + "Inputs": [], "ReadLimit": "1001", "ReadRanges": [ "Name (-\u221e, +\u221e)" @@ -88,6 +94,11 @@ ], "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Limit", "Limit": "1001" } @@ -114,10 +125,16 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Limit", "Limit": "1001" }, { + "Inputs": [], "ReadLimit": "1001", "ReadRanges": [ "Group (-\u221e, +\u221e)", @@ -146,6 +163,11 @@ ], "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Limit", "Limit": "1001" } @@ -210,10 +232,16 @@ "PlanNodeId": 10, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Upsert", "Table": "base_write_multi_usage_script_script/Temp" }, { + "Inputs": [], "Iterator": "precompute_0_1", "Name": "Iterator" } @@ -234,10 +262,16 @@ "PlanNodeId": 8, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Delete", "Table": "base_write_multi_usage_script_script/Input1" }, { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -278,6 +312,7 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [], "ReadRange": [ "Group (2)", "Name (-\u221e, +\u221e)" diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_usage_key.script-script_/write_multi_usage_key.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_usage_key.script-script_/write_multi_usage_key.script.plan index a166a3eea69d..eeac971a0bbe 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_usage_key.script-script_/write_multi_usage_key.script.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_usage_key.script-script_/write_multi_usage_key.script.plan @@ -40,10 +40,16 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Limit", "Limit": "1001" }, { + "Inputs": [], "ReadRanges": [ "Name (-\u221e, +\u221e)" ], @@ -67,6 +73,11 @@ ], "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Limit", "Limit": "1001" } @@ -125,10 +136,16 @@ "PlanNodeId": 6, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Upsert", "Table": "base_write_multi_usage_key_script_script/Temp" }, { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -156,10 +173,16 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Predicate": "item.Name == Concat", "Name": "Filter" }, { + "Inputs": [], "ReadRanges": [ "Group (-\u221e, +\u221e)", "Name (-\u221e, +\u221e)" diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan index b4c25b5db29a..f46411dc8419 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan @@ -41,10 +41,16 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Limit", "Limit": "1001" }, { + "Inputs": [], "ReadRanges": [ "Group (-\u221e, +\u221e)" ], @@ -69,6 +75,11 @@ ], "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Limit", "Limit": "1001" } @@ -128,10 +139,16 @@ "PlanNodeId": 8, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Upsert", "Table": "base_write_write_group_by_script_script/Temp" }, { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -165,11 +182,17 @@ "PlanNodeId": 1, "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "GroupBy": "item.Group", "Aggregation": "{_yql_agg_0: MIN(item.Amount,state._yql_agg_0)}", "Name": "Aggregate" }, { + "Inputs": [], "ReadRanges": [ "Group (-\u221e, +\u221e)", "Name (-\u221e, +\u221e)" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-0 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-0 index f1810e84f8cd..0b67e9ca81bc 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-0 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-0 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,6 +66,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": null, "ReadRanges": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-1 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-1 index f5bc4f60f0cd..764e1b46f706 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-1 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-1 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,6 +66,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "AdvEngineID" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-10 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-10 index f53b5c50ece6..0ffd1a2ec833 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-10 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-10 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,6 +64,11 @@ { "Aggregation": "{_yql_agg_0: Inc(state._yql_agg_0)}", "GroupBy": "item.MobilePhoneModel", + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -74,9 +89,15 @@ { "Aggregation": "state", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "MobilePhoneModel", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-11 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-11 index f6d69fe98a62..f2e4dbd35814 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-11 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-11 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -55,6 +65,11 @@ { "Aggregation": "{_yql_agg_0: Inc(state._yql_agg_0)}", "GroupBy": "", + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -76,9 +91,15 @@ { "Aggregation": "state", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "MobilePhone", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 index 2d351249ea75..81b5d4e191e2 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,9 +64,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.SearchPhrase", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-13 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-13 index 5efa8a209594..b6ec7103da35 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-13 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-13 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,6 +64,11 @@ { "Aggregation": "{_yql_agg_0: Inc(state._yql_agg_0)}", "GroupBy": "item.SearchPhrase", + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -74,9 +89,15 @@ { "Aggregation": "state", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 index 83be0059a72b..da4229ffa66f 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -55,9 +65,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchEngineID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 index 07112d233729..6c67a5701a18 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,9 +64,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.UserID", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "UserID" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 index a1f9fbddb1c0..586eef700395 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -55,9 +65,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 index 3bf160b6e598..9bc0c3c3ba33 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "Limit" } @@ -54,9 +64,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18 index 43502ffa32ad..ba67374831bf 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -56,9 +66,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "EventTime", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-19 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-19 index a0386db921b0..b80b9480bc63 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-19 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-19 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -33,10 +38,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "UserID" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-2 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-2 index 11bb53981dde..2154f5e92c70 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-2 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-2 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,6 +66,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "AdvEngineID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-20 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-20 index 0501b636c981..8dc1e19f8a34 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-20 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-20 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,6 +66,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "URL" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 index 232e4660067e..602516439293 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,9 +64,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1),_yql_agg_1: MIN(item.URL,state._yql_agg_1)}", "GroupBy": "item.SearchPhrase", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22 index 91fef57e3962..a46a508f1624 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -49,6 +59,14 @@ "Node Type": "Union", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "ExternalPlanNodeId": 4 + } + ], "Name": "Union" } ], @@ -68,9 +86,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1),_yql_agg_2: MIN(item.URL,state._yql_agg_2),_yql_agg_3: MIN(item.Title,state._yql_agg_3)}", "GroupBy": "item.SearchPhrase", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase", @@ -271,6 +295,11 @@ { "Aggregation": "{_yql_agg_1: Inc(state._yql_agg_1)}", "GroupBy": "item.SearchPhrase", + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -291,9 +320,15 @@ { "Aggregation": "state", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-23 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-23 index aeb2011df0ef..d357d2739fb8 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-23 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-23 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,11 +38,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "$4.EventTime" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "AdvEngineID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-24 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-24 index f80d18669d51..efd72a470d02 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-24 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-24 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,11 +38,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "$4.EventTime" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "EventTime", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-25 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-25 index 7a8a8a22a8e8..5252f85c9b41 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-25 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-25 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,11 +38,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "$5.SearchPhrase" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-26 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-26 index 3b83c55b4e14..4047c1c399d1 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-26 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-26 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,11 +38,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "EventTime", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27 index 7cb54b120b08..848218e72343 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "25", "Name": "Limit" } @@ -33,11 +38,21 @@ "Node Type": "TopSort-Filter", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "25", "Name": "TopSort", "TopSortBy": "$13.l" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Filter", "Predicate": "item.Count0 > 100000" } @@ -58,9 +73,15 @@ { "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1)}", "GroupBy": "item.CounterID", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "CounterID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28 index 92c88fe6a79e..491ede2798c8 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "25", "Name": "Limit" } @@ -33,11 +38,21 @@ "Node Type": "TopSort-Filter", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "25", "Name": "TopSort", "TopSortBy": "$23.l" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Filter", "Predicate": "item.Count0 > 100000" } @@ -58,9 +73,15 @@ { "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: MIN(item.Referer,state._yql_agg_2)}", "GroupBy": "item.key", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "Referer" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-29 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-29 index bcce05c2167a..c944f90372d8 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-29 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-29 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,9 +66,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "ResolutionWidth" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-3 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-3 index 4db1640f71b8..febbdfb74f86 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-3 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-3 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,6 +66,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "UserID" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 index 747fd7947480..c04e7dd85fcd 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -55,9 +65,15 @@ { "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "ClientIP", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 index b7ca2266b3bb..51a3960052be 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -55,9 +65,15 @@ { "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "ClientIP", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 index e0543b43c658..d800c5df143e 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -55,9 +65,15 @@ { "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "ClientIP", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 index 676f85d7c8b1..4a0b7e89454c 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,9 +64,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.URL", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "URL" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 index e59cd408fe39..67e2bafe2d12 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -55,9 +65,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "URL", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35 index e8f2ea6d67a2..14f243ff0540 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -57,9 +67,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "ClientIP" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 index 40b199c6f90a..1f496780cb58 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,13 +64,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.URL", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "CounterID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 index 62c18b001ba8..30852faab421 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,13 +64,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.Title", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "CounterID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 index 3e711cd6e0fd..b5ecfd9969e1 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 @@ -18,10 +18,20 @@ "Node Type": "Limit-Offset", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Offset", "Offset": "1000" } @@ -37,6 +47,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "SUM(10,1000)", "Name": "Limit" } @@ -52,6 +67,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -73,13 +93,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.URL", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "CounterID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-39 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-39 index 9ceeac0cd832..31af3b96ba14 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-39 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-39 @@ -18,10 +18,20 @@ "Node Type": "Limit-Offset", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Offset", "Offset": "1000" } @@ -37,6 +47,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "SUM(10,1000)", "Name": "Limit" } @@ -52,6 +67,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -77,13 +97,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "AdvEngineID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-4 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-4 index b3e6022ab94e..3a08b8d56686 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-4 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-4 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,6 +66,11 @@ "Node Type": "Aggregate", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -74,9 +90,15 @@ { "Aggregation": "state", "GroupBy": "row.UserID", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "UserID" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-40 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-40 index b0d6681e8b93..9013e777b91c 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-40 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-40 @@ -18,10 +18,20 @@ "Node Type": "Limit-Offset", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Offset", "Offset": "100" } @@ -37,6 +47,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "SUM(10,100)", "Name": "Limit" } @@ -52,6 +67,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "SUM(10,100)", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -74,13 +94,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.TraficSourceID == -1 Or item.TraficSourceID == 6" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "CounterID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 index ddf0f3c86058..949eaccca030 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 @@ -18,10 +18,20 @@ "Node Type": "Limit-Offset", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Offset", "Offset": "10000" } @@ -37,6 +47,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "SUM(10,10000)", "Name": "Limit" } @@ -52,6 +67,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "SUM(10,10000)", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -74,13 +94,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "CounterID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-42 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-42 index 885aa0cc83c5..03b459e31d19 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-42 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-42 @@ -18,10 +18,20 @@ "Node Type": "Limit-Offset", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Offset", "Offset": "1000" } @@ -37,6 +47,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "SUM(10,1000)", "Name": "Limit" } @@ -52,6 +67,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Minute" @@ -73,13 +93,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.Minute", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.EventDate >= \"15900\" And item.EventDate <= \"15901\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "CounterID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-5 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-5 index ed1dd19f1543..5e4d7e56cce5 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-5 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-5 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,6 +66,11 @@ "Node Type": "Aggregate", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -74,9 +90,15 @@ { "Aggregation": "state", "GroupBy": "row.SearchPhrase", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-6 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-6 index d29a5c24f16e..46bf5a6a1394 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-6 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-6 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,6 +66,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "EventDate" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 index 6a2f1a60b6c1..1a47f956479f 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "1001", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,9 +64,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.AdvEngineID", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "AdvEngineID" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-8 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-8 index 94e29ed34bfb..86e1bf71d158 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-8 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-8 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,6 +64,11 @@ { "Aggregation": "{_yql_agg_0: Inc(state._yql_agg_0)}", "GroupBy": "item.RegionID", + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -74,9 +89,15 @@ { "Aggregation": "state", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "RegionID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-9 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-9 index ec0d99289d2f..dac074aa292f 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-9 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-9 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -49,6 +59,14 @@ "Node Type": "Union", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "ExternalPlanNodeId": 4 + } + ], "Name": "Union" } ], @@ -68,9 +86,15 @@ { "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_3: SUM(item.AdvEngineID,state._yql_agg_3)}", "GroupBy": "item.RegionID", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "AdvEngineID", @@ -132,6 +156,11 @@ { "Aggregation": "{_yql_agg_2: Inc(state._yql_agg_2)}", "GroupBy": "item.RegionID", + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -152,9 +181,15 @@ { "Aggregation": "state", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "AdvEngineID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-0 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-0 index 904f44d56b5f..bcea45f3e620 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-0 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-0 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,9 +66,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": null, "ReadRanges": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-1 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-1 index 5ef0a6467fdf..700d33e66beb 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-1 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-1 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,13 +66,24 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.AdvEngineID != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "AdvEngineID" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-10 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-10 index e75e8bf61dc8..6ce50d447f4f 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-10 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-10 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,6 +64,11 @@ { "Aggregation": "{_yql_agg_0: COUNT(item.UserID,state._yql_agg_0)}", "GroupBy": "item.MobilePhoneModel", + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -74,13 +89,24 @@ { "Aggregation": "state", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.MobilePhoneModel != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "MobilePhoneModel", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-11 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-11 index ec2c0e8bd2d1..891d1590f987 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-11 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-11 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -55,6 +65,11 @@ { "Aggregation": "{_yql_agg_0: COUNT(item.UserID,state._yql_agg_0)}", "GroupBy": "", + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -76,13 +91,24 @@ { "Aggregation": "state", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.MobilePhoneModel != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "MobilePhone", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-12 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-12 index bbca88b820b4..e57e1dae5f09 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-12 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-12 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,13 +64,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.SearchPhrase", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.SearchPhrase != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-13 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-13 index 406747f9ec2d..1a7720d827c8 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-13 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-13 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,6 +64,11 @@ { "Aggregation": "{_yql_agg_0: COUNT(item.UserID,state._yql_agg_0)}", "GroupBy": "item.SearchPhrase", + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -74,13 +89,24 @@ { "Aggregation": "state", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.SearchPhrase != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-14 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-14 index a784cbf5a673..933bb09440a4 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-14 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-14 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -55,13 +65,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.SearchPhrase != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchEngineID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-15 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-15 index c557ff5c6023..0ae0d6d90222 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-15 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-15 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,9 +64,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.UserID", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "UserID" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-16 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-16 index 878e3736e4f2..2414ba574dab 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-16 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-16 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -55,9 +65,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-17 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-17 index f6f1a5e7aaf3..5ba6811b0e9b 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-17 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-17 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "Limit" } @@ -54,9 +64,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-18 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-18 index c659ad263396..15fc4d053fd4 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-18 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-18 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -56,9 +66,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "EventTime", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-19 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-19 index 314c6851e17e..22d67d5a22af 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-19 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-19 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -33,14 +38,25 @@ "Node Type": "Limit-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.UserID == 435090932899640449" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "UserID" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-2 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-2 index fc4dbbba4560..de6f498faae5 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-2 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-2 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,9 +66,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "AdvEngineID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-20 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-20 index 008fcec2137d..08d691dc90cc 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-20 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-20 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,13 +66,24 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.URL StringContains \"google\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "URL" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-21 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-21 index 343bdbb6b7e3..8db645ce92d5 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-21 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-21 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,13 +64,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1),_yql_agg_1: MIN(item.URL,state._yql_agg_1)}", "GroupBy": "item.SearchPhrase", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.URL StringContains \"google\" And item.SearchPhrase != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-22 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-22 index 8a751bf3406c..d01b0792517b 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-22 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-22 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -49,6 +59,14 @@ "Node Type": "Union", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "ExternalPlanNodeId": 4 + } + ], "Name": "Union" } ], @@ -68,13 +86,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1),_yql_agg_2: MIN(item.URL,state._yql_agg_2),_yql_agg_3: MIN(item.Title,state._yql_agg_3)}", "GroupBy": "item.SearchPhrase", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.Title StringContains \"Google\" And Not item.URL StringContains \".google.\" And item.SearchPhrase != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase", @@ -113,6 +142,11 @@ { "Aggregation": "{_yql_agg_1: COUNT(item.UserID,state._yql_agg_1)}", "GroupBy": "item.SearchPhrase", + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -133,13 +167,24 @@ { "Aggregation": "state", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.Title StringContains \"Google\" And Not item.URL StringContains \".google.\" And item.SearchPhrase != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-23 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-23 index e5e2117bffc9..523cdda7b3ef 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-23 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-23 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,14 +38,25 @@ "Node Type": "Limit-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.URL StringContains \"google\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "AdvEngineID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-24 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-24 index e10d095e03a1..aafd111108fa 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-24 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-24 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,14 +38,25 @@ "Node Type": "Limit-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.SearchPhrase != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "EventTime", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-25 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-25 index 70c047e60404..8b02cd015639 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-25 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-25 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,15 +38,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "$5.SearchPhrase" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.SearchPhrase != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-26 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-26 index 1181df6b96db..73abb1c271f6 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-26 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-26 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,15 +38,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.SearchPhrase != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "EventTime", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-27 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-27 index a69d524d50e6..0578a55fa92d 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-27 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-27 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "25", "Name": "Limit" } @@ -33,11 +38,21 @@ "Node Type": "TopSort-Filter", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "25", "Name": "TopSort", "TopSortBy": "$14.l" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Filter", "Predicate": "item.Count0 > 100000" } @@ -58,13 +73,24 @@ { "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1)}", "GroupBy": "item.CounterID", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.URL != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "CounterID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-28 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-28 index 61c002effd86..a5b57cff85ab 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-28 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-28 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "25", "Name": "Limit" } @@ -33,11 +38,21 @@ "Node Type": "TopSort-Filter", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "25", "Name": "TopSort", "TopSortBy": "$25.l" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Filter", "Predicate": "item.Count0 > 100000" } @@ -58,13 +73,24 @@ { "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: MIN(item.Referer,state._yql_agg_2)}", "GroupBy": "item.key", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.Referer != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "Referer" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-29 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-29 index 92242d16d2a1..ed9111fb15b2 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-29 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-29 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,9 +66,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "ResolutionWidth" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-3 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-3 index 3a430c8a9439..2b220a05fff0 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-3 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-3 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,9 +66,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "UserID" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-30 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-30 index b4ed740702ae..24f212f66ece 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-30 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-30 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -55,13 +65,24 @@ { "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.SearchPhrase != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "ClientIP", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-31 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-31 index d83016bc5273..c46804a19f9c 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-31 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-31 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -55,13 +65,24 @@ { "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.SearchPhrase != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "ClientIP", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-32 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-32 index 96f52901b9e0..09b4cb2acd5a 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-32 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-32 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -55,9 +65,15 @@ { "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "ClientIP", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-33 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-33 index 725da2f005a4..7ab52ceefc56 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-33 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-33 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,9 +64,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.URL", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "URL" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-34 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-34 index 0be306d18eab..838d9c40b5b9 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-34 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-34 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -55,9 +65,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "URL", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-35 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-35 index 58e1973b3185..fbdf53de28d3 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-35 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-35 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -57,9 +67,15 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "ClientIP" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-36 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-36 index d2c53640ebd2..106a07ebc1f7 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-36 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-36 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,13 +64,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.URL", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.DontCountHits == 0 And item.IsRefresh == 0 And item.URL != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "CounterID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-37 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-37 index ea5692abd2cd..6f9adaf10cac 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-37 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-37 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,13 +64,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.Title", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.DontCountHits == 0 And item.IsRefresh == 0 And item.Title != \"\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "CounterID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-38 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-38 index 016d14af8b68..3900c0a0d97a 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-38 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-38 @@ -18,10 +18,20 @@ "Node Type": "Limit-Offset", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Offset", "Offset": "1000" } @@ -37,6 +47,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "SUM(10,1000)", "Name": "Limit" } @@ -52,6 +67,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -73,13 +93,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.URL", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.IsRefresh == 0 And item.IsLink != 0 And item.IsDownload == 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "CounterID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-39 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-39 index 0ffa7a340e05..6fc4de586644 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-39 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-39 @@ -18,10 +18,20 @@ "Node Type": "Limit-Offset", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Offset", "Offset": "1000" } @@ -37,6 +47,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "SUM(10,1000)", "Name": "Limit" } @@ -52,6 +67,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -77,13 +97,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.IsRefresh == 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "AdvEngineID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-4 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-4 index 002456e90656..f0370399cac5 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-4 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-4 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,6 +66,11 @@ "Node Type": "Aggregate", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -74,9 +90,15 @@ { "Aggregation": "state", "GroupBy": "row.UserID", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "UserID" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-40 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-40 index 193e1f8c8c65..9b659bde678e 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-40 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-40 @@ -18,10 +18,20 @@ "Node Type": "Limit-Offset", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Offset", "Offset": "100" } @@ -37,6 +47,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "SUM(10,100)", "Name": "Limit" } @@ -52,6 +67,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "SUM(10,100)", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -74,13 +94,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.IsRefresh == 0 And If And item.RefererHash == 3594120000172545465" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "CounterID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-41 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-41 index dc4e0287e036..72c49bce7aa4 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-41 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-41 @@ -18,10 +18,20 @@ "Node Type": "Limit-Offset", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Offset", "Offset": "10000" } @@ -37,6 +47,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "SUM(10,10000)", "Name": "Limit" } @@ -52,6 +67,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "SUM(10,10000)", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -74,13 +94,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.IsRefresh == 0 And item.DontCountHits == 0 And item.URLHash == 2868770270353813622" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "CounterID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-42 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-42 index 7c9e6dee2e7c..1acf534e32a3 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-42 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-42 @@ -18,10 +18,20 @@ "Node Type": "Limit-Offset", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Offset", "Offset": "1000" } @@ -37,6 +47,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "SUM(10,1000)", "Name": "Limit" } @@ -52,6 +67,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Minute" @@ -73,13 +93,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.Minute", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.CounterID == 62 And item.EventDate >= \"15900\" And item.EventDate <= \"15901\" And item.IsRefresh == 0 And item.DontCountHits == 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "CounterID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-5 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-5 index 00a13bcb7287..6af51b141aaa 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-5 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-5 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,6 +66,11 @@ "Node Type": "Aggregate", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -74,9 +90,15 @@ { "Aggregation": "state", "GroupBy": "row.SearchPhrase", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "SearchPhrase" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-6 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-6 index 9ee2a64538e1..4d5e196100bb 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-6 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-6 @@ -19,6 +19,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -37,9 +38,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -55,9 +66,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "EventDate" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-7 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-7 index b21d9b0b48f8..0935f1e202e0 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-7 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-7 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "1001", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,13 +64,24 @@ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.AdvEngineID", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.AdvEngineID != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "AdvEngineID" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-8 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-8 index 905bf28419b8..a0edc56657e5 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-8 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-8 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -54,6 +64,11 @@ { "Aggregation": "{_yql_agg_0: COUNT(item.UserID,state._yql_agg_0)}", "GroupBy": "item.RegionID", + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -74,9 +89,15 @@ { "Aggregation": "state", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "RegionID", diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-9 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-9 index 8160f9461c1b..06a0806ba1f9 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-9 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-9 @@ -18,6 +18,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], "Limit": "10", "Name": "Limit" } @@ -33,6 +38,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" @@ -49,6 +59,14 @@ "Node Type": "Union", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "ExternalPlanNodeId": 4 + } + ], "Name": "Union" } ], @@ -68,9 +86,15 @@ { "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_3: SUM(item.AdvEngineID,state._yql_agg_3)}", "GroupBy": "item.RegionID", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "AdvEngineID", @@ -109,6 +133,11 @@ { "Aggregation": "{_yql_agg_2: COUNT(item.UserID,state._yql_agg_2)}", "GroupBy": "item.RegionID", + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -129,9 +158,15 @@ { "Aggregation": "state", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "AdvEngineID", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_10.plan index c3ba4236f233..b0ead5f667c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_11.plan index 50139b058cf9..c9c7380b44e5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.Simplest_Math" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_12.plan index c3ba4236f233..b0ead5f667c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_13.plan index c3ba4236f233..b0ead5f667c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_14.plan index 77a3c293fe7e..d965936f98ea 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,25 @@ "Node Type": "Limit-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.f == 4" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "f", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_7.plan index c3ba4236f233..b0ead5f667c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_8.plan index c3ba4236f233..b0ead5f667c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-case.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_1.plan index 06fac2948d25..9580a62d8b07 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 30 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.qr.y" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 28 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -47,6 +65,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_2_0", "Name": "Iterator" } @@ -74,10 +93,20 @@ "Node Type": "Filter-TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.x)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "x" @@ -85,6 +114,7 @@ "Table": "postgres_jointest/coalesce-and-join.test_plan/b" }, { + "Inputs": [], "Iterator": "precompute_3_0", "Name": "Iterator" } @@ -119,15 +149,12 @@ "Plans": [ { "CTE Name": "precompute_2_0", - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_2_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 20 @@ -154,6 +181,14 @@ "Node Type": "LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -169,6 +204,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -196,10 +232,20 @@ "Node Type": "Filter-TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.x)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "x" @@ -207,6 +253,7 @@ "Table": "postgres_jointest/coalesce-and-join.test_plan/b" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -239,19 +286,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.x)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -278,6 +318,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_2.plan index 465cf03e6bb3..c523dcbb9e95 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.a.y" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -47,6 +65,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -74,10 +93,20 @@ "Node Type": "Filter-TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.x)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "x" @@ -85,6 +114,7 @@ "Table": "postgres_jointest/coalesce-and-join.test_plan/b" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -119,19 +149,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.x)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -158,6 +181,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_3.plan index 1ba729de1ba6..f9f99033fae7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.pv.x" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -47,6 +65,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -74,10 +93,20 @@ "Node Type": "Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.x)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "x", @@ -86,6 +115,7 @@ "Table": "postgres_jointest/coalesce-and-join.test_plan/a" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -120,19 +150,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.x)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -159,6 +182,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_4.plan index 4048d5074d3c..3f1c49730930 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.yy.pkyy" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -47,6 +65,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -74,10 +93,20 @@ "Node Type": "Filter-TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.pkxx)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "pkxx" @@ -85,6 +114,7 @@ "Table": "postgres_jointest/coalesce-and-join.test_plan/xx" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -119,15 +149,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -154,6 +181,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "pkxx", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_5.plan index 7c4320a2c33f..1271df83b985 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_coalesce-and-join.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,23 @@ "Node Type": "Limit-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "ExternalPlanNodeId": 4 + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -54,6 +72,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "pkxx" @@ -85,6 +104,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "pkxx" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan index 5016e66e00df..3899d020ad20 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 18 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,6 +32,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.t1.q2" @@ -48,9 +58,22 @@ { "Aggregation": "{_yql_agg_0: COUNT(item.t1.q1,state._yql_agg_0)}", "GroupBy": "item.t1.q2", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -66,6 +89,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -93,10 +117,20 @@ "Node Type": "Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.q1)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "q1" @@ -104,6 +138,7 @@ "Table": "postgres_jointest/join-group-by-with-null.test_plan/int8_tbl" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -142,19 +177,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.q2)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -181,6 +209,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "q1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan index cc2a203859b0..91b4aeb5858d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 18 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,6 +32,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.t1.q2" @@ -48,9 +58,22 @@ { "Aggregation": "{_yql_agg_0: COUNT(item.t2.q1,state._yql_agg_0)}", "GroupBy": "item.t1.q2", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -66,6 +89,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -93,10 +117,20 @@ "Node Type": "Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.q1)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "q1" @@ -104,6 +138,7 @@ "Table": "postgres_jointest/join-group-by-with-null.test_plan/int8_tbl" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -142,19 +177,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.q2)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -181,6 +209,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "q2" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_4.plan index 70d6941f43e2..071fa83a71c4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 12 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,6 +32,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.t1.q2" @@ -48,9 +58,22 @@ { "Aggregation": "{_yql_agg_0: COUNT(item.t2.q1,state._yql_agg_0)}", "GroupBy": "item.t1.q2", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -65,6 +88,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "q1", @@ -102,6 +126,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "Limit" } @@ -117,10 +146,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "q1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan index 5aa0e05af4d3..67728a839bb2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,6 +32,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.t1.q2" @@ -48,9 +58,22 @@ { "Aggregation": "{_yql_agg_0: COUNT(item.t2.q1,state._yql_agg_0)}", "GroupBy": "item.t1.q2", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -65,6 +88,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "q1", @@ -102,6 +126,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "q1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_1.plan index e675ad7b500f..5fd5e8d2ec78 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -55,13 +73,27 @@ "Node Type": "InnerJoin (MapJoin)-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.q1)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "q1", @@ -94,6 +126,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "q1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_10.plan index d233831841ea..e6f4d1411672 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,32 @@ "Node Type": "Limit-Filter-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b.thousand == item.a.q1 And item.a.q1 == item.b.hundred" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -58,6 +81,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "hundred", @@ -91,6 +115,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "q1" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_11.plan index 1d0dd4b197e1..d5bbaa2c5c2f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,53 @@ "Node Type": "Limit-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -54,6 +102,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "unique2" @@ -85,6 +134,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "f1" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_12.plan index e3374b916b85..6d1bfafd92f0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,23 @@ "Node Type": "Limit-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 12 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -54,6 +72,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "thousand", @@ -88,6 +107,14 @@ "Node Type": "LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -102,10 +129,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.unique2 < 10" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "thousand", @@ -145,6 +178,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "thousand", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_13.plan index 429e80f494c8..9158bcf8127d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,23 @@ "Node Type": "Limit-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 12 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -54,6 +72,14 @@ "Node Type": "LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -77,6 +103,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "unique2" @@ -108,6 +135,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "f1" @@ -142,6 +170,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "[{join_key: 0},{join_key: 1}]", "Name": "Iterator" } diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_14.plan index 2b56375cd874..007b25fc0dc3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 12 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,23 @@ "Node Type": "Limit-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -54,9 +72,18 @@ "Node Type": "FullJoin (JoinDict)-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + }, + { + "InternalOperatorId": 1 + } + ], "Name": "FullJoin (JoinDict)" }, { + "Inputs": [], "Iterator": "[{id: 1}]", "Name": "Iterator" } @@ -84,6 +111,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "even", @@ -138,6 +166,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "[{id: 1}]", "Name": "Iterator" } diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_15.plan index 36ea86c17b25..f08720c0802b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,23 @@ "Node Type": "Limit-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -54,6 +72,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "even", @@ -87,6 +106,11 @@ "Node Type": "TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "f1" @@ -94,6 +118,7 @@ "Table": "postgres_jointest/join0.test_plan/int4_tbl" }, { + "Inputs": [], "Iterator": "[{f1: 0}]", "Name": "Iterator" } diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_16.plan index c60e30e98877..704c69cd9aff 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_16.plan @@ -12,9 +12,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], "Limit": "1", "Name": "Limit" } @@ -30,13 +40,34 @@ "Node Type": "Aggregate-Filter-FullJoin (JoinDict)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + }, + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Nth.unique2 == 42" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + }, + { + "ExternalPlanNodeId": 4 + } + ], "Name": "FullJoin (JoinDict)" } ], @@ -63,6 +94,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "unique2" @@ -106,6 +138,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "unique2" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_2.plan index 1fe63d2b4517..e8f6dd7e9a4b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Limit": "1001", "Name": "Limit" } @@ -29,35 +34,98 @@ "Operators": [ { "Inputs": [ - 1, - 3 + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 3 + }, + { + "InternalOperatorId": 1 + }, + { + "Other": "ConstantExpression" + }, + { + "Other": "ConstantExpression" + }, + { + "Other": "ConstantExpression" + }, + { + "Other": "ConstantExpression" + }, + { + "Other": "ConstantExpression" + }, + { + "Other": "ConstantExpression" + }, + { + "Other": "ConstantExpression" + }, + { + "Other": "ConstantExpression" + }, + { + "Other": "ConstantExpression" + }, + { + "Other": "ConstantExpression" + }, + { + "Other": "ConstantExpression" + }, + { + "Other": "ConstantExpression" + }, + { + "Other": "ConstantExpression" + } ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { "Inputs": [ - 4, - 5 + { + "InternalOperatorId": 5 + }, + { + "Other": "ConstantExpression" + } ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { + "Inputs": [ + { + "InternalOperatorId": 6 + } + ], "Name": "Filter", "Predicate": "Exist(item.thousand)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "tenthous", @@ -91,9 +159,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -109,9 +187,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "f1" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_3.plan index da9e67391a36..1eca40cbdfa5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_3.plan @@ -12,9 +12,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1", "Name": "Limit" } @@ -30,12 +40,30 @@ "Node Type": "Aggregate-InnerJoin (MapJoin)-Filter", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Filter", "Predicate": "Exist(item.hundred)" } @@ -60,10 +88,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.thousand) And item.fivethous % 10 < 10" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "fivethous", @@ -97,6 +131,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "fivethous", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_4.plan index fe3c870c0273..9cd4dd884d24 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,32 @@ "Node Type": "Limit-Filter-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Not Exist(item.b.unique2) And item.a.ten == 2 Or item.b.hundred == 3" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -58,6 +81,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "hundred", @@ -91,6 +115,7 @@ "Node Type": "TableRangeScan", "Operators": [ { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "ten", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_5.plan index c9cb5dca0d83..abc37405606a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,32 @@ "Node Type": "TopSort-InnerJoin (MapJoin)-Filter", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.qr.qq" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + } + ], "Name": "Filter", "Predicate": "Exist(item.qq)" } @@ -59,6 +82,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "unique1", @@ -91,6 +115,14 @@ "Node Type": "FullJoin (JoinDict)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 12 + }, + { + "ExternalPlanNodeId": 8 + } + ], "Name": "FullJoin (JoinDict)" } ], @@ -117,6 +149,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "q1", @@ -161,6 +194,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "q1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_6.plan index 2b668aa783e9..725ee0494dbb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 34 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,32 @@ "Node Type": "Limit-Filter-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.t1.stringu1 > item.t2.stringu2" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 32 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -50,6 +73,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -77,10 +101,20 @@ "Node Type": "Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.unique1)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "stringu2", @@ -89,6 +123,7 @@ "Table": "postgres_jointest/join0.test_plan/tenk1" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -120,19 +155,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.subq1.y1)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 24 @@ -159,9 +187,22 @@ "Node Type": "InnerJoin (MapJoin)-Filter", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 18 + } + ], "Name": "Filter", "Predicate": "Exist(item.unique2)" } @@ -186,6 +227,14 @@ "Node Type": "LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 12 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -209,6 +258,14 @@ "Node Type": "LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -223,6 +280,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x1", @@ -260,6 +318,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "y1", @@ -300,6 +359,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "f1" @@ -334,10 +394,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.unique2) And item.unique2 < 42" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "stringu1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_7.plan index c3cc57de3837..5a271a7e6ed8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_7.plan @@ -12,9 +12,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + } + ], "Limit": "1", "Name": "Limit" } @@ -30,9 +40,22 @@ "Node Type": "Aggregate-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 12 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -56,9 +79,22 @@ "Node Type": "InnerJoin (MapJoin)-Filter", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Filter", "Predicate": "Exist(item.thousand)" } @@ -83,6 +119,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "hundred", @@ -117,6 +154,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "hundred", @@ -155,6 +193,7 @@ "Node Type": "TableRangeScan", "Operators": [ { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "hundred", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_8.plan index 23a593ff7cc6..a21eb29e8224 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_8.plan @@ -12,9 +12,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + } + ], "Limit": "1", "Name": "Limit" } @@ -30,9 +40,22 @@ "Node Type": "Aggregate-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 12 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -56,9 +79,22 @@ "Node Type": "InnerJoin (MapJoin)-Filter", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Filter", "Predicate": "Exist(item.thousand)" } @@ -83,6 +119,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "hundred", @@ -117,6 +154,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "hundred", @@ -155,6 +193,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "hundred", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_9.plan index a539e6c8e7aa..66c6abccd6ec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,54 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.fault" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -55,6 +103,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "unique1", @@ -87,6 +136,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "q1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_1.plan index 33dbe33b9a9f..8b56ea0b4bed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], "Limit": "1001", "Name": "Limit" } @@ -28,26 +33,46 @@ "Node Type": "TopSort-InnerJoin (MapJoin)-ConstantExpr-Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { "Inputs": [ - 2, - 3 + { + "InternalOperatorId": 3 + }, + { + "Other": "ConstantExpression" + } ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { + "Inputs": [ + { + "InternalOperatorId": 4 + } + ], "Name": "Filter", "Predicate": "Exist(item.i)" }, { + "Inputs": [ + { + "InternalOperatorId": 5 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "i", @@ -56,6 +81,7 @@ "Table": "postgres_jointest/join1.test_plan/J2_TBL" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -83,19 +109,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.i)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -122,6 +141,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_10.plan index 0ee625dccf15..fa702333d20f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -55,6 +73,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", @@ -89,6 +108,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_11.plan index f0ae8f398c97..d71b92bb55df 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-FullJoin (JoinDict)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + }, + { + "ExternalPlanNodeId": 4 + } + ], "Name": "FullJoin (JoinDict)" } ], @@ -58,6 +79,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", @@ -102,6 +124,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_12.plan index baa4361b1e58..bcf7156481a6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-FullJoin (JoinDict)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + }, + { + "ExternalPlanNodeId": 4 + } + ], "Name": "FullJoin (JoinDict)" } ], @@ -58,6 +79,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", @@ -102,6 +124,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_13.plan index 7a28f18bbd3b..16d169666a18 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,32 @@ "Node Type": "Limit-Filter-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.J2_TBL.k == 1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -50,6 +73,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -77,10 +101,20 @@ "Node Type": "Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.i)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "i", @@ -89,6 +123,7 @@ "Table": "postgres_jointest/join1.test_plan/J2_TBL" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -120,19 +155,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.i)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -159,6 +187,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_14.plan index a552962e6b00..6af4488371cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,23 @@ "Node Type": "Limit-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -46,6 +64,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -73,10 +92,20 @@ "Node Type": "Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.i)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "i", @@ -85,6 +114,7 @@ "Table": "postgres_jointest/join1.test_plan/J2_TBL" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -116,19 +146,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.i)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -155,6 +178,7 @@ "Node Type": "TableRangeScan", "Operators": [ { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "i", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_2.plan index 106668e32104..34bac532cc5d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], "Limit": "1001", "Name": "Limit" } @@ -28,26 +33,46 @@ "Node Type": "TopSort-InnerJoin (MapJoin)-ConstantExpr-Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { "Inputs": [ - 2, - 3 + { + "InternalOperatorId": 3 + }, + { + "Other": "ConstantExpression" + } ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { + "Inputs": [ + { + "InternalOperatorId": 4 + } + ], "Name": "Filter", "Predicate": "Exist(item.i)" }, { + "Inputs": [ + { + "InternalOperatorId": 5 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "i", @@ -56,6 +81,7 @@ "Table": "postgres_jointest/join1.test_plan/J2_TBL" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -85,19 +111,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.i)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -124,6 +143,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_3.plan index 106668e32104..34bac532cc5d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], "Limit": "1001", "Name": "Limit" } @@ -28,26 +33,46 @@ "Node Type": "TopSort-InnerJoin (MapJoin)-ConstantExpr-Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { "Inputs": [ - 2, - 3 + { + "InternalOperatorId": 3 + }, + { + "Other": "ConstantExpression" + } ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { + "Inputs": [ + { + "InternalOperatorId": 4 + } + ], "Name": "Filter", "Predicate": "Exist(item.i)" }, { + "Inputs": [ + { + "InternalOperatorId": 5 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "i", @@ -56,6 +81,7 @@ "Table": "postgres_jointest/join1.test_plan/J2_TBL" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -85,19 +111,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.i)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -124,6 +143,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_4.plan index 40719fa88b18..07c8c269a034 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,32 @@ "Node Type": "TopSort-InnerJoin (MapJoin)-Filter", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Filter", "Predicate": "Exist(item.j)" } @@ -59,6 +82,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", @@ -91,6 +115,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_5.plan index 106668e32104..34bac532cc5d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], "Limit": "1001", "Name": "Limit" } @@ -28,26 +33,46 @@ "Node Type": "TopSort-InnerJoin (MapJoin)-ConstantExpr-Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { "Inputs": [ - 2, - 3 + { + "InternalOperatorId": 3 + }, + { + "Other": "ConstantExpression" + } ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { + "Inputs": [ + { + "InternalOperatorId": 4 + } + ], "Name": "Filter", "Predicate": "Exist(item.i)" }, { + "Inputs": [ + { + "InternalOperatorId": 5 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "i", @@ -56,6 +81,7 @@ "Table": "postgres_jointest/join1.test_plan/J2_TBL" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -85,19 +111,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.i)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -124,6 +143,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_6.plan index 255a9e773dfb..4e980d598761 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,32 @@ "Node Type": "TopSort-InnerJoin (MapJoin)-Filter", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.J1_TBL.i" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Filter", "Predicate": "Exist(item.i)" } @@ -59,6 +82,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "k" @@ -90,6 +114,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_7.plan index 97c9cb6c947a..2fdd33761653 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -47,6 +65,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -74,10 +93,20 @@ "Node Type": "Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.i)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "i", @@ -86,6 +115,7 @@ "Table": "postgres_jointest/join1.test_plan/J2_TBL" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -123,19 +153,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.i)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -162,6 +185,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_8.plan index 97c9cb6c947a..2fdd33761653 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -47,6 +65,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -74,10 +93,20 @@ "Node Type": "Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.i)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "i", @@ -86,6 +115,7 @@ "Table": "postgres_jointest/join1.test_plan/J2_TBL" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -123,19 +153,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.i)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -162,6 +185,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_9.plan index 0ee625dccf15..fa702333d20f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -55,6 +73,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", @@ -89,6 +108,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_1.plan index 52fa5552bdac..248183759aef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 18 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-FullJoin (JoinDict)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.name" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + }, + { + "ExternalPlanNodeId": 12 + } + ], "Name": "FullJoin (JoinDict)" } ], @@ -58,6 +79,14 @@ "Node Type": "FullJoin (JoinDict)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + }, + { + "ExternalPlanNodeId": 4 + } + ], "Name": "FullJoin (JoinDict)" } ], @@ -84,6 +113,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "n", @@ -128,6 +158,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "n", @@ -180,6 +211,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "n", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_10.plan index cb72b24f7aad..aee05d62f45d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 22 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.x1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 20 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -46,6 +64,14 @@ "Node Type": "LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 18 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -61,6 +87,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -88,10 +115,20 @@ "Node Type": "Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.y1)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "y1", @@ -100,6 +137,7 @@ "Table": "postgres_jointest/join2.test_plan/y" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -137,6 +175,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x1", @@ -179,19 +218,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.x1)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -218,10 +250,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.x2)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_11.plan index 88843751453c..1481475883ef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 22 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,33 @@ "Node Type": "TopSort-Filter-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.x1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.y.y2)" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 20 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -50,6 +73,14 @@ "Node Type": "LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 18 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -65,6 +96,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -92,10 +124,20 @@ "Node Type": "Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.y1)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "y1", @@ -104,6 +146,7 @@ "Table": "postgres_jointest/join2.test_plan/y" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -141,6 +184,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x1", @@ -183,19 +227,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.x1)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -222,6 +259,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_12.plan index ef6b510ecf7e..82578c17ec9c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 22 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,93 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.x1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 20 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -46,6 +133,14 @@ "Node Type": "LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 18 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -61,6 +156,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -88,10 +184,20 @@ "Node Type": "Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.y1)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "y1", @@ -100,6 +206,7 @@ "Table": "postgres_jointest/join2.test_plan/y" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -137,6 +244,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x1", @@ -179,19 +287,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.x1)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -218,6 +319,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_2.plan index f9ed7d31d70e..e1f3e575360b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], "Limit": "1001", "Name": "Limit" } @@ -28,26 +33,46 @@ "Node Type": "TopSort-InnerJoin (MapJoin)-ConstantExpr-Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.s2.name" }, { "Inputs": [ - 2, - 3 + { + "InternalOperatorId": 3 + }, + { + "Other": "ConstantExpression" + } ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { + "Inputs": [ + { + "InternalOperatorId": 4 + } + ], "Name": "Filter", "Predicate": "Exist(item.name)" }, { + "Inputs": [ + { + "InternalOperatorId": 5 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "n", @@ -56,6 +81,7 @@ "Table": "postgres_jointest/join2.test_plan/t3" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -82,19 +108,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.name)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -121,6 +140,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "n", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_3.plan index 12d042926f0b..b7db52f38ee4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.s2.name" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -47,6 +65,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -74,10 +93,20 @@ "Node Type": "Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.name)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "n", @@ -86,6 +115,7 @@ "Table": "postgres_jointest/join2.test_plan/t3" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -120,19 +150,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.name)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -159,6 +182,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "n", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_4.plan index 03a37cea018a..5ad117dea35f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-FullJoin (JoinDict)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.name" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + }, + { + "ExternalPlanNodeId": 4 + } + ], "Name": "FullJoin (JoinDict)" } ], @@ -58,6 +79,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "n", @@ -102,6 +124,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "n", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_5.plan index 12b8fe25d3d7..7b1f0571b330 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_6.plan index 9c6609c52066..b40149248e0c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "y1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_7.plan index 41623c71242a..669baae2cae2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,23 @@ "Node Type": "Limit-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -46,6 +64,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -73,10 +92,20 @@ "Node Type": "Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.y1)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "y1", @@ -85,6 +114,7 @@ "Table": "postgres_jointest/join2.test_plan/y" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -116,19 +146,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.x1)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -155,10 +178,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.x2)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_8.plan index 494da8e700ac..5f69347bcfe0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,32 @@ "Node Type": "Limit-Filter-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.y.y2)" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -50,6 +73,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -77,10 +101,20 @@ "Node Type": "Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.y1)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "y1", @@ -89,6 +123,7 @@ "Table": "postgres_jointest/join2.test_plan/y" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -120,19 +155,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.x1)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -159,6 +187,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_9.plan index ef6b510ecf7e..bca7ff77432f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 22 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.x1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 20 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -46,6 +64,14 @@ "Node Type": "LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 18 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -61,6 +87,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -88,10 +115,20 @@ "Node Type": "Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.y1)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "y1", @@ -100,6 +137,7 @@ "Table": "postgres_jointest/join2.test_plan/y" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -137,6 +175,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x1", @@ -179,19 +218,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.x1)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -218,6 +250,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_1.plan index 62e620eca86b..1e4361ed43a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,33 @@ "Node Type": "TopSort-Filter-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b.q1 > 0" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "ExternalPlanNodeId": 4 + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -59,6 +82,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "q1", @@ -91,6 +115,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "q1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_2.plan index b0861501b095..7657dfd0b9f6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.p.k" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -47,6 +65,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -74,10 +93,20 @@ "Node Type": "Filter-TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.k)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "k" @@ -85,6 +114,7 @@ "Table": "postgres_jointest/join3.test_plan/child" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -119,19 +149,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.k)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -158,6 +181,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "k", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_3.plan index b91fe636dd8f..b4044bc3ab29 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.k" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -55,6 +73,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "k" @@ -85,6 +104,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "k", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_4.plan index 4808ea609769..3e7f4aa529be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,23 @@ "Node Type": "Limit-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -46,6 +64,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -73,10 +92,20 @@ "Node Type": "Filter-TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.k)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "k" @@ -84,6 +113,7 @@ "Table": "postgres_jointest/join3.test_plan/child" }, { + "Inputs": [], "Iterator": "precompute_2_0", "Name": "Iterator" } @@ -115,19 +145,12 @@ "Plans": [ { "CTE Name": "precompute_1_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_1_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.k)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -155,6 +178,11 @@ "Node Type": "TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "k", @@ -163,6 +191,7 @@ "Table": "postgres_jointest/join3.test_plan/parent" }, { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_5.plan index 7999245d97b5..3b70d56190a7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 24 + } + ], "Limit": "1001", "Name": "Limit" } @@ -28,25 +33,45 @@ "Node Type": "Limit-InnerJoin (MapJoin)-ConstantExpr-Filter-TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { "Inputs": [ - 2, - 3 + { + "InternalOperatorId": 3 + }, + { + "Other": "ConstantExpression" + } ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_3_0" }, { + "Inputs": [ + { + "InternalOperatorId": 4 + } + ], "Name": "Filter", "Predicate": "Exist(item.k)" }, { + "Inputs": [ + { + "InternalOperatorId": 5 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "k" @@ -54,6 +79,7 @@ "Table": "postgres_jointest/join3.test_plan/parent" }, { + "Inputs": [], "Iterator": "precompute_4_0", "Name": "Iterator" } @@ -77,19 +103,12 @@ "Plans": [ { "CTE Name": "precompute_3_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_3_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.p_1.k)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 20 @@ -116,6 +135,14 @@ "Node Type": "LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -131,6 +158,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -158,10 +186,20 @@ "Node Type": "Filter-TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.k)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "k" @@ -169,6 +207,7 @@ "Table": "postgres_jointest/join3.test_plan/child" }, { + "Inputs": [], "Iterator": "precompute_2_0", "Name": "Iterator" } @@ -201,19 +240,12 @@ "Plans": [ { "CTE Name": "precompute_1_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_1_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.k)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -241,6 +273,11 @@ "Node Type": "TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "k", @@ -249,6 +286,7 @@ "Table": "postgres_jointest/join3.test_plan/parent" }, { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_6.plan index 86cd1b7b045d..889fc818a16e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,32 @@ "Node Type": "Limit-Filter-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Not Exist(item.qa.id) Or item.qa.id > 0" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -50,6 +73,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -77,10 +101,20 @@ "Node Type": "Filter-TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.id)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "id" @@ -88,6 +122,7 @@ "Table": "postgres_jointest/join3.test_plan/qa" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -119,19 +154,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.a_id)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -158,6 +186,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a_id", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_7.plan index 86cd1b7b045d..889fc818a16e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,32 @@ "Node Type": "Limit-Filter-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Not Exist(item.qa.id) Or item.qa.id > 0" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -50,6 +73,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -77,10 +101,20 @@ "Node Type": "Filter-TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.id)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "id" @@ -88,6 +122,7 @@ "Table": "postgres_jointest/join3.test_plan/qa" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -119,19 +154,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.a_id)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -158,6 +186,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a_id", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_8.plan index 4c8f6c365347..02c475ac633c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -55,9 +73,18 @@ "Node Type": "LeftJoin (MapJoin)-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "q1", @@ -90,6 +117,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "[{x: 1}]", "Name": "Iterator" } diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_1.plan index ae3f80c525b6..424e45060adc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,32 @@ "Node Type": "Limit-Filter-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "{b1: ExtractMembers.nt2.b1,b2: ExtractMembers.nt2.b2,b3: ExtractMembers.nt2.b1 And {a1: ExtractMembers.a1,a2: ExtractMembers.a2,a3: Exist(ExtractMembers.id),id: ExtractMembers.id}.a3,id: ExtractMembers.nt2.id,nt1_id: ExtractMembers.nt2.nt1_id}.b3" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 12 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -58,6 +81,14 @@ "Node Type": "LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -81,6 +112,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a1", @@ -113,6 +145,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b1", @@ -150,6 +183,11 @@ "Node Type": "TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "id", @@ -158,6 +196,7 @@ "Table": "postgres_jointest/join4.test_plan/nt3" }, { + "Inputs": [], "Iterator": "[{id: 1}]", "Name": "Iterator" } diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_10.plan index 1909136d8a2f..3da3693600a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_11.plan index 1909136d8a2f..3da3693600a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_12.plan index 1909136d8a2f..3da3693600a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "x", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_13.plan index 5e1002178fa4..e5220f4e65de 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -47,6 +65,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -74,10 +93,20 @@ "Node Type": "Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.a)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "a", @@ -86,6 +115,7 @@ "Table": "postgres_jointest/join4.test_plan/qrt2" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -121,19 +151,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.a)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -160,6 +183,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_4.plan index 734a2218ae02..f56c163342de 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,24 @@ "Node Type": "TopSort-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.name" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -55,6 +73,14 @@ "Node Type": "LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -92,9 +118,15 @@ { "Aggregation": "{_yql_agg_0: Inc(state._yql_agg_0)}", "GroupBy": "item.a", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a" @@ -130,6 +162,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "code" @@ -164,6 +197,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_5.plan index 2bf573c8c550..211a41ff050e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 16 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,23 @@ "Node Type": "Limit-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -46,6 +64,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -73,10 +92,20 @@ "Node Type": "Filter-TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.x) And Exist(item.y)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "x", @@ -85,6 +114,7 @@ "Table": "postgres_jointest/join4.test_plan/tqb" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -116,23 +146,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit-Filter", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.i)" - }, - { - "Limit": "1", - "Name": "Limit" - }, - { - "Name": "Filter", - "Predicate": "item.i == item.i" } ], "PlanNodeId": 6 @@ -159,6 +178,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "i" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_6.plan index 6e66e1045994..56536eaef6e5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 30 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,23 @@ "Node Type": "Limit-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 28 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -46,6 +64,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_2_0", "Name": "Iterator" } @@ -73,10 +92,20 @@ "Node Type": "Filter-TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.f1)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "f1" @@ -84,6 +113,7 @@ "Table": "postgres_jointest/join4.test_plan/zt1" }, { + "Inputs": [], "Iterator": "precompute_3_0", "Name": "Iterator" } @@ -115,19 +145,12 @@ "Plans": [ { "CTE Name": "precompute_2_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_2_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.zt3.f3)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 20 @@ -154,6 +177,14 @@ "Node Type": "LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 14 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -169,6 +200,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -196,10 +228,20 @@ "Node Type": "Filter-TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.f3)" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "f3" @@ -207,6 +249,7 @@ "Table": "postgres_jointest/join4.test_plan/zt3" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -239,19 +282,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.f2)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -278,6 +314,11 @@ "Node Type": "TablePointLookup-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "TablePointLookup", "ReadColumns": [ "f2" @@ -285,6 +326,7 @@ "Table": "postgres_jointest/join4.test_plan/zt2" }, { + "Inputs": [], "Iterator": "[{f2: 53}]", "Name": "Iterator" } diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_7.plan index 394687b6df48..7a9100da147d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], "Limit": "1001", "Name": "Limit" } @@ -28,29 +33,54 @@ "Node Type": "Limit-Filter-InnerJoin (MapJoin)-ConstantExpr-Filter-TableRangeScan-ConstantExpr", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.tt5.f1 == item.tt5.f2 - item.tt6.f2" }, { "Inputs": [ - 3, - 4 + { + "InternalOperatorId": 4 + }, + { + "Other": "ConstantExpression" + } ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { + "Inputs": [ + { + "InternalOperatorId": 5 + } + ], "Name": "Filter", "Predicate": "Exist(item.f1)" }, { + "Inputs": [ + { + "InternalOperatorId": 6 + } + ], "Name": "TableRangeScan", "ReadColumns": [ "f1", @@ -59,6 +89,7 @@ "Table": "postgres_jointest/join4.test_plan/tt6" }, { + "Inputs": [], "Iterator": "precompute_1_0", "Name": "Iterator" } @@ -82,19 +113,12 @@ "Plans": [ { "CTE Name": "precompute_0_0", - "Node Type": "Aggregate-Filter-Limit", + "Node Type": "Aggregate", "Operators": [ { "Input": "precompute_0_0", + "Inputs": [], "Name": "PartitionByKey" - }, - { - "Name": "Filter", - "Predicate": "Exist(item.f1)" - }, - { - "Limit": "1", - "Name": "Limit" } ], "PlanNodeId": 6 @@ -121,6 +145,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "f1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_8.plan index 4f3c6828393c..f474a72e663e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,23 @@ "Node Type": "Limit-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -54,6 +72,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "joincol", @@ -86,6 +105,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "joincol", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_9.plan index 4f3c6828393c..f474a72e663e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,23 @@ "Node Type": "Limit-LeftJoin (MapJoin)", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "LeftJoin (MapJoin)" } ], @@ -54,6 +72,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "joincol", @@ -86,6 +105,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "joincol", 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 2cb5a5673865..b203bae1860a 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "even", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_10.plan index a3128041c598..ca90660095bd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "stringu1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_12.plan index 86d6a1aed6dc..fd1be64e0a61 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,17 +32,36 @@ "Node Type": "Limit-InnerJoin (MapJoin)-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + }, + { + "Other": "ConstantExpression" + } + ], "Name": "InnerJoin (MapJoin)" }, { + "Inputs": [ + { + "InternalOperatorId": 3 + } + ], "Name": "Filter", "Predicate": "Exist(item.stringu1) And Exist(item.unique1)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "even", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_14.plan index 97d1083d48f9..95bead6548be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,6 +32,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Limit": "1001", "Name": "Limit" } @@ -42,10 +52,20 @@ "Node Type": "Sort-Union", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Sort", "SortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Name": "Union" } ], @@ -60,6 +80,11 @@ "Node Type": "Top", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Top", "TopBy": "" @@ -76,11 +101,17 @@ "Node Type": "Top-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Top", "TopBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "q1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_15.plan index 6f4b4d55953d..f7c1c6973b10 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "f1" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_16.plan index 6f4b4d55953d..f7c1c6973b10 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "f1" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_17.plan index 93f25244b5de..4e9deeb93e71 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "f1" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_18.plan index fcb97a9954ce..dd6550096624 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,25 @@ "Node Type": "Limit-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.unique2 == 11 And item.stringu1 == \"ATAAAA\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "even", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_19.plan index 58f8d4e6a1ec..73b33bb0c681 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,25 @@ "Node Type": "Limit-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.unique2 == 11 And item.stringu1 == \"ATAAAA\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "stringu1", 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 52094f86e2e6..d247b872e1bf 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "stringu1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_20.plan index 20e028d2940b..6cdda1fbefaf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,25 @@ "Node Type": "Limit-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.unique2 == 11 And item.stringu1 < \"B\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "even", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_21.plan index d75edfeff394..c5a0fe24eb28 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,25 @@ "Node Type": "Limit-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.unique2 == 11 And item.stringu1 < \"B\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "stringu1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_22.plan index 18e113ae9f1b..9cab6aa46165 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,25 @@ "Node Type": "Limit-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.unique2 == 11 And item.stringu1 < \"C\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "stringu1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_23.plan index d75edfeff394..c5a0fe24eb28 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,14 +32,25 @@ "Node Type": "Limit-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.unique2 == 11 And item.stringu1 < \"B\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "stringu1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_24.plan index b8065d3f14b8..3518bba065d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.unique2" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.unique2 == 11 Or item.unique1 == 0 And item.stringu1 < \"B\"" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "stringu1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_25.plan index e9553bc88b91..30c82f47ed15 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.unique2" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.unique2 == 11 And item.stringu1 < \"B\" Or item.unique1 == 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "stringu1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_3.plan index 1616b3718e57..856507ba4090 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.stringu1" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "stringu1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_4.plan index 6fdaa30758f3..4396dd4e6a3c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "string4", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_5.plan index 9e3395a87844..fbcbb695a8e8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "string4", 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 14abde820c18..b7cdb3a15b1a 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "string4", 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 98d34bd4ae93..89656f23e1de 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "string4", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_8.plan index bfa88f266d33..e7f42c4406d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "10", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "10", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "even", 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 2f426970d139..fb9be4b3b3e0 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "stringu1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_1.plan index 5c8aac51d21b..115b323a005b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,6 +32,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.two" @@ -48,9 +58,15 @@ { "Aggregation": "state", "GroupBy": "row.two", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "two" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_2.plan index 0f616c716568..5adb5a911e9c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,6 +32,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.ten" @@ -48,9 +58,15 @@ { "Aggregation": "state", "GroupBy": "row.ten", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "ten" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_3.plan index 0c8ffd0d3b22..4c24f6a6c80d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,6 +32,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.string4" @@ -48,9 +58,15 @@ { "Aggregation": "state", "GroupBy": "row.string4", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "string4" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_4.plan index 12f51c849f5d..5b26130421ce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,6 +32,11 @@ "Node Type": "TopSort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" @@ -50,9 +60,15 @@ { "Aggregation": "state", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "string4", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_5.plan index 9314c7d626cc..88e4bd1a65b5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_5.plan @@ -12,9 +12,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "1", "Name": "Limit" } @@ -30,6 +40,11 @@ "Node Type": "Aggregate", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Aggregate" } ], @@ -50,9 +65,15 @@ { "Aggregation": "state", "GroupBy": "", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "four", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_1.plan index 3e3274573075..5582e69c08c9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Sort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + }, + { + "ExternalPlanNodeId": 4 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Name": "Sort", "SortBy": "row.nsum" } @@ -50,6 +71,11 @@ "Node Type": "Sort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Sort", "SortBy": "row.salary" } @@ -68,6 +94,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "depname", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_2.plan index 135b1637fbaa..def455086e64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Sort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + }, + { + "ExternalPlanNodeId": 2 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Sort", "SortBy": "row.salary" } @@ -50,6 +71,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "depname", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_3.plan index 135b1637fbaa..def455086e64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Sort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + }, + { + "ExternalPlanNodeId": 2 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Sort", "SortBy": "row.salary" } @@ -50,6 +71,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "depname", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_4.plan index 5a89b3629aaa..94540438bc70 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Sort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + }, + { + "ExternalPlanNodeId": 2 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Sort", "SortBy": "row.salary" } @@ -50,6 +71,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "depname", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan index 769a42f909b6..cd1ada2e199a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 8 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,21 @@ "Node Type": "TopSort-Sort", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument._yql_RowNumber0" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 6 + } + ], "Name": "Sort", "SortBy": "row.depname" } @@ -47,6 +62,11 @@ "Node Type": "Sort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Name": "Sort", "SortBy": "row.depname" } @@ -76,9 +96,15 @@ { "Aggregation": "{_yql_agg_0: SUM(item.salary,state._yql_agg_0)}", "GroupBy": "item.depname", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "depname", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_6.plan index 3c5c2ded4560..f4541835677b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,20 @@ "Node Type": "Limit-Sort", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Sort", "SortBy": "row.salary" } @@ -46,6 +61,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "salary" diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_7.plan index 8c71ad2171ad..53443321e90a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,26 @@ "Node Type": "Limit-Sort", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + }, + { + "ExternalPlanNodeId": 2 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Name": "Sort", "SortBy": "row.salary" } @@ -49,6 +70,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "depname", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_1.plan index df06690a432a..96cc7b21ffd9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_1.plan @@ -12,9 +12,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -30,9 +40,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": null, "ReadRanges": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_2.plan index df06690a432a..96cc7b21ffd9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_2.plan @@ -12,9 +12,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -30,9 +40,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": null, "ReadRanges": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_3.plan index fd4ba3892755..3bc90d51ea33 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_10.plan index ac7f87c74347..d6fdf2e23742 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_100.plan index ab29d5a365c7..7ca1404541bb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_101.plan index 2bc9aa4f9744..2ca6b8e0d935 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_102.plan index bdc26d365c29..6e6b8f5312e5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_103.plan index 7e64a6b90d8c..7888d49f96d2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_104.plan index 70bd0b8c82b4..88106d9978b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.a And item.e < item.b And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_105.plan index 7e53c2cc7885..0fc97846230a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_106.plan index bde8b5c09907..ede8db689084 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_107.plan index 5a049c3dc6bd..533970399ef1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b - 2 And item.a < item.b + 2 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_108.plan index 2c3886763633..879e1b723492 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_109.plan index bf1f579ba6da..7b91d59acdd1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_109.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_11.plan index 603001c47fbb..9aff4551173a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_110.plan index ba376240ad54..e7fb4af80b31 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_111.plan index a689658019f6..9a2dee7c9ae9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_112.plan index 13629b2cdd9c..095a4e94a629 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e > item.a And item.e < item.b Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_113.plan index 39ea4380aa10..74a1debfab89 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_114.plan index 72732453095e..9c229b2f419a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_115.plan index 598e25634411..df7369a28e33 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_116.plan index 2b82e36d9b8c..1d9b5e71a16f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_116.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_117.plan index 079e8ed73ba4..66ef1ff72bdc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_118.plan index 3978e7bf5dd0..238ab8bfa89b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_119.plan index 24e6b2d1425a..00f40f06fefd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_12.plan index e968284f332c..b53cafa843f4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_120.plan index 8fabc35ec7f3..3f00bc35b898 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_120.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.a > item.b - 2 And item.a < item.b + 2 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_121.plan index 1005e59919af..00d5b11e294e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -110,9 +133,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -128,9 +161,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_122.plan index fa75937b3997..7feda3618950 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_122.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_123.plan index 9e08f0210b6a..f64e3bcec4ad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_123.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_124.plan index bdb7b4a62e6d..c116a3881723 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_124.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_125.plan index d767c255d097..9bcc47682503 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_125.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.d > item.e And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_126.plan index fd2888988fe7..7e1851d7e901 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_126.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_127.plan index 56c0650f2ad7..9b30add86ca6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_127.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_13.plan index bcef98cbd8b9..ca1ffc3b3fbd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_14.plan index 5e59d4192c48..c205d74b3b05 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d > item.e And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_15.plan index 0b26be3f5b75..f17fa96098c4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_16.plan index b7ff28ad400d..67f83ac699bb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_17.plan index ffb25bd7ac67..a236f3bd70ef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_18.plan index 7a580f204f51..9b1b82d7b02e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_19.plan index 94a4001c63dc..901a446331e7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_2.plan index c3037214e787..76a08b09e796 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -108,9 +131,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -126,9 +159,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_20.plan index b1732243e3cf..6f91fabb4618 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_21.plan index d92207470054..638d3bb334de 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_22.plan index 60e99766f65c..a48320faa45f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_23.plan index 4f89e79ded77..63e12aaacf65 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_24.plan index ccbe9d10f1c5..71a9b047a9af 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_25.plan index e37f7f36d568..5859d2799fda 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -112,9 +135,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -130,9 +163,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_26.plan index dfb9f8011b30..973b86e77b05 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_27.plan index e4b636187409..3db5b3179f9f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.a > item.b And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_28.plan index 2f63c056ca13..8303a247efaa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_29.plan index e1e0f82b1d6a..b6ef974c5830 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_3.plan index 93364767b9c9..68d67e8df108 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_30.plan index e1e0f82b1d6a..b6ef974c5830 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_31.plan index 18ff3eeff9d3..6dfc57717654 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_32.plan index 83cfeefc9c88..7b090573b9d0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_33.plan index 42d6aa71c239..a0f593a5f171 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_34.plan index 714a365c9ba0..46756cffeaa4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_35.plan index 041a34de6edd..27e058563b13 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_36.plan index 4d4bc19c26d3..88ec2922316e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_37.plan index c0517ac46381..500319f5739f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_38.plan index 9adad472faad..6529d84f028a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_39.plan index 08513cd4b8a4..e48175cbedcc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_4.plan index b0c717c31c68..0d7eee7fb37e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_40.plan index 0a10d712014e..b1a9a15f007e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_41.plan index 179167b50489..b873adca80ec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_42.plan index 5f0bc5ba7074..f86b1c49cb8f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_43.plan index d0a13eb604f5..b87fd40ef56f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_44.plan index 9a61110597b5..0b6390fbfe82 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_45.plan index 1e8f727a80be..c699618750b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_46.plan index 4d1a1485db07..58b915a917fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_47.plan index e00977d730b1..9e9992ae6115 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_48.plan index e17fd01fb398..e9cca1b7587e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.c Or item.e < item.d Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_49.plan index 9619dc7a51de..63b120032a32 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_5.plan index d5ecb74ba901..cbd4c5b35bcf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_50.plan index 5afb6371236d..2fece38617b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_51.plan index cbf7c67abf2c..ff534773c4c4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_52.plan index a45d809286a5..b3eaf4cf517e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_53.plan index 126bad7bcc4c..9505e4110c13 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.c Or item.e < item.d And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_54.plan index e84ba38e66f7..8c238924f649 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_55.plan index ad04d118398f..de77c8ce23ca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_56.plan index f994d2d250e9..4792524dd681 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_57.plan index 3cff50f3a566..1127a4e12005 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_58.plan index 0ab563aab09d..948a24d96d1c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "e" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_59.plan index 5075177b0972..2a26be6be95b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_6.plan index b937fba974e8..fa57698bd657 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_60.plan index 44e0eba77dc7..56f32cd4441f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_61.plan index ec3e7f93416b..b104a60a3987 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_62.plan index ba65aaad1434..add7ca609612 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_63.plan index 75aa3c334582..86da8a724b3a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_64.plan index 9144e25075f6..192d6268d6bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.e > item.c Or item.e < item.d And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_65.plan index 14b842172690..b31144f70c2b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d > item.e Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_66.plan index 16a7b74ed84d..7955088d8634 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_67.plan index 52282e572b5a..a0034126487d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_68.plan index 00841b83e78c..a990a2c02ea0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_69.plan index 350f7cd816b3..a9b418850edb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_7.plan index 5075177b0972..2a26be6be95b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_70.plan index 33856e68b418..d1f6cf57f38f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_71.plan index f01dcbd8133e..63dc9412191a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_72.plan index 46d9ff47a7d8..f948200f6c45 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d > item.e And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_73.plan index 60a94424c28b..78a4ba2cfed8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.d > item.e And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_74.plan index c3037214e787..76a08b09e796 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -108,9 +131,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -126,9 +159,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_75.plan index 276174b3128f..feb56700e637 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_76.plan index a8ce6f8b9ca8..f377ae803ea4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_77.plan index d38616c26c2a..dc925a0cc6ab 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_78.plan index acf1649b8201..60c5b37739dc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_79.plan index 437fb3eeb297..958ddaa423c8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_8.plan index aa2cba4d40eb..e84ef5a8181b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_80.plan index 61a183e7303f..1141215a662a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_81.plan index 81d3ef3867c6..e802c1cc8daf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_82.plan index 369324fcac78..d38085ee3ab4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_83.plan index e0d7a6b3e1d6..497decfee8a8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_84.plan index b5916099e74a..61705eedefc3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_85.plan index 02aca53473bc..2a511c949085 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_86.plan index 4fc15447ddf7..2aef28df1b40 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_87.plan index 59ddb8555a5f..d9b7bec02b85 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b - 2 And item.a < item.b + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_88.plan index 465131f8ef94..a2ca61079a1a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_89.plan index dd5a63cb4ce2..0a6d7386b817 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_9.plan index 26a4b413cb11..03afe40d8143 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_90.plan index eaf375c2a51e..cf48393a7698 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a > item.b Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_91.plan index bf530c05b92e..42126bdb8e84 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_92.plan index bd0bec6251a9..8be257bb70a1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_93.plan index 83cfeefc9c88..7b090573b9d0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_94.plan index 5ce3dffe702d..df2eb0f381ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d < 110 Or item.d > 150 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_95.plan index 7884bb4be035..ff8200890436 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.e > item.a And item.e < item.b And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_96.plan index fbd6af04f4f0..2aac5423e564 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_97.plan index 404e82d6b65c..98c0e07eac62 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_98.plan index e114bde7fddb..2056789e2136 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_99.plan index 32fb8d121028..362d930c51d8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.d < 110 Or item.d > 150 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_1.plan index d3a4aef05536..479c0fe224d1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_10.plan index 806ccd1a7581..9983b3bbe183 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.d > item.e Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_100.plan index 93459f94a5ab..df0a72c888ce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_101.plan index b034b95ef071..2888c99bf5b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_102.plan index c02b63036961..1ed1fdf69e89 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d < 110 Or item.d > 150 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_103.plan index cccf73f6d2a9..2e58cfade3d3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_104.plan index 71b90bc61c74..7f9657c8d198 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.b > item.c Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_105.plan index ae43d87b948f..73c26eaabad9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_106.plan index d2947be7141f..da1c54c39e0a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_107.plan index f01341f946dd..739e11cba73c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_108.plan index 41b5706ecbe0..7325329a7810 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_109.plan index b401fcfa6551..2bd26024f580 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_109.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_11.plan index 0129bbb3288f..2b89debda23c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_110.plan index 36a165e3b83c..1b7a59982e36 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_111.plan index 6cd08200c9e4..44aeeaa2d0b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_112.plan index 6126bc21d234..2997bcde6c22 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_113.plan index dc75f3735eae..2ca8675da226 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_114.plan index 085ed0900806..87fa27c0de9c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_115.plan index e2bb220e2660..59eba91ca0e2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_116.plan index d282d8bc48e3..4df9303d7e0c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_116.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_117.plan index d3cb7b56c34f..9660770ca664 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_118.plan index 93c0be29e71c..f4758d7fc466 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_119.plan index 205c0ec14f3d..b3bdc9d886d1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_12.plan index 100e68ce1ae7..556219a7017e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_120.plan index 6ca1c4a7aaa8..9e95520db301 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_120.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_121.plan index 0f4d60dade93..70c0def804d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_122.plan index 9ca2f30404dd..2a663da17a66 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_122.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_123.plan index 514d684441d3..a7fc25cfeec0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_123.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_124.plan index 100e68ce1ae7..556219a7017e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_124.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_125.plan index d13309846d4c..2dc1b09b597d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_125.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.b > item.c Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_126.plan index 154ded0ecadd..bd23d7d1963b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_126.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_127.plan index 2230e6224450..76bceed9d57a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_127.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_128.plan index 1d7d50c9cf07..d346087b0850 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_128.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_129.plan index ad3bf7b4237a..3b9411b9481b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_129.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.e > item.a And item.e < item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_13.plan index a150af5e22cf..dc5962c24cc7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "e" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_130.plan index 3c63a81960ea..284992f2896b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_130.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.d < 110 Or item.d > 150 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_131.plan index 1917a1f0f3b0..934235914d2b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_131.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_132.plan index 60b1b4f71e26..5cee7819146a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_132.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_133.plan index 063e96ed7548..eacecc397442 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_133.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_134.plan index b69f27775b8b..b115124ff369 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_134.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_135.plan index 051fc49e4eb3..f2fe880b4f2f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_135.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_136.plan index c7d3c47bc8cc..e1c1ede55843 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_136.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_137.plan index 85d222a5fc22..acf7e8b9c105 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_137.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_137.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_138.plan index 2ebb9ff67638..adc643a895de 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_138.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_138.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_139.plan index 48c2d09d9f8f..0a3f606c34d0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_139.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_139.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_14.plan index 88461528eaf3..5ab50e069908 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_140.plan index 61d8807f2fc3..f1fc5d67047d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_140.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_140.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_141.plan index 25d6ab661923..a3d796677591 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_141.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_141.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_142.plan index 30fbbede3d7f..94e2ffae009a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_142.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_142.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_143.plan index a7668922f81d..87d2be948932 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_143.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_143.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.d < 110 Or item.d > 150 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_144.plan index 5fdea45833a5..cf20ca194d7d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_144.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_144.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_145.plan index 2552503a7bca..0ea0119c67ae 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_145.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_145.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.d < 110 Or item.d > 150 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_15.plan index 79af5c0f13b3..c16b0429dd00 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -111,9 +134,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -129,9 +162,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_16.plan index 1a6f37c1b5df..3750b6b78bc1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_17.plan index 2d6c8accc566..104aa5c2e45d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_18.plan index 99e231f6078e..95f806e2648e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_19.plan index 52a0d7539ffc..644765394074 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_2.plan index fb3fa15aaed6..c5d9ab93aa0a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_20.plan index ef942bff8280..a60df09557b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_21.plan index 444409dddf8d..9bc51604d65b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_22.plan index e9163a8abdb6..04eed45c1362 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_23.plan index f01341f946dd..739e11cba73c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_24.plan index d50471cfd6fc..a89a1629c7b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_25.plan index ae43d87b948f..73c26eaabad9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_26.plan index 14af4e0df06a..a2c7dc3eddc0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_27.plan index 298b40c9e5be..865992397771 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_28.plan index 208d50d68b60..386a15417e9a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_29.plan index 6d1fbb597fd7..32d4ff1e2eb9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_3.plan index acd1e50a7b88..42e992670672 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_30.plan index 5e4e7533c375..572bca7803c9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_31.plan index 4aa2429e2c83..4ab56fb87278 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_32.plan index f235a1714dad..bf060eda186e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_33.plan index bdccb0aac92d..54966510aac9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_34.plan index e681cb4effb3..f61c76970b65 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_35.plan index c8a997e40c37..cd4e9f5a26d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c > item.d And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_36.plan index 89ae7e01fda5..1f1e9fed0c14 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_37.plan index d91e47fd4afc..7c8907d17b6b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.c >= item.b - 2 And item.c <= item.d + 2 And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_38.plan index fa0ffd36fcc1..b306d79f5cbe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_39.plan index dd3aa0368310..576379230c3a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_4.plan index b876a1d3468c..fe48663928b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.d < 110 Or item.d > 150 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_40.plan index 767a5a245e97..507b05be8273 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_41.plan index aff79e67d7ff..97dd6fa8f9b5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.e > item.c Or item.e < item.d And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_42.plan index a0d78165f1a5..e60d6dfa020e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_43.plan index e6917109ee76..a6b6d473aeaa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_44.plan index 36496e30039f..fe176542d014 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_45.plan index fc62829574a4..7c68c91cbd91 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_46.plan index 782953848dc2..6736417a64a9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_47.plan index d3a4aef05536..479c0fe224d1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_48.plan index 2136f8f29231..aae86adc0eb3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_49.plan index 085ed0900806..87fa27c0de9c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_5.plan index adfdd0435714..e7a8a68bf3eb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_50.plan index b059ce99cfe5..befde08fa9d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_51.plan index 10e10a8f7ffa..14b92554eeb6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_52.plan index 593ddd72cdab..1027d977a279 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_53.plan index 9b4db5136763..f7671cc22c8c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_54.plan index f83b9ebab0f1..6d6604716279 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_55.plan index 4f57b53f195d..e58435b51455 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_56.plan index fb51350a5f35..29af937c7d2f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_57.plan index 74019dfad8db..2034499216b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_58.plan index b97872fad474..abf7ab4cdf7f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_59.plan index 0e3aeba1b2d3..0b6735b7287d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_6.plan index 62963c09da74..cabc299f6c34 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d < 110 Or item.d > 150 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_60.plan index 9704ff51f09e..e97459f4274d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_61.plan index 78968663dbfc..3ec0bcc8871d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_62.plan index 194b4fb9a52c..015739bf20b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_63.plan index 8b2049980176..c4d08023b570 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_64.plan index 434135e43662..66dd2ef1c5fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_65.plan index 1fbf2cf4d3c0..9ff968641ee8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_66.plan index da39773983de..bc684a0a516b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c > item.d And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_67.plan index c16b45a7275e..0027dd1d6ad0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_68.plan index e7c5ee02a3b2..64363f4253f1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_69.plan index 456f0477efd0..526b3185b1e5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_7.plan index 1ef2f7815af2..f149b2ff3ad2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_70.plan index b420f0fe674a..06a627aeaf8c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_71.plan index 9729802987f1..ae56d3237427 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.a > item.b - 2 And item.a < item.b + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_72.plan index 83b79703b4b2..f27bce991ec1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_73.plan index 1c420a7cce34..f3d82860e795 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_74.plan index 30103307fb83..7527c31625d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_75.plan index 07ac372bb948..e05c0e6f234f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_76.plan index 8a867f3ae9ca..f7e65c028b12 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_77.plan index e4670fc16137..cb77977329a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_78.plan index 86db777a3a0c..17e9e7e4db56 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_79.plan index 5c529fab2c49..ca7d2faa72df 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_8.plan index 5a7aa8d716c8..8b09b2971d3c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_80.plan index bcf84a3052e1..79dd918fbcaa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_81.plan index e640f469f8ae..e8d5785bc5d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_82.plan index d603dd688b6d..09afe0040d5e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_83.plan index 3a1778e5cc6c..f4caec34e625 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -83,6 +110,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -112,9 +140,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -130,9 +168,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_84.plan index b6a036641c7e..fe15250395ad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_85.plan index 12309b463c98..8c40df443e75 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_86.plan index 508b8a262a9e..91cfae4d5ab7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_87.plan index bda5441abd58..7fab6de10072 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_88.plan index a03506d98ee6..2edd7e5a6eaf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_89.plan index 5a263e572294..29d1fdb6d915 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_9.plan index fbb1b2325c20..470c1c6f181f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_90.plan index dae41f916ba2..611dacb6ffad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e > item.a And item.e < item.b Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_91.plan index 255cabca4ca5..32e76df4edcb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_92.plan index 45dbfee784c1..8ffcfcae96ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_93.plan index 94e204973004..1863fde09e1b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_94.plan index e790d2951c70..78b0f5793a8d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_95.plan index ea63ccd04c36..efd1010a1f27 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_96.plan index f01341f946dd..739e11cba73c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_97.plan index 6741732f6d30..b43cffa05a44 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -110,9 +133,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -128,9 +161,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_98.plan index ebc1d126c159..b0e2f41ed46f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_99.plan index f3550fd06df5..707c22fc52d1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_1.plan index 56d7d9d63b0f..92d4bb8d8cf1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_10.plan index 67fd2c3dc105..18b58c100629 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_100.plan index e6df5a46af5b..fc109d26888d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_101.plan index 3e18680b68af..a32c203b3e9a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_102.plan index 2cafd9005b5d..f9ac45649f13 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_103.plan index d7877d37097a..f5d101d60020 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_104.plan index 56085426d6f9..7b0899fdbde8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_105.plan index 992013b6b277..93b3c9bd9831 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.c Or item.e < item.d And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_106.plan index 6c70b9811e69..0ceb399660d2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.c Or item.e < item.d Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_107.plan index b794474f0c3f..7ed9a3d0e30f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_108.plan index d99564f9d2b3..0e57b6a0a2d1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_109.plan index 274e1efcb178..d3e18a6f3a17 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_109.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_11.plan index 4b83c51e7087..3c451ef3d26b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_110.plan index 48df4bc5e6c9..14d9e4491262 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -110,9 +133,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -128,9 +161,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_111.plan index e3a2a973408a..055736db6253 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.c > item.d Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_112.plan index 2edb26da61aa..e1f59f7a3088 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_113.plan index e25f0f0cd406..81470217f1cd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_114.plan index 8c1d1d5b2a41..7ce651907ca9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.e > item.c Or item.e < item.d Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_115.plan index 6e17296f10d7..89fbaeea989f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_116.plan index 80c5ffabd148..3d59a7e4d3d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_116.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_117.plan index f4984b903d1a..81be8863abb3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_118.plan index d26dd64d74eb..b934b1b8eda8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_119.plan index afa970cc5367..33a4e7e1c522 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_12.plan index 2e245a7ec096..2eab76204982 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_120.plan index 85b731d3380c..a18325748b39 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_120.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_121.plan index 4f33a7c8ed79..6a8a9f0784f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_122.plan index 4deaaf0a3856..6a704639094c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_122.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.a > item.b Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_123.plan index 180a991bfd53..b710b9a37052 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_123.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_124.plan index 8d7940b34f72..fd881af19398 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_124.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_125.plan index 6139ae0ed03c..a0e7d40536fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_125.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.d < 110 Or item.d > 150 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_126.plan index c78cb8d06614..6a5aff1c9860 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_126.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.d > item.e Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_127.plan index c26917f31aa5..74f8f67b1496 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_127.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_128.plan index c9ab38e636cc..88f857f11f61 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_128.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -83,6 +110,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -112,9 +140,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -130,9 +168,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_129.plan index 2da37580c970..f08173d0efdd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_129.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.a > item.b - 2 And item.a < item.b + 2 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_13.plan index 3bd191c4e16f..f2dee49da788 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_130.plan index 6e17296f10d7..89fbaeea989f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_130.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_131.plan index 0071d461b9eb..586f5ea8d502 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_131.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_132.plan index 38fa5ea399a0..bdf53dc055a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_132.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_133.plan index c032a35cb461..a0820dbdee3f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_133.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_134.plan index 9824fb1d49c1..552341d3e49c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_134.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_135.plan index d022d22ba1e4..2951a71fd84d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_135.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_136.plan index 5b89bd9bb995..0450eca9a4b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_136.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_137.plan index dee1be49162b..2df851141ac9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_137.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_137.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_138.plan index 70255e8e13aa..d3703bc9edd0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_138.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_138.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_139.plan index 60041e994dbf..c4ed6d55f873 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_139.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_139.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_14.plan index 9956148a3c52..e75d86c43193 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_140.plan index be9118ea0857..bf61adeed30e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_140.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_140.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_141.plan index 3b04d300786d..55df8aaa6b21 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_141.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_141.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_15.plan index 544fee5182e4..5a02c99b399a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_16.plan index 0be0f0f34f18..b40b2a6c5342 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_17.plan index 6e19f23cd422..4679ebdc1238 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_18.plan index f4984b903d1a..81be8863abb3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_19.plan index 4ae432a2a2e0..d79492d27f81 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_2.plan index 8c558994c034..f4fa75c3b460 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_20.plan index 9768c5c2264c..985d53d6ff0c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_21.plan index 721d71088f8a..e499f3da04b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_22.plan index f4984b903d1a..81be8863abb3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_23.plan index 5b307820c54e..a18b0d64ae63 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_24.plan index 2e245a7ec096..2eab76204982 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_25.plan index 83216c8b8c11..565cd4da12e0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_26.plan index 93a19c69891c..7e0674d1a3be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c > item.d And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_27.plan index 94066e0e6a43..a0939956ec1c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_28.plan index 1f6c3070ca47..048aedaa79b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c > item.d And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_29.plan index d0815e6a757d..95bc06ba23ae 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_3.plan index 0099bd552733..67b10f2f65d2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_30.plan index 70255e8e13aa..d3703bc9edd0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_31.plan index d09582d1995f..3596d55b2b44 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_32.plan index efb1d20151bb..4105a7332e64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_33.plan index 02150ea59002..93e432a5a01e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_34.plan index a5c50daca51e..cd6394d47727 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_35.plan index 6cc0cf1e4a2e..ff0b06fb2c38 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_36.plan index 0a2b4ce31c08..fa8a28c09ea0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_37.plan index 6fedf3629424..bf6229e5df8d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_38.plan index 315138e1c8f8..7fb0fabc64c5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_39.plan index ce29743370e9..1627c7c4777c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d > item.e Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_4.plan index ce5c84d0e25e..64f0ada4a3fd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_40.plan index 2e0899d3b5b7..2e4810d3f4dc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_41.plan index 70143df9ce60..ff83df89d2f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_42.plan index 4cfa3e79d22c..4ec9ee64d7e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_43.plan index b7dfff8f83c5..fe5ddd3b154c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_44.plan index b78c5290a329..d9e43ef11dba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c > item.d Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_45.plan index a7f557c58178..e3301fa39906 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_46.plan index 94f46342d69a..ece9d2a1ccca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_47.plan index 33282cbb7330..fb440944479b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_48.plan index 70255e8e13aa..d3703bc9edd0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_49.plan index dfdff821fe1b..f2293506b83d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c > item.d Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_5.plan index e9fdd4b63bce..16491d7ab358 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_50.plan index 2b16eab31c8d..2d15ba3c1106 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_51.plan index dac0024965e6..846d435133c6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_52.plan index b5c0b651c65c..4b8391339607 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_53.plan index c28a62303c45..2447449abd2a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_54.plan index 56d1210b64dc..591ecf717a95 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_55.plan index b16a5f438085..1d85e6dfca34 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_56.plan index af23c9c49679..8529f3597de0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_57.plan index 334880eded78..8a519d3bd372 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_58.plan index a7f557c58178..e3301fa39906 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_59.plan index 88de76ec3d65..b683705175f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e > item.a And item.e < item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_6.plan index f03074335d3f..e4eaa5695235 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_60.plan index bcdee7f154de..f64e47aaceba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_61.plan index 4b83c51e7087..3c451ef3d26b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_62.plan index f808059107f6..ebf4dfa7b72d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_63.plan index 8fa1a9ae8431..746551d83fb9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_64.plan index caed02414584..18f2b1f4a88d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_65.plan index 5a46ea3e4561..65260a0b377c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_66.plan index 429e7f28ee71..cf038bae10d1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_67.plan index d6faf927f24e..e35b81818cef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_68.plan index 53df2550d473..148812aed22e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_69.plan index 2b08c6331286..fdbf1777c91b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_7.plan index cce4aaa1abcb..da7693476931 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_70.plan index 815658aafca8..11c83a529473 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_71.plan index 338d251cf9b9..3ca049d252be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_72.plan index e3e57100dd23..80e5b3683db7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_73.plan index 0f6bded0fc9c..4f070c4c2448 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_74.plan index 1e026291bb68..755f586ae077 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_75.plan index f0c9aed1b80e..bf23bc755697 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_76.plan index ec6a166ef01e..8d7ed8aec249 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_77.plan index dac0024965e6..846d435133c6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_78.plan index 27dd899a99dc..4848fb918671 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_79.plan index fa2d9527bbc0..2f310f0bb8df 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_8.plan index cb5ab08effaa..58194c413cb7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_80.plan index 2b4909303208..6b61e371c573 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_81.plan index efb1d20151bb..4105a7332e64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_82.plan index 581a64446c0b..9d78aaee7320 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_83.plan index 8e4a40a798ae..eea14f6d29a5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_84.plan index 3c95ca8747a7..94b0ef54af24 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_85.plan index af8819c2e6d4..f98d9cb76e8e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_86.plan index e6b693b46ee4..900079adb8fe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.a > item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_87.plan index 35c6f82915f5..d50ded8d4341 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.d > item.e And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_88.plan index bcc73c49ef42..463276b86a4a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_89.plan index 5a429e49e912..ce3e3d6d95ce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_9.plan index bf9ac79d43ac..c6041d4b923f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_90.plan index 70255e8e13aa..d3703bc9edd0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_91.plan index 217a3a35801f..e62b3114a30f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_92.plan index 776ee303f8bc..7033b413e6c1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.d < 110 Or item.d > 150 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_93.plan index 06399022c39b..d790fc08db33 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_94.plan index 1b9799db00c5..eb6b9ab0899c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_95.plan index a47f2cfbbfdc..a4190c66bd8d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_96.plan index 584661459a83..bab24f2eaca5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_97.plan index 62a013a5f415..3deb8a142a51 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_98.plan index 7faf9a5c64f6..237dc2bc8214 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_99.plan index a587dbd01267..8d39247ca891 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_1.plan index b5e9efef2a63..5e4b6b2f9d63 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_10.plan index 2bd329a4d4ea..88a6bf988595 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_100.plan index eba60f6e3e97..bc4ca57da3b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_101.plan index aee23a513947..7246340c6dbe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_102.plan index 6fa39372c844..8bb47287c3bb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_103.plan index 21d94a0c3ea1..4a400d63aa81 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_104.plan index 62b9fba6c6d9..cb19bc0242b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_105.plan index 219fbb9de447..3ed103babcbb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_106.plan index 1076445e6142..77ec4ecc2ab2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d < 110 Or item.d > 150 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_107.plan index aec97e402ff7..77cd99753c48 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_108.plan index 521b13443e4a..b6243e7f9e5c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_109.plan index 15d608a5f502..b073eade298d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_109.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_11.plan index cf5aaad186e0..78360c305181 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_110.plan index 6212789be093..81b33ccd160e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_111.plan index 7f0e305b86a7..fd8e11886893 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_112.plan index 1457eb5f73f7..d17bceeea7f6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_113.plan index 6da03bc6e611..8efb1508ddab 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_114.plan index 2274748b201b..32a29ea83ab9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d > item.e And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_115.plan index c9e363cc9fd4..e09e17c63752 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_116.plan index b942ced52db4..77418a17132e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_116.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c > item.d And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_117.plan index fa45559793b1..7c777b092fdb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_118.plan index 3cd194161507..4ced41c5cad4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_119.plan index fa97eb9a620a..b299d5ba4129 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_12.plan index a0369adb45a5..bb2edfc6a019 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -112,9 +135,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -130,9 +163,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_120.plan index d0cdd7300f97..71f9d7943c70 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_120.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_121.plan index 5037f1b80c90..a87af13e086c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_122.plan index 28a37cf4430e..d1e3ca82a9f2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_122.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_123.plan index 6119b19a934e..5123ecf74fdf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_123.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_124.plan index 62c78d671207..fb2e9b2a693b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_124.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_125.plan index 7713145d9bb3..f93e0d548f73 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_125.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_126.plan index bb2ef64d7ec1..2a7a519486e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_126.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_127.plan index d67c86f0e6e6..ceb3daa92bef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_127.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_128.plan index 57e77dce8cce..1e5e23a15da1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_128.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_129.plan index 51dbb83a8c63..29622f1d35a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_129.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_13.plan index 6c7568231e11..93f9237b440d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_130.plan index 670801d4ff9c..16afd80548c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_130.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_131.plan index a40636438c18..fe5cac8d0e8c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_131.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_132.plan index ba88caf09ce8..f50c6b46a5fd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_132.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_133.plan index 90c2dee2e61d..da8915e3343a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_133.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_134.plan index 698a77b911af..a5969f3517ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_134.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_135.plan index 44e989abac05..0a9e5a228116 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_135.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_136.plan index 385680860697..84d353571b0a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_136.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_14.plan index 834e49cd66c9..da6bcd0982c6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_15.plan index 14c9fd2eefec..5c0560a8c3d0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_16.plan index cd431209a5b1..6f64093143e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d > item.e And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_17.plan index 61344e0c84af..06ed0bfa572c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_18.plan index 3ddf9f8dcec4..ebec17ea57f1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_19.plan index 19b35cdeb4b7..c926646b5d3e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.b > item.c And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_2.plan index 90c238921d18..693d7b919743 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_20.plan index b43b88ee63cc..f91257c5e89a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_21.plan index 28afa7e9c749..3476606b8180 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.e > item.c Or item.e < item.d Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_22.plan index 014a5e8af8bd..45602785890f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_23.plan index 4cf8c0d0ddd2..4ebd96d28f59 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_24.plan index 6ecdc00a4288..ba614c433322 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -111,9 +134,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -129,9 +162,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_25.plan index 1b4d6ff71c99..88893a4095d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_26.plan index b5e9efef2a63..5e4b6b2f9d63 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_27.plan index b82ad8ef7730..36832410ca32 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_28.plan index 2bc842293799..ad8404d8484b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_29.plan index 3fd3a6de9fb4..61c8a2a0cc3b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e > item.a And item.e < item.b Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_3.plan index a8d822b75ebd..78b3d1a3ed2d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_30.plan index b5e9efef2a63..5e4b6b2f9d63 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_31.plan index 1a2e9177341f..4d08b61981b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_32.plan index e116b0acd3cc..fe110c05837f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_33.plan index 591d76d19121..896f42f5c832 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_34.plan index 266faebcc932..2e421496bd1c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_35.plan index 1170f73a2b32..1e420009d5c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_36.plan index a35ffc64fd3c..1d918be49101 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_37.plan index 0b3a2f018b8a..f1df6e88226a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_38.plan index 349a8a5b63b0..fe47590f4c7e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_39.plan index c19b3faf4550..df7d9f6d8e8c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_4.plan index 66042f9dce21..a850a7a71084 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_40.plan index 7e500d3a2a80..73f28c6b41e8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_41.plan index f02e83d93ec7..ca32c7c1a297 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c > item.d Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_42.plan index 693a4ac042fc..c1611967a8a1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_43.plan index 3b1ef1328033..53ded1efac44 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_44.plan index e916a9b484f9..fe63e5dab708 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_45.plan index e0b047d8d2c6..cfd291e48192 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_46.plan index 3c3f661ea2ce..d83975c3a439 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_47.plan index b5646150cd78..52b506776af3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_48.plan index a38ae6ae324a..042a0be515b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_49.plan index cd3fd7855d1c..2bd3b2247065 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_5.plan index d958b661b031..8a8d55e5d7f8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -112,9 +135,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -130,9 +163,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_50.plan index d5efd23ff491..adf8d7709e6f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_51.plan index fefa81fe8b84..20bf20cfbf89 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_52.plan index 20e42ad6462d..8ca7412f30a5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_53.plan index 1aef7b7e890f..f59649ed1445 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.b > item.c And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_54.plan index 177968e880d0..1f03f38eb27c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_55.plan index aa45049cefd5..09a18b125bda 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.d > item.e Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_56.plan index 2f9e06a36777..37dabc70798d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_57.plan index fefa81fe8b84..20bf20cfbf89 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_58.plan index 6cd50c5ee9db..64cb9c23efb7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_59.plan index cb817c86b36d..cee90e26fad5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_6.plan index 9bf4b2cdc666..4151ef127467 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_60.plan index 60b1ed7dfb69..ee035557c341 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_61.plan index 93daceb06dd8..abb26271bae4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_62.plan index b888b9b7a4a2..ad6b2cbcc70a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_63.plan index 14f30eb5156d..dc365aa8f093 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_64.plan index 1fea19620d87..f73d3dd39483 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_65.plan index 320b0d13eb58..837d6813b5bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_66.plan index c3b6278e0f95..524777dfe986 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_67.plan index 370901d3e6d0..b6643bfea1bd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_68.plan index b00a85257fa7..b27e021310df 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_69.plan index 7e119075e775..048403f7c187 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.c > item.d And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_7.plan index d1866c3d7f78..62d13f5aa031 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_70.plan index db43429efa46..db641ce804ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_71.plan index 80bcc7528a03..bbeef74b3227 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_72.plan index 6c7d3ce68667..2edb83faf4e9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_73.plan index 562e5066b3c6..f7fa874762d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_74.plan index 23017764687f..a4611a2df5fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_75.plan index 3c8da3d76fcb..fcf3a6252b06 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_76.plan index 348e372d78a4..e1c3cb44f10b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b - 2 And item.a < item.b + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_77.plan index 4c2740b1c55a..babc01febbda 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_78.plan index 1bb0f2169471..6b2cdf310fac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d > item.e And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_79.plan index b8045483f24e..fb48d89dd029 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_8.plan index 1929dcaeceeb..ca428a3cc1ef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_80.plan index 60bac0245891..fecff4da9160 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.b > item.c Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_81.plan index 04e1a43d825f..ece48a3dfcc7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_82.plan index 2d97e26edddf..0a9ffba95fb9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_83.plan index c3d87cd1fe3a..16e702816236 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_84.plan index 7e54a5b602bb..989a02361fb9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_85.plan index 29fcf273913a..161da95dc6d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_86.plan index 556ee5fe91a9..9f7a63e1f13d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_87.plan index 6cb121937b4b..2f75032849bd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_88.plan index 895c8e6e331c..4f496334bac1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_89.plan index 4423405539eb..96edaa4545b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_9.plan index f34b61ddac90..b65673f2b27e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.b > item.c Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_90.plan index cb6f2682d594..b603ed998e60 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_91.plan index cc70089952e2..d8ef28b761aa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_92.plan index ac87a7881068..b1944341ca8d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_93.plan index 2edb51f64690..9ee77b4b83fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_94.plan index 3a3208e0b12b..6ffad4f8c68a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_95.plan index 419bef2b92e0..c28043385447 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_96.plan index 4696c83576b3..578295bca5a4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_97.plan index 3d45383adf90..3fae7df19878 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_98.plan index 998ad865eb6a..dbe603763faa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_99.plan index ba88caf09ce8..f50c6b46a5fd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_1.plan index 0945933ca42b..0e3507aca555 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.d > item.e Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_10.plan index c72535c3c252..991b87b524ea 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_11.plan index 6ce0f2279261..b5b61efdc0ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_12.plan index b3e70cb2e77d..ef25bfe8f90d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_13.plan index 6626f5924e76..0162feec25d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.c Or item.e < item.d And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_14.plan index cdf3d997db77..1ae6c9859004 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_15.plan index 36c9c3a7d10c..4064a46ba1e8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_16.plan index cc00f303ad6c..6fb12203b92c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_17.plan index f41066e22432..8d5a88aa86f4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_18.plan index b49f0bac5432..85bb3c3162b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_19.plan index 9bdb36318c83..f99ec366e922 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_2.plan index d10c92696b05..bc2afa09456d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_20.plan index c209e22589f5..1a88a368a783 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_21.plan index 063aac8a3ab3..b9382a6588dd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_22.plan index 1f9f4aa8dab9..43b4227c275a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_23.plan index ddbbdf8c5715..a6a51020b5b8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_24.plan index 50571ff6e6ac..4a3425a36b1e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_25.plan index 5388a0e23814..c335d03631b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_26.plan index 92ea12e0990f..930a48819ea7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_27.plan index ba0290108aac..22a40744af4a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_28.plan index ded9c2706516..becdcba87b63 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_29.plan index 2c4d9db53353..b81804a5359b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_3.plan index e9e12744eeef..8a520771a748 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_30.plan index db051b864628..02af856f6073 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_31.plan index 25b2ebf2e019..1cd24189d359 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_32.plan index dd3a95daf66c..70f24d8ebf2e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_33.plan index 34da536a885e..40287a06c383 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_34.plan index 8e63f0ad390c..31c9c3e4fee5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_35.plan index da0d385c3c6d..ccdfe8836bdb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_36.plan index 10d4e751e938..703a30d84061 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_37.plan index 4a5a2f050a24..ee266bdb0744 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_38.plan index 5a52418246ae..1b461b65cd2e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_39.plan index 414d80113cbd..b8b8bc596c74 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_4.plan index 496ff669c63f..e9b572741278 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_5.plan index 017ce3eace17..4da09a330435 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_6.plan index 75a7e4f60ef5..3185f22fdf85 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.d < 110 Or item.d > 150 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_7.plan index c7d9532d7ae2..b094be7909cc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_8.plan index c7cf1b81028f..19dd4df4b5c2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_9.plan index 414d80113cbd..b8b8bc596c74 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_1.plan index c7cbb43d661d..a59dd4670ebc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -108,9 +131,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -126,9 +159,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_10.plan index b03bc6962ae7..359c25c953a2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_100.plan index 023b6f4a047e..b94c98d26fb5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or Not Exist(item.a)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_101.plan index d393d3ea8b87..b098b0cf2a84 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b Or Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_102.plan index b02f1352da59..7bbcc71a9e15 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_103.plan index f5118d2e2273..0cb145b00f0b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_104.plan index 9d6a24d34c9e..0f52cfbcd7e9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_105.plan index 530e3639c5cc..9e0f8321789c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or Exist(item.b) Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_106.plan index 5fed7d3db348..f6642b0131c2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_107.plan index c7cbb43d661d..a59dd4670ebc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -108,9 +131,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -126,9 +159,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_108.plan index 8bc8c7d776d9..19cf1de71601 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_109.plan index d950146a7530..e90a5238eca1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_109.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or Not Exist(item.a) Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_11.plan index 4c562d29a60f..b72b4fb21b10 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_110.plan index 733bb76dae00..5abed998d447 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_111.plan index 5f41b71653c0..84cbf96b6cb4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a != 0 Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_112.plan index e494a6c9bb2b..2b37fd68ddfa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_113.plan index f52ee9ee93c3..7a18b2926171 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) Or item.e > item.c Or item.e < item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_114.plan index 95a6bba7e471..9fece8219700 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_115.plan index 4d4bedb91053..ba244f3cf190 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_116.plan index 87e65fdbe864..4a58a9ae172a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_116.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_117.plan index fab51c32eeea..e46ef389112f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_118.plan index f2287a69cfee..744cf429d20a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_119.plan index b4333d11ce4d..85a9eafc583f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or Not Exist(item.a)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_12.plan index 5a3d6a810b40..c6b412bb96fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a != 0 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_120.plan index e5e5cdd2b361..1cf40217c539 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_120.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_121.plan index 1c3c1609daf6..36cd74125608 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_122.plan index 43049bf77ba2..55662b35f4c4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_122.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -112,9 +135,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -130,9 +163,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_123.plan index 8013283dd9f2..16acbf785f2c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_123.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_124.plan index 6a28506c12ef..9fd162618c70 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_124.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 8150d020f0f1..275a73aefa11 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Limit": "1001", "Name": "Limit" } @@ -29,21 +34,32 @@ "Operators": [ { "Inputs": [ - 1, - 3 + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 3 + } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", @@ -90,9 +106,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -108,9 +134,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_126.plan index ca9dbb8c3ef1..e4233fed69b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_126.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_127.plan index 0a196aba6198..a77ab67473b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_127.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_128.plan index 63e8ec2db784..be0cc7e3ee3f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_128.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_129.plan index b0bcfe667585..89d7bed1d9f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_129.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b And item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_13.plan index 3b14ecd580ae..6e397e476e7a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_130.plan index d09bba0cc377..a55038fa6525 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_130.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_131.plan index 1c2439878dc1..93c84f294c3a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_131.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_132.plan index 29fd3d09b1c6..d405d1acd8a7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_132.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_133.plan index e5cc0c073207..52aca82b4d4d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_133.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_134.plan index c05efb1e214b..4c24980b9ad2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_134.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_135.plan index 45cb92cd7cad..8e3b0c5be31f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_135.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_136.plan index f4154113fdb6..23fa52354790 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_136.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_137.plan index e2854206e0b3..fd79c8aa8097 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_137.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_137.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_14.plan index 38123be5570f..fe4af9b272f0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 f50c4ad242d0..7477d0452524 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Limit": "1001", "Name": "Limit" } @@ -29,21 +34,32 @@ "Operators": [ { "Inputs": [ - 1, - 3 + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 3 + } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", @@ -92,9 +108,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -110,9 +136,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_16.plan index 5656b1363213..fd5949847919 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_17.plan index b6ef34acbedb..dc3ba8420560 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_18.plan index 7984b020309e..8a5f03005c9e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) Or item.a != 0 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_19.plan index 2181016d4d53..a48ef3ae7a5d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_2.plan index c590ea1e8dd7..255fa5cb46ca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_20.plan index 14a5d873c919..609e0c7e5544 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_21.plan index 2e3fd35112d3..f12411c5d511 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_22.plan index 69d61ab8520d..b9f98117aa9f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_23.plan index f35b35f1960e..dd9c70e35f38 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_24.plan index 0a196aba6198..a77ab67473b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 8ffa5aef4610..9d2f218a429f 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Limit": "1001", "Name": "Limit" } @@ -29,21 +34,32 @@ "Operators": [ { "Inputs": [ - 1, - 3 + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 3 + } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", @@ -90,9 +106,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -108,9 +134,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_26.plan index 001d97ba0403..82ef482a3bcf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_27.plan index 6d5f0057315a..01af99f8b7ad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_28.plan index 5d3260b050d4..a37b54060a2e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_29.plan index 72b3de947021..9b66655e54bd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c > item.d Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_3.plan index 80aee72df08f..76b7e79f3f1f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 c2ad7c20c401..721407af8326 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_31.plan index 3982108d71a0..c0ea64a4a7be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_32.plan index 327b6f972c47..c3e8e46ef021 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_33.plan index fc447e71a5f7..26ca8df0366f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_34.plan index 985e63e26239..9df6d4469581 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_35.plan index 70d0d8f3f26e..640f7833cf92 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "e" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_36.plan index eac5b31c266d..4945688ecbdb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_37.plan index 535b23d7d095..140d90b82d51 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And Exist(item.b) And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_38.plan index 1101a2e81702..3ff96ad9a512 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_39.plan index 37bf8e5bae52..fc16d1ab465f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_4.plan index 8ddb5664cbf0..70f855bb9332 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_40.plan index c6faed8223b2..b3c719d91758 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_41.plan index d777f4f909b0..b1e59cac5c4a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 7b0565ecd9ff..136ee1c2b299 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_43.plan index 3ffda3dc6ec6..a1d4500ac075 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.e > item.a And item.e < item.b Or Not Exist(item.a)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_44.plan index afec26d48973..d3d30f4b7d5f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_45.plan index 54f15fe9d66f..d5183c5fffaa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_46.plan index 58a3cfaf1265..2c9cca6f4d30 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_47.plan index 646d109a7f9a..407807d0ef79 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_48.plan index 6932e4c77636..079240d44ed5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_49.plan index 869d24a868a7..2c12fca9c49f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_5.plan index 38dc6eb3c945..7f5764b74a31 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And Exist(item.b) And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_50.plan index 4f1c9e764e5e..5c109babb208 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_51.plan index 6408ef380670..6841cbdff595 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_52.plan index e8bfbe7bf5ff..c2e6fa404486 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_53.plan index de3ff4705c69..bac36537651f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_54.plan index 39caadd122fb..0841e7e89213 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_55.plan index 1c2439878dc1..93c84f294c3a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_56.plan index 39d360a0906f..a875229dcf8f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", 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 bd48a6cbe3ed..b03658b46f54 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_58.plan index 489bff65b56b..8d62bc548b91 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_59.plan index 78aabd5b1378..d97c8af1bc7b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_6.plan index 6c3eb6cf0967..d5af29857f61 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_60.plan index f2f68719df67..5119869535ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_61.plan index 18068a0a7428..53274a4fcab4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e > item.c Or item.e < item.d Or Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_62.plan index a9ec55cbcd14..57e516bfa214 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_63.plan index f3ae6a0533fe..0e22145cb405 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_64.plan index dde602a7f2e0..c2f1223f9d9e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_65.plan index 76738a29d018..74034cfc206e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_66.plan index f9d77c966de6..4de4f97fd628 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_67.plan index 61b4bd91b03f..03015eeea623 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_68.plan index fdd24f1ef28a..1a71f9b75d8b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or Not Exist(item.a)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_69.plan index 7a6170d34d1e..97fe2a0e3b22 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_7.plan index 52ae05340818..e4faabe494e2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 Or item.b > item.c Or Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_70.plan index 1c810e48d722..cd2632274a24 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_71.plan index 76bcf643da53..ac944a8b1f62 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_72.plan index 22b73395c047..8a0f263d3ffa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b - 2 And item.a < item.b + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_73.plan index 1db966c0adb5..20ebdefdd124 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 45086110c855..f5bc0d60cb7f 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", 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 32fc84f13285..d0905505010e 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Limit": "1001", "Name": "Limit" } @@ -29,21 +34,32 @@ "Operators": [ { "Inputs": [ - 1, - 3 + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 3 + } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", @@ -90,9 +106,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -108,9 +134,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_76.plan index 92dd3c143a7a..af0fdb3bc803 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_77.plan index 30f7532d6db9..17e639c82e4e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 e987d21926fe..f54c1c3f4cd8 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_79.plan index 6661b246f190..c28b794a4ced 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_8.plan index 884f22f337be..814a475fc297 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_80.plan index de81b245d69b..5edcf28c183b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_81.plan index e5954af5f475..98be9cefd1e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.e > item.c Or item.e < item.d And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_82.plan index f8ada204fc9c..0c838793afd1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And item.d > item.e And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_83.plan index dfab66cb3863..f50c54f7e6aa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_84.plan index 348ad7f05f54..9e5b4921ffc0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_85.plan index 1d95e65b0cb0..34e3b0cee760 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_86.plan index 5bb585c38f8f..9fa5651ca0e5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And Exist(item.b) And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_87.plan index 0f39b69dc5cc..b6b09e385b46 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And Exist(item.b) And item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_88.plan index 6eae55a9ca17..fe073632b917 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_89.plan index bf4fa02d938c..eea70a388f24 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_9.plan index 1e510df10626..f8387565c417 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 Or item.b > item.c Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_90.plan index 91425465cd2a..cc08aeaab91f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_91.plan index 1eef2f3268ad..495b1ae91999 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_92.plan index 99bb0dec0581..08a0d01710d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_93.plan index 24d6a7284fa2..08bd6bf77163 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_94.plan index ad86771603d6..863ea373f57b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_95.plan index 327b6f972c47..c3e8e46ef021 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_96.plan index 6c5a9ed4640d..3eb9dfd834eb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_97.plan index 33b4f1eaafcd..c5ae9273ffc7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.b > item.c Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_98.plan index 21db986d06a4..25bf4436a89c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_99.plan index 2aef43e5062a..f7d1673c2095 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_1.plan index 2b8df8f4d927..4051488b737a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d < 110 Or item.d > 150 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_10.plan index 2dd6f864189d..421bb1754bbc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_100.plan index ad0ad148232f..e7dbf9289402 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_101.plan index 194719d3c1c3..3180d2d7f98a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_102.plan index 04964ec3e737..ac4131bf52e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_103.plan index fbee5a320df4..7679a99933f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_104.plan index 1f371a2c1bab..da6741b9cd2d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_105.plan index 5869e3836799..2f7cc79fe16c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c >= item.b - 2 And item.c <= item.d + 2 And Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_106.plan index 0da829aadd70..d4c9fb7271cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_107.plan index 24694a031f9d..1bce015ca02c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_108.plan index 5b992a2b9c97..a7e727fa08ec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_109.plan index 1c886c9e0a86..f81be570cd30 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_109.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_11.plan index 18ed2b02bdd0..ef7d189a91b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_110.plan index f6856a8b3e79..f7a3c28f71f0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_111.plan index f8114b526412..031a90bc2c3f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_112.plan index f4275f2b4ac7..8b87c33669b4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_113.plan index 87bbf5cfbc48..e12a0377adf1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_114.plan index 00d305e15eeb..57ed56629054 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_115.plan index 4d313171c14b..b90c35d25763 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_116.plan index fae54f58b358..49235cf5ec60 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_116.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_117.plan index 81066b18d781..d231e8f46bf1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_118.plan index a1b340d9d572..457d8022cb28 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_119.plan index 8e4a7ec36b31..a29bab3487f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_12.plan index 95d7da44d409..144c9be43bfd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_120.plan index f6acaecffdfa..6149bfb38579 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_120.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_121.plan index 6d95546956c2..939804bf5b47 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_122.plan index cc2ee409b016..b44ac350a593 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_122.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_123.plan index fae54f58b358..49235cf5ec60 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_123.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 a92e2d5c4ce9..670e7c68a25d 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_125.plan index c52fc360e19b..53e75bb205c5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_125.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_126.plan index c589dc7e5a80..c54d1e2fd3da 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_126.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_127.plan index f8ac33f8d19f..2b36b4695394 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_127.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And Exist(item.b) And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_128.plan index 45dc5014a76b..3d42290ba416 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_128.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) And item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_129.plan index a241c3e69ea4..5a7632c25d3b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_129.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_13.plan index 14fba6947a3a..21ad2bd24b53 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.d > item.e Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_130.plan index 129936fa8220..ea9d78ca6cc2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_130.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_131.plan index afd2c37047c4..197faed1bb83 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_131.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_132.plan index 08bbd34ffe94..e9a97b0cfb59 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_132.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_133.plan index 6602f7811367..4a9f301f16bb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_133.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 aa99e6e3eb74..3add2764f980 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_135.plan index 84825d31d449..e4cc78535e88 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_135.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_136.plan index 1967a969a634..515580fb10bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_136.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 Or item.e > item.c Or item.e < item.d Or Not Exist(item.a)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_137.plan index 9cf95b0d58b4..77214f54267f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_137.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_137.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -111,9 +134,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -129,9 +162,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_138.plan index c7378c5a997a..a0c87cb77e67 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_138.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_138.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_139.plan index 4a38de83c8ca..8febc3313175 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_139.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_139.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.d < 110 Or item.d > 150 And item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_14.plan index 56e7d54b7852..b25b6a94ac18 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_140.plan index 6ff9fa8ec433..213ac2d5e823 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_140.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_140.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_141.plan index 3ef262b527e9..315af780f02b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_141.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_141.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_142.plan index 68425a7d1f7a..6b4129dd4fbb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_142.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_142.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And item.e > item.a And item.e < item.b And Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_143.plan index 295a6a999036..db80c6686134 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_143.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_143.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_144.plan index 0f2bd8db25fc..297e264d3a08 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_144.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_144.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) And item.c > item.d And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_145.plan index a4e954ec2934..bd186dafc8a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_145.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_145.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_146.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_146.plan index bb5d017e3a95..717fbc88f5fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_146.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_146.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_147.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_147.plan index cc74536c7ff8..f870da8736ef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_147.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_147.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d < 110 Or item.d > 150 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_148.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_148.plan index c589dc7e5a80..c54d1e2fd3da 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_148.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_148.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_149.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_149.plan index f9b5acf509f7..b8a678d08a82 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_149.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_149.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Not Exist(item.a) Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_15.plan index 0735da126eba..58d26f173f47 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_150.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_150.plan index 85f3602be001..bef872a3f354 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_150.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_150.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_151.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_151.plan index 7ce2cb774e22..0f2c5f4432e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_151.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_151.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_152.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_152.plan index b105575f75a2..ffada9b345ec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_152.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_152.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_153.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_153.plan index fae54f58b358..49235cf5ec60 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_153.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_153.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_154.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_154.plan index 867b9fee9914..25bae8988769 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_154.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_154.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_155.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_155.plan index 52fbe23e5063..e86124463f50 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_155.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_155.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_156.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_156.plan index 35b94f0e6a0d..5f12c558d98b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_156.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_156.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_157.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_157.plan index bd0fcc23270b..8e3b185349f3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_157.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_157.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_158.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_158.plan index cb889296405b..533106a16682 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_158.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_158.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.e > item.c Or item.e < item.d Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_16.plan index b25b27dfcdd1..14dcf56be79f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_17.plan index 66c9d96a32b8..62d02ebd6321 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_18.plan index 34d8ceeccc51..98601e85a9c0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.b > item.c And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_19.plan index 1fc1fefdc22d..d18a0af8031c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_2.plan index 53c946d64c6a..d2680b66fe1b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_20.plan index 1bce563409cf..86cb12ad3460 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_21.plan index 56aabecc1b49..86144112bd44 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_22.plan index d29158f50c4a..48ced839a74c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_23.plan index edd757c8407e..0cd57dbf838d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 51d35e20943f..c3ddb535584c 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_25.plan index b862b91f3c80..a5a01f7dd114 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_26.plan index 6da06ade89b8..a98ac5d085d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_27.plan index dc1c82349ad4..87003b8c422f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.d > item.e And item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_28.plan index 55fd42d25ee5..f5056622124c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_29.plan index 6710fc140a98..d466468c46bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) And item.d > item.e And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_3.plan index 530d42a4da6e..423edfced79a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or Not Exist(item.a)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_30.plan index 662343f68e0c..9d627446c7b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_31.plan index ae4601d9d9b4..e3618aff15ff 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_32.plan index 659cc5d8ed3d..9ac2d603be08 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 fdc92b816367..e746ae0ce2f5 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_34.plan index 0760437ac113..10cd38947bd4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a != 0 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_35.plan index c84485e43587..38e6e2a55bcc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_36.plan index dcd68a7b398b..c90f8b87b726 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_37.plan index 662343f68e0c..9d627446c7b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_38.plan index 0b028c7a17c9..231f7a9e271b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_39.plan index 635b3c7464a9..c2a7237b30ca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_4.plan index 3382458ed620..48f90ee8e0d2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -112,9 +135,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -130,9 +163,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_40.plan index 389e85e084a1..953e85812a03 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Not Exist(item.a) Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_41.plan index 3dbde418c16b..3acfc6bbd69e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.a != 0 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_42.plan index c042772cf71e..5958bc93e5ad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_43.plan index 415fc6bafddc..8026b906653c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_44.plan index 20f20e468093..e3a5d07dc66b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_45.plan index 54c7a47f68a2..fada451f81a4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 cb3a7694ce65..e6b3c5e93ffa 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.a > item.b" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_47.plan index fae54f58b358..49235cf5ec60 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 0db99a4c5097..2585179c1b74 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_49.plan index d0ff1255d616..2e69814d6d37 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or Not Exist(item.a) Or Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 327c3ea9fc83..3a91079fb125 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_50.plan index 62b0120b4f74..586300614ad5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or Not Exist(item.a) Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_51.plan index 3ef5b4be1769..27b505405c0e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 dc477bda5646..af6fd015f99a 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_53.plan index 2242cbd6302d..fc58af21d240 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_54.plan index 1038b9b9b541..405942317407 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c And Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_55.plan index e020f5865561..0c5ebd647001 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_56.plan index 1c698446f35a..a171ac7e9151 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_57.plan index 4f9773886c86..85e99d4f2d70 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_58.plan index e5b7475260c8..d69efd95f3f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_59.plan index 6d89bcb1d3c7..318ed85efd15 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_6.plan index 546e1e42c6ce..5cc4c7ec45b8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_60.plan index d6cb11367f57..9dc7ba333443 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_61.plan index bf9b76b8699b..ad48193007a8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or Not Exist(item.a)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_62.plan index 32d34aa612b0..3f0537418521 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_63.plan index 331b501bd66d..a5766f7d229a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_64.plan index c9cce02a2ea3..f5c83ea9652e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_65.plan index 4fe1f368ca98..fe04865615d0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_66.plan index d006805f9e18..c2f205b01b8c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_67.plan index 351378095517..5caf5acc330b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_68.plan index 5759300cda1c..5a1cb9661526 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Not Exist(item.a) Or item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_69.plan index 55711d9dabac..9475c358284d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_7.plan index 14f4f6fbc39e..d500c99583b8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_70.plan index 00c35abf2cef..9f49b39b3bb6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_71.plan index 97f9af21d94b..482525717999 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 62dbdd1b87b2..5bcb3157a7bd 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_73.plan index 5dc1237e2dac..11d54c2e1d1d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_74.plan index f4515f0cdf00..e261d9b38dfc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_75.plan index d85219123dce..b07ed6e8453f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_76.plan index ee45905a719c..240bc427c84b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_77.plan index 61a1f5bb2fd4..e5ae9eb86160 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +141,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +169,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_78.plan index ee805337c239..18b553abc0ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_79.plan index ffecb4dc9def..d204dfa69fa2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_8.plan index a350c79f6bd7..7a5a1aa1a4b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_80.plan index 0e671b75f4d4..971fc42d410e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_81.plan index f80f10aab377..d51088fc1ad7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_82.plan index b9e775dd344c..033a79616f82 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_83.plan index 6ff9fa8ec433..213ac2d5e823 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 965d79b70dd1..9bebf12cb175 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_85.plan index 760ef7490357..1e13f982617c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_86.plan index b12a95b008b2..1b2880e00ee2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_87.plan index 66319b619227..916dba868027 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 Or item.b > item.c Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_88.plan index 98336df6329a..2d173a1d2d50 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_89.plan index 9cbe638b2dba..1e28aa2869ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.a And item.e < item.b Or Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_9.plan index fcbbb548627c..9e43056c7d03 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_90.plan index cf2961b03ac5..18e79e1fda42 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_91.plan index c73ea97f7c6c..7233789f5119 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_92.plan index e7dfad8f9134..a9ded99615bb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_93.plan index 2e2070122b3d..1f1e6fc04877 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_94.plan index d5f6d200c484..51c78d0d4759 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_95.plan index 1b4790584e70..477afb1c6446 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Not Exist(item.a) Or item.a != 0 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_96.plan index 12851d6552e6..3a22f9d19561 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_97.plan index 371c15587afa..82b31875caeb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e > item.c Or item.e < item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_98.plan index c3c316a6d554..54a3beae048d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -110,9 +133,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -128,9 +161,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_99.plan index e4856179d20d..1ac3c8f8fb9a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_1.plan index a4843e39c8cb..49fcb8a21a76 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_10.plan index d623d20814e4..8ece2f5f581e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -112,9 +135,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -130,9 +163,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_100.plan index 1d417f6683dc..95fd28bc11a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_101.plan index 58d3d6c793a5..ab86ed4cc4bd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 51b00e40dcf4..cfd92aa32272 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c > item.d" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_103.plan index 9d25c302d98e..ef78fb0e4e01 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_104.plan index e20c15f1a0f2..640d89f8cf54 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_105.plan index 51b6c9e7d66f..dfc49c452662 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_106.plan index 7b8bb84f3c9e..00e94d6c2011 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_107.plan index 984869a9da56..3518b3b49d5a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_108.plan index 5a3d42298530..9f12b9110c18 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And item.a > item.b And Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 93ed72496aad..e1475778b579 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_11.plan index 6d14e5b2f00d..99d626cd73d2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_110.plan index e7b58430d129..4697eed52f30 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_111.plan index 2fd5edac4a38..79767bda714a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +141,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +169,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_112.plan index aadb855885f5..58e6f12798a4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_113.plan index abfbed56d411..2582a47f79d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) And item.a > item.b And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_114.plan index 7d9d8fc0c1c3..1c8cc50b0b58 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_115.plan index 2923c562d105..d9146597ae8f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_116.plan index b0ed1f26541f..267629fd494f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_116.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_117.plan index 73c1bf9d9d18..c8991898ee98 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_118.plan index f39dad124404..3f6624f6a686 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_119.plan index 081b18706481..b34deba7e0da 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And Exist(item.b) And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_12.plan index 50acde6c36a4..b31ae088cac2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_120.plan index 713a7d9fe7a5..3ed2456cd97d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_120.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_121.plan index df9db17e3e8b..9f070c8c05c4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_122.plan index 868e18eeb131..126630e14654 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_122.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_123.plan index 7fd3565ded68..fdbd10e6277f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_123.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_124.plan index d97787199a2d..7f6722f61533 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_124.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d < 110 Or item.d > 150 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_125.plan index 465daf2f1e0a..821e76f7de8e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_125.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_126.plan index e195a184956f..3f0fc09ee550 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_126.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_127.plan index 86706eaa3edf..4a1b86d2d2e5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_127.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_128.plan index 1ce91d9255af..cf2b1df03940 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_128.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_129.plan index e0ee4eac65af..3b8036c8252d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_129.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_13.plan index a90d269afb37..f929e590e412 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_130.plan index a3b19db20956..7d86840f5972 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_130.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And item.e > item.c Or item.e < item.d And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_131.plan index e26746d5b7cc..78ef7c1ad720 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_131.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_132.plan index 5c4342cf9d4a..553629e86f57 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_132.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_133.plan index a654a9a12a91..bb76d7243c8a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_133.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_134.plan index 694a49d362af..80abcd842ae2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_134.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_135.plan index c47769d6deab..9e779edd1a20 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_135.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) And item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_136.plan index 072d223c1d2e..c79036ef1776 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_136.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_137.plan index 1826b12e7974..19136c9a103c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_137.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_137.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_138.plan index a2d960ac963d..5bfe4c2ab58b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_138.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_138.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_139.plan index 0901d97b6559..198972c913d1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_139.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_139.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_14.plan index 6d4fbe70d5c3..8fa66f36a73e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.d < 110 Or item.d > 150 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_140.plan index 4c810588e672..4a04beb613b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_140.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_140.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or Not Exist(item.a) Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_141.plan index 3876a427a413..27305c62d3d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_141.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_141.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.a > item.b Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_142.plan index 4eaebe753b3d..0e8e8fd6bc21 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_142.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_142.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_143.plan index b222bce35224..1ac930a3bd4a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_143.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_143.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_144.plan index ad21f778070b..ca005bc99165 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_144.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_144.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_145.plan index a46e8ebef4e6..60f679e47241 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_145.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_145.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_146.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_146.plan index 1d417f6683dc..95fd28bc11a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_146.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_146.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_147.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_147.plan index 9a38d0e907ce..a647206851bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_147.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_147.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.e > item.c Or item.e < item.d Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_15.plan index ae99ac0a6d66..3cd2b887c08a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_16.plan index 469535ea9865..305cb5ddf09f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_17.plan index 000240c11762..6895c915815a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c > item.d And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_18.plan index f9cc9ae3cc0c..7fae11c3aab4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Not Exist(item.a) Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_19.plan index 11763e0312f2..5f426863b956 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 Or Not Exist(item.a) Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_2.plan index 799c5acfda51..1960cda6e4bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.a > item.b - 2 And item.a < item.b + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_20.plan index e78c286b47dc..5d524a6c8c7d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_21.plan index a8e8cdda57b0..ee9da87abe9d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_22.plan index 4998b0d9a536..3de8f07d3dcd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_23.plan index c320f0437506..93a4391a3560 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 13a8ae80eefe..8ff9c58109e0 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Limit": "1001", "Name": "Limit" } @@ -29,21 +34,32 @@ "Operators": [ { "Inputs": [ - 1, - 3 + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 3 + } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", @@ -90,9 +106,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -108,9 +134,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_25.plan index 4bf36911d41c..5f5f0901928d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And item.c > item.d And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_26.plan index b57bbd975065..b317c751e7e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Not Exist(item.a) Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_27.plan index c8f16dc21fed..4e38c567c4fd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_28.plan index 307365adb64c..f659fa4700a6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_29.plan index b7c320cd2ed2..333a1617b00b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_3.plan index a7b938161497..8ab6f89eaf3b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_30.plan index 19e38ee4aea9..2ef842c0a692 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_31.plan index 9ce55d040814..31008023335c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -112,9 +135,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -130,9 +163,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_32.plan index 83e9870e2ba0..8387f5cc1302 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_33.plan index 23ea2cda8783..e867f7996f4b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_34.plan index c0802b9014e8..ab176c94ea07 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_35.plan index a7b938161497..8ab6f89eaf3b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_36.plan index df7a87f0ef7f..aa9f901fc318 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c > item.d And item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_37.plan index 83fb16cda3ed..f9ea3b50567e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_38.plan index 0241c1d00a19..5edff13d3b35 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_39.plan index 82d998563d67..2ed87ede1f83 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_4.plan index 62298d42c4c4..3d8ea19573ec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_40.plan index b8436923e7d7..a0ce462cdf7b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_41.plan index b53f68fc49c1..e8f40d7975ab 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_42.plan index a0d81580b9bd..4aa4e2169553 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_43.plan index 19995ed68bde..9265bda8b448 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_44.plan index 33c95b76373b..e1b2a6e49cc8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_45.plan index 145a41236246..bccb3cc25ad1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 dbec57b2cb8e..98366e1abdfa 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_47.plan index 8313e2078967..9c339be3ddf4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_48.plan index 79e4774f9312..17e539d53a28 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_49.plan index 4cd094e86f1c..518c9c407334 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_5.plan index cb927e1fd4fa..fdeb5cecfaae 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_50.plan index 1863147644b8..7b2f1ae0b9be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 7c9fe20166f1..a867a13b6c2c 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Limit": "1001", "Name": "Limit" } @@ -29,21 +34,32 @@ "Operators": [ { "Inputs": [ - 1, - 3 + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 3 + } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", @@ -85,9 +101,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -103,9 +129,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_52.plan index f36a40159b6f..7821241137ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_53.plan index 1376c6f163c4..3557ae4b19a5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_54.plan index c19002345ea5..582a79116f2a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_55.plan index 0f50c40dc252..3081f402ecc7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_56.plan index bb5cfd0e25af..59cf37d81692 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_57.plan index 4c7a9c884781..da0e6d85d2f1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_58.plan index 96dba1877215..c9a50de97d30 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) Or item.a > item.b - 2 And item.a < item.b + 2 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_59.plan index a556ae61ca50..137821557ef8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_6.plan index f02e948e659a..7702f0d1e2b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_60.plan index 8e10ca780a3c..90f14b0def9d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_61.plan index e15c50278306..ef794c88a9d1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_62.plan index d64f42475406..ad4977cf5f30 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_63.plan index 04315415c257..e8e59f2c5115 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_64.plan index 799713cf5fd2..0e72be178056 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_65.plan index cc77826e68b2..05690e665194 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_66.plan index 627acd29f4d2..03713c516d3f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_67.plan index 6a711fac102d..239676ab9aba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_68.plan index 9a3e2e5344eb..7cb23803824f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_69.plan index 9908ba0dfd80..53afd2ed9931 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +141,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +169,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_7.plan index 7c371c6a06b7..c92fed223b9a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_70.plan index 22a46aa20d87..d66ceb06bb08 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or Not Exist(item.a)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_71.plan index 54e6840b8f86..32c1fc877f05 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_72.plan index a69d0d7638f8..d88d97ef4a45 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_73.plan index 30e14c318642..c53e5a72783e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_74.plan index d10356d9ef84..4e1e92bd0598 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And item.d < 110 Or item.d > 150 And Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_75.plan index e0ee4eac65af..3b8036c8252d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_76.plan index bd35fd444baf..d5f5a9d10f63 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_77.plan index 4eaebe753b3d..0e8e8fd6bc21 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_78.plan index 6ec7cab54b92..6e0ffc542a34 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.d > item.e And item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_79.plan index 16a2d186d7ad..cdeae23ddffc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_8.plan index 47666eec3c07..a6634564cd3a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_80.plan index 577b9fb32cb2..8f277c4fba6e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_81.plan index ff9aaea51145..0158266bc148 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_82.plan index 603951a6ea15..c0242415cda6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_83.plan index 3273e0af45d6..7b25442014ad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_84.plan index 20bf3bca2c4f..81fed8b6d971 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b" 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 1ed71c905694..accbb949e5c9 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Limit": "1001", "Name": "Limit" } @@ -29,21 +34,32 @@ "Operators": [ { "Inputs": [ - 1, - 3 + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 3 + } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", @@ -90,9 +106,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -108,9 +134,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_86.plan index 07219dd2a9e4..55f5628d8b09 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_87.plan index bb10c23f96e8..f1a89e0c82ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or Not Exist(item.a)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_88.plan index 0315fdac6da4..62a37aa15030 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_89.plan index 1db90059e92e..d886d2c821ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c > item.d Or Not Exist(item.a)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_9.plan index 758ea01d7a11..b57d2d38f494 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_90.plan index 577b9fb32cb2..8f277c4fba6e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_91.plan index 624a291a9b09..19e9542e518f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_92.plan index 5354de228f46..2ba8878979d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_93.plan index 491ce1c7a548..ca3a8cef7071 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_94.plan index a7b938161497..8ab6f89eaf3b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 4113106ae4e4..b9dfcc00a3bf 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", 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 3874689398ba..df133bb8a7aa 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_97.plan index 227e8f82a793..79b7728579bb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_98.plan index 713a7d9fe7a5..3ed2456cd97d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_99.plan index 868e18eeb131..126630e14654 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_1.plan index 9af485bf62f6..8114a7c4a637 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_10.plan index d0006b6b9cdf..32f5ac51e426 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -112,9 +135,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -130,9 +163,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 530ecdd291f2..98aab31ac062 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_101.plan index 3c20f0e35c6c..3c42ac0a1e56 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_102.plan index 7d01eff7fa99..f04567baf0b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_103.plan index 02c1c55b2bde..79b5559e5461 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_104.plan index 88b3d5798e7e..e595e85bad5f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d < 110 Or item.d > 150 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_105.plan index bbac90f33032..71174ca62cd3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_106.plan index 7a49c859b99f..adbe96e8d4bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_107.plan index ca0f24ce06e6..046b372fee82 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_108.plan index 933c32c1cf14..1c47af22ef7a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_109.plan index 5e12fb0e6595..f59c23cf1435 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_109.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_11.plan index d5538ea1cce4..c0ee9e160489 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_110.plan index 3c31dc98b57f..5e6c4850408b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_111.plan index d579e68e663b..1145bd3b3358 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_112.plan index c59076d04367..64a5ed1deff5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_113.plan index f63c925e41cd..28c8eac1c08a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_114.plan index d5d0b5ae3a75..3f93e57f1bfa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or Not Exist(item.a) Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_115.plan index 56b6d2ebbfc3..d9d25a3a0a9d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 53e8d702837e..9b388f425b0f 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_117.plan index e10cc9dbb377..f2b5488343b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_118.plan index bb3e927b40a8..9edc41e2ab65 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_119.plan index 452991ccd2f1..dd0c4aa1f333 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_12.plan index 330b8d27255c..40d3aa05ba91 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 07b2dd3acdbc..771e5e3efbe1 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Limit": "1001", "Name": "Limit" } @@ -29,21 +34,32 @@ "Operators": [ { "Inputs": [ - 1, - 3 + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 3 + } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", @@ -92,9 +108,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -110,9 +136,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_121.plan index f96dfc6f730d..88e119fed0ed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_122.plan index d970570a0785..829edeb9ad3e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_122.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.a And item.e < item.b Or item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_123.plan index 1996a6843726..b996660cf4fe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_123.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_124.plan index d78b40b53313..8f268421265c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_124.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_125.plan index 6ec185561eab..4f88fb4f201d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_125.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_126.plan index d4163d1a95d0..f8761d939ac6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_126.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_127.plan index d78b40b53313..8f268421265c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_127.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_128.plan index 3be81372e77a..cc6d3ea8f3f2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_128.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_129.plan index cf395707291a..e195749a238c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_129.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_13.plan index d186f0c1077e..7d337e0cc4a1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 558b987639a6..faa8e57198d3 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_131.plan index 9a72d64f4e9c..80a8fa64ddfe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_131.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 a3053381fc6f..d7be76890971 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_133.plan index 736c1a5e1e12..d6585d42ec14 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_133.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_134.plan index 9ae25f314245..3d7fcace3725 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_134.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_135.plan index ee6b702ad237..b6e8b78c2a92 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_135.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_14.plan index d7004be53bca..442be7034ad8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_15.plan index b9ed651dffcb..3a22db1c3f87 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_16.plan index 3cd8783d02e7..91498ca5a3e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_17.plan index 850a636eda61..842ad1900682 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.a > item.b - 2 And item.a < item.b + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_18.plan index 65e21df877cc..cfadafe69c40 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_19.plan index beec7e350c60..5e3bb2ebd8c8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -112,9 +135,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -130,9 +163,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_2.plan index 2bd020db0a92..9a84cf8801ff 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Not Exist(item.a) Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_20.plan index c5fe50af0b50..fb7bdc8c9737 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 81c77604b2e7..0dddb66cd9dc 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.a != 0" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_22.plan index 50d774ba9758..8c0a890beaa1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_23.plan index 5efe7d6c6583..b61fadab5f06 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_24.plan index 69a69a022dbd..97730a7f8763 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_25.plan index 3352aeb09c7f..80b12ff6b6ec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_26.plan index be3f64a14cc8..94ef3284bcde 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_27.plan index 7267c62860fe..f3e1b0cb5724 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_28.plan index a032f941ec10..2906ade3eb68 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_29.plan index 36e0bf40ed91..6dc2a75acc52 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_3.plan index eceeaae82af7..82ed6cc5efd8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_30.plan index ea92d57d2763..9c7a2c07e0b5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_31.plan index e79445685dc2..fd7ea6f03b9e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_32.plan index c45f5d2b7f56..819068d43ac0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_33.plan index a3123443afd9..ea46d7ce3140 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_34.plan index b5e67ff2f5ae..124ec12b6a67 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_35.plan index 017ae46466fc..f74ebb857af7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_36.plan index 6d2b54f1449a..c001242f376c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_37.plan index dbbfde29a607..e73971725431 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_38.plan index 0d3f2fddaa12..aa541cf85c10 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or Not Exist(item.a)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_39.plan index 2ac540830641..3b9d615a113f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_4.plan index 9f1dbd9fe764..270d5e11e972 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_40.plan index 6524ee8b59c6..911555ea3a8c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_41.plan index e68b066c43cf..df28862cc609 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_42.plan index 93a1be08dd70..22f8097c481b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_43.plan index 631b3c5b17a7..a6dd7cd66a08 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 a6cfdb516a40..4f7a36fbe4b0 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.a > item.b" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_45.plan index a6d5f05a035f..bf0a7a0119c9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_46.plan index 9dc51101a100..d6220fa8e6fe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_47.plan index df45360aa9a4..b7dcf1e51595 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_48.plan index 469bcd349f4b..1657d14a0ea3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.c Or item.e < item.d Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_49.plan index ac872491e18c..809636862c96 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_5.plan index cb0fe8bdbdbf..7fc573e4575a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_50.plan index 0dd6b0ce37d1..9f98924ed8c0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_51.plan index bd8a647e3b6f..c26f96648383 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.e > item.a And item.e < item.b Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_52.plan index a77c716fa351..baa58c1fa98a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -112,9 +135,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -130,9 +163,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_53.plan index c18868432810..825beb39aaf8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_54.plan index 930c08559018..c106cf2c956e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_55.plan index 2a426db13d80..ad242735e44c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_56.plan index 49c5ead23107..e584fcd25269 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "Not Exist(item.a) Or Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_57.plan index cd724cc00d0b..c474bc66823f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_58.plan index 6ff9619755ee..9e9d9b1e743e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_59.plan index e7526f2d2d6a..d4a82d8e2dbd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_6.plan index d9bd0a612ac6..e1b4580ad878 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_60.plan index 15d5b3a66974..64082ed1a792 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_61.plan index 3ee3cc2b9e43..ce2602c05cea 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 3e33b7087bcb..9ce7a66a3880 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_63.plan index e1e9e70a293a..b60d666eae62 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_64.plan index 8757395e8651..92ad828d5973 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_65.plan index dc08a80b78ef..d564772a2e35 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.d > item.e Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_66.plan index 11482165e518..1590a82563e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_67.plan index 1dafe2cc2e80..00616335263c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_68.plan index 265191123e01..ee2cf07797dd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_69.plan index d1d483cb89f9..533fe108862c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_7.plan index 368925d3cdc6..6a23a5ffe954 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_70.plan index c32eb323d89b..df3b1a992a44 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.b) And item.e > item.c Or item.e < item.d And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_71.plan index 0cfb12578dcb..e78775bdcb76 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_72.plan index 63a7aca384cf..8f3042157dc6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 729e9b498d16..cb28bf0c055c 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_74.plan index e2d35493247c..1da1d126e550 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_75.plan index 9f2088d05762..a3c52bb132c1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_76.plan index 43d6b24513f6..26a040254038 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_77.plan index 0a1246f3ef6b..6de131915476 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_78.plan index 0504303c7726..50d52269835b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 191394daab1e..4bb6b70964a0 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c > item.d" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_8.plan index 35cb67eb087b..dec5977a836e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_80.plan index f1986e8c76bd..2cfe4e7311b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_81.plan index 0ac8f4197d85..f6e1e762efde 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_82.plan index a77c716fa351..baa58c1fa98a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -112,9 +135,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -130,9 +163,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_83.plan index ff9840172c2e..aab84572a7ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_84.plan index 6b7b8a458302..7ac7792a78f2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_85.plan index 4fdd12015c53..056c33a37ad6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_86.plan index 028a1b064e8c..275c9138d02f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.b > item.c Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 0d94c960d22e..b4cf3a03df01 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableRangeScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_88.plan index 7249a6447dc1..36b260c200af 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_89.plan index d551bb260d12..0cc08fa9945a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_9.plan index b22ab88051dd..97351ac95805 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_90.plan index ffdd04f808a4..cdbc3983b9a5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_91.plan index 8954f8220f90..84a3568e9b06 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_92.plan index 6ef1a6fe606c..abfeda54e45a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c > item.d And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_93.plan index 34a2e3f2d544..cd523f80191d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_94.plan index 1996a6843726..b996660cf4fe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_95.plan index 647b82b46d21..6064424f75e5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", 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 4112b0b94905..5262012fc1ac 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 @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Limit": "1001", "Name": "Limit" } @@ -29,21 +34,32 @@ "Operators": [ { "Inputs": [ - 1, - 3 + { + "InternalOperatorId": 1 + }, + { + "InternalOperatorId": 3 + } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "ToFlow", "ToFlow": "precompute_0_0" }, { + "Inputs": [], "Name": "TableRangeScan", "ReadColumns": [ "a", @@ -89,9 +105,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -107,9 +133,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_97.plan index 4f01d1f918f1..1a0f4f120e6b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_98.plan index bc34524ebd05..39f0ce441a46 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_99.plan index ac920147beff..32d0683f30f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.e > item.a And item.e < item.b And Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_1.plan index 0ad24a72c2d8..e43eba9fce0a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 Or item.c > item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_2.plan index 011386a8ef92..bc280e328104 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.a != 0" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_3.plan index 6aab8109eb76..9d7c7e6f24c8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_4.plan index 3a847105d6a5..ceef6fab70dd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a != 0 And Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_5.plan index 103cb00df2d4..99dc9e5a2a06 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And Exist(item.b)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_6.plan index c1e776e61731..a3204e07e51b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a != 0 Or Not Exist(item.a)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_7.plan index ede5739bddb5..12c1365f3c3c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_8.plan index d66addf57d5c..127d212452f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_9.plan index 20faaa0bfc59..e944afd40fa1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c > item.d Or Not Exist(item.a)" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_1.plan index 8282e555b53d..09a2832d1325 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -108,9 +131,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -126,9 +159,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_10.plan index 482fcf80444e..e78316d7ccd7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.a And item.e < item.b And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_100.plan index f79d5a7943e5..3d6692507d70 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_101.plan index c01f6d1154a4..de6107604269 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_102.plan index 87c564f4f49f..03a621330187 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_103.plan index 62fa7b21c0fa..1b449a73784d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_104.plan index 62fa7b21c0fa..1b449a73784d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_105.plan index 5e8dd0709697..10ed9190a608 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_106.plan index 966bd81f4713..6ee839aa0210 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_107.plan index 86ce96eb7600..4fcd34a66182 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_108.plan index 3e663fb24482..1920a96095df 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_109.plan index dbdec304d91a..5cbfcf2d23b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_109.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_11.plan index 8475ca3fb22b..db62fd66d10c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.e > item.a And item.e < item.b And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_110.plan index dbdec304d91a..5cbfcf2d23b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_111.plan index 3854224c50ea..4ea3856949f0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.b > item.c And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_112.plan index 3854224c50ea..4ea3856949f0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.b > item.c And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_113.plan index b18b672180c5..62582c9a174d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.b > item.c And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_114.plan index b18b672180c5..62582c9a174d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.b > item.c And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_115.plan index b126bdcc8c4e..eb4533d55a4f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c > item.d And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_116.plan index b126bdcc8c4e..eb4533d55a4f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_116.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c > item.d And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_117.plan index 2488b5983862..0dd0dacbe0b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_118.plan index 2488b5983862..0dd0dacbe0b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_119.plan index 2864e9ab9bf6..b82e1aebe438 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_12.plan index 01778f3fa7b6..88568d89c35f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.e > item.a And item.e < item.b And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_120.plan index be41c2fec542..573d99b6b526 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_120.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_121.plan index 4cc68ba2fb33..0b3b08f6fb35 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_122.plan index 0dd8eccb406c..a5740d832cb2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_122.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_123.plan index d3b6b60f0edf..113bd6f353b4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_123.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_124.plan index 0c9484aa35a3..afac1d00f691 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_124.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_125.plan index e1dde141d70c..8b3d2d0e9983 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_125.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_126.plan index 11aec1556124..530d4154520c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_126.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_127.plan index 2f37c0e50161..a1fd2d024fb9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_127.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_128.plan index 30c9bf279857..349a8bf6d0e2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_128.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_129.plan index 86ce96eb7600..4fcd34a66182 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_129.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_13.plan index b38c921f6ff3..de401771a8c0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_130.plan index 4b4bf23314f9..37af6fce0c87 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_130.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_131.plan index 5e3bf31856d6..d36a9e863186 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_131.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -111,9 +134,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -129,9 +162,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_132.plan index 5e3bf31856d6..d36a9e863186 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_132.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -111,9 +134,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -129,9 +162,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_133.plan index 8f3a725210cf..539fff6975fd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_133.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_134.plan index a3132a7087a6..950fe982873e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_134.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_135.plan index 363e1c4e0673..4d8844ae501c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_135.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_136.plan index 4420d6d1e1a6..2f54aa91478e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_136.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_137.plan index 9e200ec8efc5..8511008ba6fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_137.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_137.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.a > item.b And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_138.plan index d829635ccc9d..512c579457a8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_138.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_138.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.a > item.b And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_139.plan index f59ffcf22909..75e72d01c2e5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_139.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_139.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_14.plan index 6cc66150be2a..6cd917c45c92 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_140.plan index 292077ade75b..bb9e5bd675a9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_140.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_140.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_141.plan index 95e8da4594de..5f04481ecf44 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_141.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_141.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_142.plan index 198f4ab2c138..41d369dcc67a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_142.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_142.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_143.plan index 4959c0f57e23..b2117d0d754c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_143.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_143.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.a > item.b - 2 And item.a < item.b + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_144.plan index d76cd9e12d0a..f63e01a58be5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_144.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_144.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.a > item.b - 2 And item.a < item.b + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_145.plan index 8d684682808f..6ed6fa49249e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_145.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_145.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_146.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_146.plan index 8d684682808f..6ed6fa49249e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_146.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_146.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_147.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_147.plan index 9170c723699f..9eb9ddb27257 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_147.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_147.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.b > item.c And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_15.plan index 895a9ea95190..571b73ed2537 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_16.plan index 895a9ea95190..571b73ed2537 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_17.plan index 49a496849acc..9e12205d61fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_18.plan index 644eef01dfad..2d0b1814865a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_19.plan index d87f2312ea7d..5279947f0a6f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_2.plan index 8282e555b53d..09a2832d1325 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -108,9 +131,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -126,9 +159,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_20.plan index 0b3dad6306c1..f7764ed6c71a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_21.plan index 8d684682808f..6ed6fa49249e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_22.plan index 8d684682808f..6ed6fa49249e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_23.plan index 7833ce92682e..bded3b65f8f2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_24.plan index 7833ce92682e..bded3b65f8f2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_25.plan index 6e57aa496784..6213f890acfe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_26.plan index 6e57aa496784..6213f890acfe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_27.plan index a5ce542235bc..a9e49c2f43b6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_28.plan index a5ce542235bc..a9e49c2f43b6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_29.plan index 4d0c08cba099..1e5d38355eb1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_3.plan index 8ce73bc4aabe..1d4b76b4425b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_30.plan index 4d0c08cba099..1e5d38355eb1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_31.plan index 4d0c08cba099..1e5d38355eb1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_32.plan index d3c2505fd917..f2082cb6f49e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_33.plan index 4d0c08cba099..1e5d38355eb1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_34.plan index d3c2505fd917..f2082cb6f49e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_35.plan index 4d0c08cba099..1e5d38355eb1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_36.plan index 4d0c08cba099..1e5d38355eb1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_37.plan index 4d0c08cba099..1e5d38355eb1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_38.plan index 7d236460b9fc..a9ab612e5116 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_39.plan index ec968ab91214..445699d100e8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_4.plan index 95a49a65fe77..792baabc1829 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_40.plan index c45dd3555a43..ce161ab37757 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_41.plan index 0a536589513c..42755ae348b8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d > item.e And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_42.plan index 0a536589513c..42755ae348b8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d > item.e And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_43.plan index ba80bb89ab38..2a0214b18249 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_44.plan index ba80bb89ab38..2a0214b18249 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_45.plan index 294cfd12052a..e6241f92c0a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.c Or item.e < item.d And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_46.plan index a0d6efb282a1..e779b050f639 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.c Or item.e < item.d And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_47.plan index 051174f4082e..658f626b7b40 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_48.plan index f22f4d5ca3b8..9c75221e26aa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_49.plan index 91af5cd17b75..65df7b505b24 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_5.plan index 118cfe0cae3f..55cdc792e0e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_50.plan index c9b2f723494a..fab28195e117 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_51.plan index c94f04a79f1e..0290291c12de 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_52.plan index 12b12ac857f7..5fdd4706fcdf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_53.plan index 1efc0d79e712..bb76367c696f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.b > item.c And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_54.plan index 1efc0d79e712..bb76367c696f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.b > item.c And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_55.plan index 0b849131a87c..1d4e4b18c1d1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_56.plan index 3ee72c0f986e..c7c463a59cf8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_57.plan index 2a58334f1f44..76e769a4afb2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.e > item.a And item.e < item.b And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_58.plan index 2a58334f1f44..76e769a4afb2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.e > item.a And item.e < item.b And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_59.plan index 44d5b071f662..83e53f892b91 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_6.plan index abef441b1641..8584e9067eb4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_60.plan index 7aea7271e2ed..fb9baddf0132 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_61.plan index cd390b36b257..3ae65ab4c881 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_62.plan index 6db589795a41..1d13da2ec201 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_63.plan index b5caa4dc3f74..5eed0a51c06d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_64.plan index 5871d92cb072..2a92a3035026 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_65.plan index 4e5930f45c7c..e18a5ca7c1f2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_66.plan index 3d4e959ecd34..ff1639f3d211 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_67.plan index 7646261ea68f..f93e64c138d0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.a > item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_68.plan index 1ac0e8c2410b..41e0eb08ac6b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.a > item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_69.plan index 0a15fedcc395..4bb2e0a1e557 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_7.plan index 4d0c08cba099..1e5d38355eb1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_70.plan index 15df52d5e342..c119b64a5630 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_71.plan index 371f2b7ac497..4fb14af98829 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_72.plan index 41b1ef4bc23c..66c234680fca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_73.plan index 4726634c9a59..d50473766949 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_74.plan index eb695fca39fe..43d717cc92df 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_75.plan index e1d4e5b5a307..e880c8d767bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_76.plan index 01fddb3b8ff1..5ac04faf317a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_77.plan index 11eacda0f479..0b74f74759b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_78.plan index 11eacda0f479..0b74f74759b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_79.plan index 3981c1e24542..d29ce87a8f06 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_8.plan index 7d236460b9fc..a9ab612e5116 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_80.plan index b2f4259234ff..c4620acdfaa7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_81.plan index 9acf13788a96..5d5dd4b2228a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_82.plan index 9acf13788a96..5d5dd4b2228a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_83.plan index 50abc8f5eddd..8871c0e57465 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_84.plan index 7cb173240f3f..15cfa95c5389 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_85.plan index 6e50e73dd9c3..436b86a892d8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_86.plan index 29ed86cdbd10..ad86bc2d4e22 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_87.plan index 9142b342c611..7a1d06f2fa63 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_88.plan index 9142b342c611..7a1d06f2fa63 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_89.plan index 6e7dc88fef6b..646d5eab2d96 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_9.plan index 41ab7fb966e9..3801f48f9000 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.a And item.e < item.b And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_90.plan index 6e7dc88fef6b..646d5eab2d96 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_91.plan index 14aa2c7df4ae..cec7abc7457d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_92.plan index 9177ca1d1fde..f202e7052974 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_93.plan index 35ee428ac48f..378bcd70c99e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_94.plan index 793908a793d2..d013a464d8ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_95.plan index a9656ba84986..e07c06d9f4c0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_96.plan index 19d533983227..ddf49df0a5fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_97.plan index 60e36c72109a..a918dca01cc6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_98.plan index 13afa3e762b8..3ff798f66667 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_99.plan index 7404127920d0..a6941cf96b8f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_1.plan index 4736bf6b6a75..653e86b2cf6f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_10.plan index d023df50e1b8..15e14474562d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d > item.e Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_100.plan index 0f9836713c60..ccba8e102942 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_101.plan index 3161f25752b5..97d1a3b818ed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_102.plan index f139f26a818a..1bcd5b3f5a63 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_103.plan index 3702ba1fb914..dad92bc0584b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b - 2 And item.a < item.b + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_104.plan index 2903bd81e096..c38ed69caa47 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b - 2 And item.a < item.b + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_105.plan index 175e6591c521..0149812bdbd4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_106.plan index d7981fc7d5ee..1f19f5bd22e5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_107.plan index f9f26fe673ad..d3cab2dd528a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.d > item.e Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_108.plan index 8ad90dd355e5..94cdb6168fef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.d > item.e Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_109.plan index 57d8cf6e5c2c..770285ef1c7d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_109.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_11.plan index 0682e5b26cff..0e6e9bb6356c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_110.plan index d31b0e53f346..768c4c03f706 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_111.plan index 7e04b8a49569..85b309ca241b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_112.plan index 7e04b8a49569..85b309ca241b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_113.plan index bbdb4540a40a..9a71b526426e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_114.plan index bbdb4540a40a..9a71b526426e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_115.plan index cb8acba84322..2abe412b2d35 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_116.plan index 4dd9a15bdf97..58ddaf884420 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_116.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_117.plan index ccfb3323f446..a7d55dd96de0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_118.plan index ccfb3323f446..a7d55dd96de0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_119.plan index 4394a9bdc330..f51341b8a9bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c > item.d And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_12.plan index f9a30ca6e9b2..37547a1d933c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_120.plan index 4394a9bdc330..f51341b8a9bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_120.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c > item.d And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_121.plan index ac6625e7315c..8a0d35b29a17 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.d > item.e And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_122.plan index ac6625e7315c..8a0d35b29a17 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_122.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.d > item.e And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_123.plan index 9239f1d6ca2d..80c4b2bbf51d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_123.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_124.plan index 2c3b821c52b0..1c8d355897bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_124.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_125.plan index 40391cf379b3..7fd3bd042f6e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_125.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_126.plan index 28e7c12a3696..8ceb5d241bcf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_126.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_127.plan index 5da3735431ee..05beec5c7952 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_127.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_128.plan index 5da3735431ee..05beec5c7952 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_128.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_129.plan index c8635be7da98..2b272137ee23 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_129.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_13.plan index d675eb6ef478..55437259ff88 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_130.plan index a8e1b34bb1d7..498764fd86c8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_130.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_131.plan index 72db86942e40..81d9e3b60358 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_131.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.a And item.e < item.b And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_132.plan index b1b8db177a1b..a961cd2793c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_132.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.a And item.e < item.b And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_14.plan index 0c1d63696958..458861faffb0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_15.plan index 91b70a2d02f8..7c9ca23c941a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b - 2 And item.a < item.b + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_16.plan index 91b70a2d02f8..7c9ca23c941a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b - 2 And item.a < item.b + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_17.plan index 7fbabb12c6a1..1f33ba87ac3d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.e > item.c Or item.e < item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_18.plan index 7fbabb12c6a1..1f33ba87ac3d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.e > item.c Or item.e < item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_19.plan index 39d99ea90213..e827de680b33 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_2.plan index 620a3a2758dc..b758187b0db3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_20.plan index 39d99ea90213..e827de680b33 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_21.plan index 1e65b953ceb3..add97be5545f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_22.plan index 2c3a3a9a1d07..8769997732d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_23.plan index 3fae0bf65090..96cc2b59ca5a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_24.plan index e193988ff0c6..7ae5ffdb389c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_25.plan index c90de2050cc9..a3fe0ab869ed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_26.plan index fdf288ad03ac..f666a0a03833 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_27.plan index 1225226faa9c..268591f5eba6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_28.plan index 1225226faa9c..268591f5eba6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_29.plan index 56a00b03780e..416375f6e662 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_3.plan index 864c72fefe5b..cd571e3989e4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_30.plan index 3525398548a4..a63dddb974cc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_31.plan index b90ee06b0d67..4a5acc6da6d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_32.plan index 825a7ffa5cbd..538c4c4cd67d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_33.plan index 224533a17475..c41e3f1a8352 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_34.plan index 224533a17475..c41e3f1a8352 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_35.plan index a3258596db84..29b60881ce55 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_36.plan index a3258596db84..29b60881ce55 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_37.plan index 52f0655265b1..531706f15aa6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_38.plan index d4b63576c5e8..1c47466a7d28 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_39.plan index 1e65b953ceb3..add97be5545f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_4.plan index 8443a061c4f0..1038225cc579 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_40.plan index ae5f6fc00ea5..570d8ca32276 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_41.plan index 2e0c8e7d9abe..330e561fab49 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_42.plan index f999554d7359..128c155f751e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_43.plan index 8b0c40f15dfb..0ce95c517aac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_44.plan index e141dd3e1835..0241da76eb4e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_45.plan index 36da84542c57..4e1b6945daf5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_46.plan index 36da84542c57..4e1b6945daf5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_47.plan index 5e6bbfedb3cf..93e454219973 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_48.plan index 5e6bbfedb3cf..93e454219973 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_49.plan index a94b55dbd70e..86b8cd990240 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_5.plan index 16c4c12440fd..61b28491f535 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b - 2 And item.a < item.b + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_50.plan index a94b55dbd70e..86b8cd990240 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_51.plan index a56254faa0fb..a93acbe4d7ec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_52.plan index a56254faa0fb..a93acbe4d7ec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_53.plan index ccee51743043..7ef8023af680 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_54.plan index ccee51743043..7ef8023af680 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_55.plan index aea80fd70711..6fd536e67699 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_56.plan index 069351a6c40d..ccc7b0e700cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_57.plan index 72dc3bbb9220..9370bb96c3b8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c > item.d Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_58.plan index 3f96317e5731..ceba45ece9bb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c > item.d Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_59.plan index 639e17d3b19e..2c85050ff18a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_6.plan index 7ac95ad808f2..9829096d1877 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b - 2 And item.a < item.b + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_60.plan index 755e975aa123..6e0174219e2f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_61.plan index b2c55a44fe95..3e7a7cfd242a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_62.plan index af0a04b37604..503fc271f923 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_63.plan index a94b55dbd70e..86b8cd990240 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_64.plan index a94b55dbd70e..86b8cd990240 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_65.plan index 5cdd735a681a..c97d07a8394a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d > item.e And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_66.plan index 68ffccaaa868..4e2bf6fc1ba0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d > item.e And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_67.plan index c535ff95eba6..386648919696 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_68.plan index 90d3beed0dd3..8c1f0c29f419 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_69.plan index 1f63e07554cd..7b0c91febf62 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_7.plan index 26a2b90c5c3b..2292e58b260b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c > item.d Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_70.plan index c076fe4f1973..573d3d73a1a8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_71.plan index a77753393103..b1da477a122d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_72.plan index 09589035dad1..941e4e4c1be4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_73.plan index bda0c543aa14..fc555026e709 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_74.plan index 91e6043873e9..68b9de69e4fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_75.plan index 1927457c25dc..47eaa848c17b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_76.plan index 222cac0f02af..af904fed9a18 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_77.plan index cb8acba84322..2abe412b2d35 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_78.plan index 6e37b2b237ef..3cc10807719d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_79.plan index 7f4d556688bb..f5f67fa1703e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.e > item.c Or item.e < item.d And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_8.plan index e12aabec23e6..3c15fd41bce3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c > item.d Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_80.plan index 7f4d556688bb..f5f67fa1703e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.e > item.c Or item.e < item.d And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_81.plan index 2ccfbf4027d4..b1fa48ba7614 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_82.plan index 592828cdd24c..6f7907de050e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_83.plan index 2b2f410363d2..6aa80c377c3b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.c Or item.e < item.d And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_84.plan index aad9bde8fa8e..08e394523363 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.c Or item.e < item.d And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_85.plan index 851e9b9d93d6..884420a03f12 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d > item.e And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_86.plan index 851e9b9d93d6..884420a03f12 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d > item.e And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_87.plan index 07d45d0d0d0c..1f2360bca51a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.d < 110 Or item.d > 150 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_88.plan index 07d45d0d0d0c..1f2360bca51a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.d < 110 Or item.d > 150 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_89.plan index a0406156efb1..723213144fed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.c Or item.e < item.d And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_9.plan index 2930cc2c1334..56d7620fdfd3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d > item.e Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_90.plan index a0406156efb1..723213144fed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.c Or item.e < item.d And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_91.plan index 976ee0408b8c..61f3b6e92568 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_92.plan index 976ee0408b8c..61f3b6e92568 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_93.plan index 4495ee9004a0..9ce36fd386d2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_94.plan index a132eeac3308..0441ab0c1bfb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_95.plan index 40391cf379b3..7fd3bd042f6e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_96.plan index 1dda1bf9b0b3..057d042f45fd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_97.plan index 1eaa7a36961a..94211baadec4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_98.plan index f338f390b38d..9a66b0726be8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_99.plan index 50eaeda3581d..e5dbc9900b70 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_1.plan index c896fb37f3ca..6a5d589c76a6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_10.plan index 4c2a2c103035..76c4ee4102e0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_100.plan index b104f8c2f713..787225c368d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_101.plan index f683d2fcf847..6383d5cf382b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_102.plan index f683d2fcf847..6383d5cf382b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_103.plan index ecede7e17288..c7d514606300 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_104.plan index ecede7e17288..c7d514606300 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_105.plan index 0649f153d963..5574806ebacf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_106.plan index 0649f153d963..5574806ebacf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_11.plan index b9f2662a79da..38a57f6d7342 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_12.plan index 688709a72603..a81e6809d2c1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_13.plan index 12bad510acac..7e4df3f41a49 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_14.plan index 12bad510acac..7e4df3f41a49 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_15.plan index 6a5a49dfa0d8..798388e0cf75 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_16.plan index 035ffbba5eaf..9034311bbc47 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_17.plan index fb3dc758380e..2204edc9c02f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_18.plan index 1416d7004c36..8efa67788685 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_19.plan index 7929fa6684fd..1e65a64a2c71 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -111,9 +134,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -129,9 +162,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_2.plan index 0712e541c0f7..01f93e1b80b5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_20.plan index 7929fa6684fd..1e65a64a2c71 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -111,9 +134,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -129,9 +162,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_21.plan index 9cd5153eac24..abb055f661f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.b > item.c Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_22.plan index 9cd5153eac24..abb055f661f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.b > item.c Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_23.plan index 90e4e652a459..1225bc097345 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.b > item.c Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_24.plan index 90e4e652a459..1225bc097345 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.b > item.c Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_25.plan index 0878a129c366..fb135bfa99f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.d < 110 Or item.d > 150 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_26.plan index 0878a129c366..fb135bfa99f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.d < 110 Or item.d > 150 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_27.plan index d43eb9be1686..d3f0e60b1932 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_28.plan index d43eb9be1686..d3f0e60b1932 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_29.plan index bfb4282f4040..44c51a9eb195 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_3.plan index 0a85a7e29098..69c43eea0941 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_30.plan index bfb4282f4040..44c51a9eb195 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_31.plan index 1cb7cf84310a..02ab04ac7e8f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +141,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +169,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_32.plan index 1cb7cf84310a..02ab04ac7e8f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +141,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +169,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_33.plan index d498cd5dc990..d95fb5b2a727 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_34.plan index eddd8fba4f8d..79740277f28d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_35.plan index d498cd5dc990..d95fb5b2a727 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_36.plan index 535ec9135562..090ba916404a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_37.plan index d498cd5dc990..d95fb5b2a727 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_38.plan index 450d054245ea..22773e006727 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_39.plan index e8d1a40b1818..89bbacbb2049 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_4.plan index abb129883d42..c3e082776f3e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_40.plan index e8d1a40b1818..89bbacbb2049 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_41.plan index c70a013505f8..14398361c2d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_42.plan index c70a013505f8..14398361c2d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_43.plan index ac7e8a088cf3..b4ac2f9c432b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_44.plan index a623f708efe6..0056d51ef9b6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_45.plan index 58a564ba9641..b88f31407a5e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_46.plan index 58a564ba9641..b88f31407a5e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_47.plan index 1d0dc6fbd613..3730dc9d2ebe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_48.plan index 2fd4f948e90d..ee7952867d39 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_49.plan index 1d6025b42699..bd02140420c9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_5.plan index 8b115bc616c1..1603d213120f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_50.plan index dd886e8ac4fa..5c1b171be7af 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_51.plan index e924b1f69656..f09b99856702 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.a > item.b Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_52.plan index f56cc7a9d892..04e34fa8bede 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.a > item.b Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_53.plan index 21b69721e58f..6e808fb76413 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.a > item.b - 2 And item.a < item.b + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_54.plan index f9596f9d0b41..50aa0218eaf4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.a > item.b - 2 And item.a < item.b + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_55.plan index 6b43424eaed4..72c3aa00e154 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_56.plan index 3ae8810ca1a1..ebb61d1e6607 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_57.plan index 1dd100dfa6c7..22333c59a085 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_58.plan index c89b8043f63f..49d4b809ddda 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_59.plan index c70a013505f8..14398361c2d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_6.plan index 46a47c11a6ca..83519151e6a5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_60.plan index c70a013505f8..14398361c2d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_61.plan index 346365ea71b3..78dc50098e07 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_62.plan index f365bc234d80..168c5ebad002 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_63.plan index 988dde59f1a4..8369514ef91d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_64.plan index d87fa3ceff1d..f0a77750d31e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_65.plan index e354a3471768..ae69f85cafda 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_66.plan index 377dfc26f347..5bf6b7139381 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_67.plan index cec459457c27..451092dce868 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_68.plan index fdbdaeb699ca..de2f055478de 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_69.plan index ff1f7dcd0864..64d506834c4b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_7.plan index 311c57638c44..87e7e4ffdf97 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_70.plan index 5728dbc93dfc..0180f1007311 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_71.plan index e9cb277b1b9f..0a227a9adb10 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_72.plan index e9cb277b1b9f..0a227a9adb10 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_73.plan index e8d1a40b1818..89bbacbb2049 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_74.plan index d1d24cca74c0..e562a6f0ce73 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_75.plan index e8d1a40b1818..89bbacbb2049 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_76.plan index d1d24cca74c0..e562a6f0ce73 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_77.plan index 90ea5fcf08e3..a2efa262b6e0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_78.plan index d12d431f44ed..08efcc02f6db 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_79.plan index 5791bb3738f2..cc2ab1d9b46b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_8.plan index 2d4471e6b707..e82226763090 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_80.plan index 7a208efb155b..5c1f207abeee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_81.plan index 5b3097574ccf..61dbcb1f7483 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_82.plan index a3dec2683db6..e8132d9f3e44 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_83.plan index a72cb1d52967..357fa501096b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_84.plan index ba74e6340edc..4ce635293d9c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_85.plan index fec7802ff020..4ad8931b41c2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_86.plan index 04f149769513..3c71b66ce6a8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_87.plan index bd49706c9243..d75f6e4e8673 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_88.plan index 16c7f96fcecd..9dad4e1ba9a7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_89.plan index 4892f0b72b64..70752db41b6d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_9.plan index b9f2662a79da..38a57f6d7342 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_90.plan index b629b19b1296..c6968b027b8a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_91.plan index ea2431f4ec90..029dbb1e66b6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_92.plan index 59d99b0f3393..ac3d53207207 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_93.plan index 778243ba959a..7d119502fbc6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_94.plan index b104f8c2f713..787225c368d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_95.plan index 778243ba959a..7d119502fbc6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_96.plan index 6cc81abf1dcf..9a81df2ccc1a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_97.plan index 778243ba959a..7d119502fbc6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_98.plan index 6cc81abf1dcf..9a81df2ccc1a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_99.plan index 778243ba959a..7d119502fbc6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_1.plan index 650e264c308b..caaffd5d9933 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_10.plan index 001ea75b7f51..8684d4079f07 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_100.plan index d55bc2c45642..98f46b8c5f51 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_101.plan index 3e5a75318f2f..8fd3643e7d40 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_102.plan index 933ffddfdbcd..803e6f1408e5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_103.plan index 1a4f3c0bb628..a877b3ea136c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_104.plan index 037885d0188e..6e6ed792605f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_105.plan index 69bedcf9cfec..5fce7715ab37 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_106.plan index ad02f99b8e3e..3a6360f51439 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_107.plan index 13b604bf917c..f54253d5eb02 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_108.plan index f25ced06668a..cf2bfb691dfd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_109.plan index c87ef702fbc0..8888fecaf212 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_109.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_11.plan index 2ecb72f7d782..a2f4a5965dd3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_110.plan index e507fa83565e..3cf03e44acbd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_111.plan index af7667a67c1a..50d82005dedd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_112.plan index 624b34b5f731..1aea23a9811c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_113.plan index a65e7b78c6a4..f8cc916d6d4e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_114.plan index 2778388fdd22..6feeb30b39b5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_115.plan index 490033f81be0..f78ac96300cf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_116.plan index 490033f81be0..f78ac96300cf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_116.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_117.plan index 3e08f8dc6744..b7d355a45a5b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d < 110 Or item.d > 150 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_118.plan index 3e08f8dc6744..b7d355a45a5b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d < 110 Or item.d > 150 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_119.plan index a482bfd553be..c55dc5023a2e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.c Or item.e < item.d And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_12.plan index f633fa80d1ee..18093a1a8ed3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_120.plan index a482bfd553be..c55dc5023a2e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_120.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.c Or item.e < item.d And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_121.plan index dbed3019e38b..f08a67e6d562 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_122.plan index 5c61595a347d..ddc7a837c5a4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_122.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_123.plan index c6279399dfaf..97df7cf8754e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_123.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_124.plan index 89ba938d705f..8b33a6d12425 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_124.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_125.plan index 511cd93b2ccb..c8559f27bdde 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_125.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_126.plan index b786dbd3506f..b28789fbd29e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_126.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_127.plan index 14e9989ef026..120a9a7f3b17 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_127.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_128.plan index 14e9989ef026..120a9a7f3b17 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_128.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_129.plan index 6e2b07f8f408..ed0e6d2895b4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_129.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_13.plan index 55218bb7691a..45599b701c3a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_130.plan index 6e2b07f8f408..ed0e6d2895b4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_130.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_131.plan index dd42dbdb1fa1..93cc8f128b10 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_131.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e > item.a And item.e < item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_132.plan index 3f5d66ec7ba6..566373fb41ca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_132.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e > item.a And item.e < item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_133.plan index c74cbb5ad4b5..115bfc30a903 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_133.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_134.plan index d34f20a24545..180f663b2f06 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_134.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_135.plan index a84f773c42b9..2b38cd190850 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_135.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_136.plan index f650813e1a0f..93cd668ee2f6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_136.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_137.plan index 6b0c6c388dbb..daa00b66ff27 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_137.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_137.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_138.plan index b3923f96c4cd..856aa5e3869f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_138.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_138.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_139.plan index 6b40649fdf5c..db8339416cb4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_139.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_139.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_14.plan index 55218bb7691a..45599b701c3a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_140.plan index e96bb0c6b37e..25f318f8407c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_140.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_140.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_141.plan index a881b0a40f63..998da96d44b5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_141.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_141.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_142.plan index f7dedbd9df98..c64fbd20e14c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_142.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_142.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_143.plan index 81c84e1ec0e6..5f8fbac15d0a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_143.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_143.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_144.plan index 2074fce76c3b..5583a2ac36e7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_144.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_144.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_145.plan index d173b71a8eaf..95d8a2561ea1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_145.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_145.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_146.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_146.plan index 03b6e77447ef..e5d5bae8b961 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_146.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_146.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_147.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_147.plan index aa4c366eb373..4e594c6fed56 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_147.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_147.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_148.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_148.plan index aa4c366eb373..4e594c6fed56 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_148.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_148.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_149.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_149.plan index f12be5fe6a79..1c0f44045ffb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_149.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_149.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_15.plan index d4dc77f5864c..e5dc92a65e79 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_150.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_150.plan index f12be5fe6a79..1c0f44045ffb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_150.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_150.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_151.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_151.plan index dfba1ae10180..a0d76af206c1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_151.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_151.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_152.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_152.plan index 06ebf8867c83..58f9d1b3f126 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_152.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_152.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_153.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_153.plan index 7fca14e9d78e..8b1aef53ced5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_153.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_153.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d < 110 Or item.d > 150 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_16.plan index df682b4ea3be..9331e3d21600 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_17.plan index 8b1b3dc32234..58a9a4dfe97c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_18.plan index 6a5a74ab8151..e7c9058f8e13 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_19.plan index a65e7b78c6a4..f8cc916d6d4e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_2.plan index 650e264c308b..caaffd5d9933 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_20.plan index 4209b07a32b6..5715105c273e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_21.plan index a65e7b78c6a4..f8cc916d6d4e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_22.plan index 65dd418e2e79..a967cfbe56c1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_23.plan index a65e7b78c6a4..f8cc916d6d4e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_24.plan index de32df63b135..794c826d7a25 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_25.plan index a65e7b78c6a4..f8cc916d6d4e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_26.plan index a65e7b78c6a4..f8cc916d6d4e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_27.plan index 3a5558a61398..7ccf6f0b00c6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_28.plan index 3a5558a61398..7ccf6f0b00c6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_29.plan index 08cd759dcbee..c61eb3f2dc13 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_3.plan index 0b4dc14e37ec..5cf15588f83b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_30.plan index be3227df18be..f6310776223a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_31.plan index 31d4573f6ae8..6c11abd00ce7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d < 110 Or item.d > 150 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_32.plan index e7b5b532fd45..4b25ea8424b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d < 110 Or item.d > 150 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_33.plan index 7f512b2cecea..bcbb72cb759d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.b > item.c Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_34.plan index 7f512b2cecea..bcbb72cb759d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.b > item.c Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_35.plan index 3a98062d5486..a55bd02513f4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_36.plan index 87efcf08e417..56aa3711252e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_37.plan index 2adfa652c06e..1f1013826afd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_38.plan index 14017e27827d..8855eecf379f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_39.plan index bc0a982a1a2d..d488796318bd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.a > item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_4.plan index 0b4dc14e37ec..5cf15588f83b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_40.plan index bc0a982a1a2d..d488796318bd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.a > item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_41.plan index 35388e12498f..e60130a1b9bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_42.plan index 35388e12498f..e60130a1b9bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_43.plan index d9a06f4c9fe3..832c8e56b15a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_44.plan index d9a06f4c9fe3..832c8e56b15a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_45.plan index ee5993696472..543144a524a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.c Or item.e < item.d And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_46.plan index ee5993696472..543144a524a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.c Or item.e < item.d And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_47.plan index 27aef463d960..55e62abedae7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c > item.d And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_48.plan index 04110b02b84f..bfbe2a7be38f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c > item.d And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_49.plan index 0f11146d6938..b7772a81359f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_5.plan index 2bf38c983c8e..bbe8760179fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_50.plan index 0f11146d6938..b7772a81359f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_51.plan index 9d75337027f9..5746a12f32e4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c > item.d And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_52.plan index b697f89d0aba..8d21c73337d8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c > item.d And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_53.plan index 524e7408ea30..d752cad9f24e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c >= item.b - 2 And item.c <= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_54.plan index 1047f1154cc1..15d29664d318 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c >= item.b - 2 And item.c <= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_55.plan index 6ce08d70af52..0699bca2114a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_56.plan index 986e0baf2fc9..d26f1289ccae 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_57.plan index 9c16a43a661d..7ca0c77962e2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_58.plan index a98757cacd9e..835c89339cd9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_59.plan index 207f3afedb11..f2a2f9b95e89 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_6.plan index 2bf38c983c8e..bbe8760179fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_60.plan index 207f3afedb11..f2a2f9b95e89 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_61.plan index 12093dd016de..1684c95a2b82 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_62.plan index c48e8772d220..5354dce61593 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_63.plan index 105fcb61ebb3..89a6855a0447 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_64.plan index 105fcb61ebb3..89a6855a0447 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_65.plan index 169bb940e19e..094f5d742acd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_66.plan index 169bb940e19e..094f5d742acd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_67.plan index 5fdb5893d84b..5a5ef5ee750d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.d < 110 Or item.d > 150 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_68.plan index d36dfa756eec..37e614aede4b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.d < 110 Or item.d > 150 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_69.plan index 2cb6ab4e36bd..0b77e3e29574 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c > item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_7.plan index 9c77c8aaa908..46714c96fe06 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_70.plan index 67b36ebec966..145398035790 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c > item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_71.plan index 092550077108..cbea38a3bd54 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d < 110 Or item.d > 150 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_72.plan index 4bb57008ab30..1f978884daa2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d < 110 Or item.d > 150 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_73.plan index c0910f1ceaf0..fb4d1632c7ca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_74.plan index 1aba109783ef..be947ea9d595 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_75.plan index dfba1ae10180..a0d76af206c1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_76.plan index 2b90cb8f4b62..ba87c2c5d9a4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_77.plan index 4a4f59492393..dc37feccaddf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b - 2 And item.a < item.b + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_78.plan index 4a4f59492393..dc37feccaddf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b - 2 And item.a < item.b + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_79.plan index 1124a6bc2e2e..11c26c21f9be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_8.plan index 9c77c8aaa908..46714c96fe06 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_80.plan index 7086001c2154..fd62c6232e67 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_81.plan index cecbc160a00a..55827d466eea 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d < 110 Or item.d > 150 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_82.plan index 71ca81866d8b..79a3761c3851 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d < 110 Or item.d > 150 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_83.plan index eea574114891..62a5b202e9ca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_84.plan index 7036610be3c6..c046744c9e2a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_85.plan index 9c7df6ea0e55..5b1d390d2883 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_86.plan index 3491ee7ae3c5..58c37da234eb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_87.plan index eea574114891..62a5b202e9ca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_88.plan index 6d6792be01eb..66b905235a5f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_89.plan index f65daff8b187..7f58be270399 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_9.plan index 1f1d28f6dd72..ff3086efd1e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_90.plan index f65daff8b187..7f58be270399 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_91.plan index 558d35132e0b..4082dbb2326f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_92.plan index b30421258e16..012e0348ed4e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_93.plan index 16291a090938..1ceae95517cd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_94.plan index 3a19135bbcd8..08b9328a87f0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_95.plan index 52d954d21201..d27016861b3d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_96.plan index 52d954d21201..d27016861b3d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_97.plan index fde50a467fa4..c24044e6a741 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_98.plan index fde50a467fa4..c24044e6a741 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_99.plan index d55bc2c45642..98f46b8c5f51 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_1.plan index 0da4d0991756..98d7d0c7285e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d < 110 Or item.d > 150 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_10.plan index 7721cd095846..c753dc948926 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_100.plan index c67d6c75b5dd..7a17e40d2c5a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_101.plan index ee9095d9c170..d5fcfbee932f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_102.plan index 312f41a9e7cd..39221ddcda52 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_103.plan index 312f41a9e7cd..39221ddcda52 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_104.plan index 0700a9a6ea4b..ab9dbe48286d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_105.plan index 52b611878c06..e69b8645aed4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_106.plan index 30213eefa339..ec446710fdd8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_11.plan index 1d00416ef287..3191574930dd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_12.plan index a0a97b44f137..f10db48a0f4e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_13.plan index 8fd8c2f27d1c..56a76866a3fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_14.plan index 2911a751e979..36a3dfdcd6b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_15.plan index 4cfaeaf674be..7f2df1276329 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_16.plan index fc966c2ab2bd..357234e4ca9d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_17.plan index 0220050e8db0..9adbd696c20e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_18.plan index 51f2f7eb6c71..99ef46e3e69f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_19.plan index 51f2f7eb6c71..99ef46e3e69f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_2.plan index 05ffec063637..4c6a3c7b4e97 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d < 110 Or item.d > 150 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_20.plan index 07a899427643..43d1bbbc5e1a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_21.plan index b1e616b079cc..1f435447f5cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_22.plan index 9023e24efe62..11af6bb72123 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_23.plan index 9023e24efe62..11af6bb72123 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_24.plan index 40823fe0fe6e..b495fc0e586e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_25.plan index c4556a7285ee..fd8cadb5b72d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_26.plan index a103407fdf99..bcaeecdac915 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_27.plan index a103407fdf99..bcaeecdac915 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_28.plan index 024a6cc87d97..47fbee98eef3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_29.plan index 024a6cc87d97..47fbee98eef3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_3.plan index 3c1bccee6940..bc504250e204 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d < 110 Or item.d > 150 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_30.plan index 9023e24efe62..11af6bb72123 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_31.plan index 9023e24efe62..11af6bb72123 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_32.plan index 2249b832de76..e80cbce54731 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_33.plan index 2249b832de76..e80cbce54731 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_34.plan index 38ec80043e8d..148730c11c5d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_35.plan index dcd65b3e1fd8..0ef8d043126e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_36.plan index 0acc9c71d49b..36f3d2a94dcc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_37.plan index f98d2db593c8..73ea1eed6146 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_38.plan index f9d354c7f771..62e49b2f6020 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_39.plan index 54807125af09..a3ea0e3b289d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_4.plan index 302915e3de3a..ef5789a92c33 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_40.plan index e41843fdfa2d..f9d42b422eec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_41.plan index dc8e012dbd50..2b92c2678672 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_42.plan index 34fc111a5c01..062a3ee4c307 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_43.plan index 34fc111a5c01..062a3ee4c307 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_44.plan index b83f2b34f014..85582226862a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_45.plan index b83f2b34f014..85582226862a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_46.plan index e4189b0a7f25..99f4db804ee3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c > item.d And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_47.plan index 1ba658e5b581..f0ad0fe2cf51 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c > item.d And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_48.plan index 3b557aa15891..4bdd6095a9db 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_49.plan index 128f1525471a..4c7c49bca36e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_5.plan index 1e88224a931b..111483da2857 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_50.plan index cee5aec118dd..32f50a3d1744 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_51.plan index 9a0abb36a4b7..4438624bda9a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_52.plan index ddc127a5bf72..ae6bbf8a53db 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_53.plan index 5455ab20d42e..09ededc61373 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_54.plan index 48c9111f3249..f613149f4362 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_55.plan index 5b702b96c195..2599f6a86554 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_56.plan index faf128f0e9e0..eaff7f859df4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_57.plan index d0706e3e701e..c58ffb7d1b5c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_58.plan index 960c5ef3d8cf..2b21b32606f4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_59.plan index 960c5ef3d8cf..2b21b32606f4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_6.plan index 2a6c4996fd5a..c0df629be88a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_60.plan index 30e0abdd419c..357e5ff3c978 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_61.plan index 30e0abdd419c..357e5ff3c978 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_62.plan index b62e38d43da3..f6d67aebd0e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -108,9 +131,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -126,9 +159,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_63.plan index b62e38d43da3..f6d67aebd0e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -108,9 +131,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -126,9 +159,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_64.plan index a0dfa2a3ae92..3512114f3585 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_65.plan index b79665352db3..c1d27d39f5d8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_66.plan index 4c0587f0dac8..7281c619497b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_67.plan index edc27f355ddc..a4dfd7ee6f64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_68.plan index 12c2da99fbab..5cdacccdb76a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_69.plan index 81729b53a212..2c7b9719384a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_7.plan index a9a16d361bed..b3900480ce5a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_70.plan index 049cabd5858a..a18cc9a9c5e2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_71.plan index fd7606d4236c..3f76d7656de8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_72.plan index e41843fdfa2d..f9d42b422eec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_73.plan index f2140d5a0823..b92835e0ea15 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_74.plan index 8bbeb94ead59..f01c00433810 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_75.plan index 4d75df42af8e..e02bab7b2cf4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_76.plan index 55d0778727ff..26a60c1b12cd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_77.plan index edc1130f0877..b66363a82b10 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_78.plan index 82b3aafb6b00..b6fec4d36cc2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_79.plan index 41369ec07067..53e93d86bb7e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_8.plan index 6d257a620f0b..fbf172383ce9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_80.plan index 32b0edf5b2b3..b707eafaf148 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_81.plan index 13dbf5495295..43f77f609c66 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_82.plan index b4d57fd7de0c..b9af6810fb20 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_83.plan index 58a46aaf9b5f..90e45659f3c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_84.plan index 9e8faf72c6ef..3c3ccdf1857e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_85.plan index 9e8faf72c6ef..3c3ccdf1857e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_86.plan index 4df755b777f8..cd0a1e8eee1b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_87.plan index 4df755b777f8..cd0a1e8eee1b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_88.plan index faf128f0e9e0..eaff7f859df4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_89.plan index faf128f0e9e0..eaff7f859df4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_9.plan index 3204d4bc1048..6e67a7c6d4b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_90.plan index 77e210193ff7..52222fffd735 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_91.plan index 73b8a49334c5..a6d0e167daef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_92.plan index 13e09fd46fa7..84dd8cef8375 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_93.plan index 13e09fd46fa7..84dd8cef8375 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_94.plan index 17c8ed85cc52..95899358247e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_95.plan index 647f5958dec6..eb7147a0b54d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_96.plan index a2c9f95dc7ef..6aa896a60928 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_97.plan index a2c9f95dc7ef..6aa896a60928 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_98.plan index 13d2350dca2f..8c365a01f3c0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.a > item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_99.plan index 5a7d9c93cad5..66d6c24584b6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.a > item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_1.plan index 6b5163b37d12..33fa143d9f67 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_10.plan index f0020c08beb6..28939ed7dc5f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c > item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_100.plan index d78100aa8ceb..16f4e8474b86 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_101.plan index f09110f8d97d..33740480a300 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_102.plan index 4a40c6e74f49..d88833390666 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_103.plan index 29b4eb6acd99..8615fb76abf6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_104.plan index d8b7e065e759..baceaf1afe52 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_105.plan index 26d366430388..db971caaf4fe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_11.plan index 7aa204b03f75..06f795c58d9c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c > item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_12.plan index e63c60c78f81..cffbf61b1607 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_13.plan index e63c60c78f81..cffbf61b1607 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_14.plan index 7d0ed3e34609..2352707799b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_15.plan index 494d7e098ab8..591f3fa66802 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_16.plan index b662a9d33853..0fd13bf87e7f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_17.plan index 1d2993873a34..8d3be87c6a89 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_18.plan index 424090dbf0d0..ccbbd92ee006 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_19.plan index bbcc3b6dd7b7..5ac9c45afcc5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_2.plan index 0ae437493cd8..b5a01ae258ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_20.plan index 7f40a4c0baed..8d10675e6b8e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_21.plan index e5027111f4f3..f97ece4f2bf5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_22.plan index c622ca418de7..fc8f5394f3f8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_23.plan index 40a2d76e3da3..b94adf5717ae 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_24.plan index 31751d5ae66d..b62ab080bee2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_25.plan index 31751d5ae66d..b62ab080bee2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_26.plan index 9ccc635c8364..6f81e18a6df0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_27.plan index ebe465fe8a0c..e9d423657b15 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_28.plan index b01618bec992..4ee0e4702854 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_29.plan index ec490f3c6b71..3ca38c8f73c8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_3.plan index 0ae437493cd8..b5a01ae258ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_30.plan index 91eb1a8e0de1..373199ea1b8d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_31.plan index e4a3ad13b080..e5e23bbde66a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_32.plan index f7738b7b9044..a76e40ad3ef2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_33.plan index f7738b7b9044..a76e40ad3ef2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_34.plan index 91e980b664e2..ddcf3e667041 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_35.plan index f76ab6c0fb01..d4edeabd7322 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_36.plan index b5bff2aad670..0098913552e4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_37.plan index b5bff2aad670..0098913552e4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_38.plan index 6caf04c4204d..84b1ef4f42cc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_39.plan index 617a59b5df58..ad93d6012820 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_4.plan index c0ceb0a89a7d..25ad052d89e4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_40.plan index e27bcdf80e60..7cb4abc31841 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_41.plan index e27bcdf80e60..7cb4abc31841 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_42.plan index 507e4e867076..3e2ce6306c25 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_43.plan index d20c9926be1d..7aa5ae3949e9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_44.plan index 09e19e975466..d8b2a8e74b5a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_45.plan index 09e19e975466..d8b2a8e74b5a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_46.plan index 19ee373beb63..c91c49c6d2d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.c > item.d And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_47.plan index 19ee373beb63..c91c49c6d2d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.c > item.d And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_48.plan index 468ded874276..3a70b80444e5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_49.plan index 468ded874276..3a70b80444e5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_5.plan index c0ceb0a89a7d..25ad052d89e4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_50.plan index 270c13b5b324..3327aa2616c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_51.plan index c43b452bcebf..cf6ce5255102 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_52.plan index e89461b65a47..d88bda82fdd1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c > item.d And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_53.plan index 9310fe653ddf..c01e464f5e61 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c > item.d And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_54.plan index a0350074b598..23167abed1c8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.d < 110 Or item.d > 150 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_55.plan index 40f8b8ca5de5..1cb272cc684d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.d < 110 Or item.d > 150 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_56.plan index a9687e4282ea..4d8fc1eef0b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.d < 110 Or item.d > 150 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_57.plan index 976294c08e1d..6b09028842e0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.d < 110 Or item.d > 150 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_58.plan index 9c98676e7d19..75f2ff9686d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_59.plan index 0671ae6825d0..aebeb1c8d18c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_6.plan index 6aca2de305d4..94521a2c2f7f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_60.plan index 2a8fbd2ad424..1a5ae5747d75 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_61.plan index 42e8336a509b..6fcdb4ee26ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_62.plan index 093f9e31f015..3cac561d0085 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_63.plan index 093f9e31f015..3cac561d0085 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_64.plan index 2d962e667a3b..0ee8be486959 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_65.plan index 2d962e667a3b..0ee8be486959 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_66.plan index 5bf8edced75f..e82b4589ccc6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_67.plan index 5bf8edced75f..e82b4589ccc6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_68.plan index c22b375958dd..3d095ba65f13 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_69.plan index 9ac7ac2e0c87..52602a7ced3d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_7.plan index 6aca2de305d4..94521a2c2f7f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_70.plan index 033bd50fc68f..5efe281b30a2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_71.plan index f11ef24b0a6b..beb149ecb4a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_72.plan index 79546570af2c..c38d458625ed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_73.plan index f065cda3e380..9a1a1e2a3851 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_74.plan index b6ba3f9e5035..257f7e1da530 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_75.plan index b18fa3f78943..5ec08765d8d1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_76.plan index a31cd9d3d320..0178206da0b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.e > item.a And item.e < item.b And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_77.plan index 52f6cb1dbea9..f317a29ed5c2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.e > item.a And item.e < item.b And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_78.plan index d8741be6c6be..b67313ecb76f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.a > item.b And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_79.plan index e26f0d547fcc..17b9a515e849 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.a > item.b And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_8.plan index 8a2b617d657e..a96ceab0a448 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_80.plan index 61084e932391..bc668361219f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_81.plan index 6aebe1bbfc4a..8f5729db1052 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_82.plan index 1bbcfe74a7da..b4b077a6fb18 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_83.plan index 1bbcfe74a7da..b4b077a6fb18 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_84.plan index 0a42be521d6b..f0bf2a428f97 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_85.plan index 0a42be521d6b..f0bf2a428f97 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_86.plan index 50032ddf77ea..9f6f34553a2d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_87.plan index 40038e981f1d..c4551326f471 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_88.plan index 6ee06ab81c03..88d7f761bda8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_89.plan index 9982bdfefb9a..e92c29e80bc7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_9.plan index 8a2b617d657e..a96ceab0a448 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_90.plan index 76bdb10126cd..330243ad3272 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_91.plan index 243ec06aee77..face649333af 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_92.plan index 6825bedfc79a..76c723c44b0c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c > item.d Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_93.plan index 6825bedfc79a..76c723c44b0c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c > item.d Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_94.plan index 952b4ce17416..208c31b41dbd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_95.plan index 952b4ce17416..208c31b41dbd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_96.plan index 281e6441f9ab..30bca6f18590 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_97.plan index 281e6441f9ab..30bca6f18590 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_98.plan index 9627c8880b9c..7e9fc96dc323 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_99.plan index 9627c8880b9c..7e9fc96dc323 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_1.plan index a5b5fd49c2a5..3df66055a2fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_10.plan index bc57311c6b1f..a5b157b5d7b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_11.plan index 56c9da857517..c4c17bd79126 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_12.plan index cbd99db9ea2b..ca34666b12e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_13.plan index e4b9ba20f76a..0015d4cbcc30 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_14.plan index d6fe81a529f7..8b9898b0142e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_15.plan index 5e89c1d1caec..e59b943d0b50 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_16.plan index 5e89c1d1caec..e59b943d0b50 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_17.plan index bae2b0e67353..52a30a2bd84e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +141,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +169,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_18.plan index bae2b0e67353..52a30a2bd84e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +141,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +169,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_19.plan index c825e56652e2..52993c846b50 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +141,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +169,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_2.plan index edb5cd92bda6..604d36a3a746 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_20.plan index c825e56652e2..52993c846b50 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +141,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +169,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_21.plan index 26326ce69c87..2baa61bef080 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e > item.c Or item.e < item.d Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_22.plan index 0b474ccc712a..ed0e90413b7e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e > item.c Or item.e < item.d Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_23.plan index 4aa1e9f9c355..7b16abfb7c0c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e > item.c Or item.e < item.d Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_24.plan index af3f775ede70..cb5f2e6c67f6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e > item.c Or item.e < item.d Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_25.plan index 7d41f7e3cba0..3c2011e6fef5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.b > item.c Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_26.plan index 92b47e53cc98..9d92274d002d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.b > item.c Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_27.plan index dc70503885cf..0108cb6646bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.b > item.c Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_28.plan index 4d25420c28e5..ddd5751a9630 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.b > item.c Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_29.plan index aa1123f7bfe9..803639df8312 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_3.plan index b38b660cebdd..a8b2da2947b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -109,9 +132,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -127,9 +160,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_30.plan index 743ab8995f49..7dea815c1098 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_31.plan index 4e9ec7b7cc23..524dcd94791d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_32.plan index 4e9ec7b7cc23..524dcd94791d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_33.plan index c3e5033dd1bc..6f9a718383a2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.e > item.c Or item.e < item.d Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_34.plan index c3e5033dd1bc..6f9a718383a2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.e > item.c Or item.e < item.d Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_35.plan index 11fdb3c7b438..fb71ce9d0fc1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e > item.c Or item.e < item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_36.plan index 11fdb3c7b438..fb71ce9d0fc1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e > item.c Or item.e < item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_37.plan index 37fee3454df2..31844d1c6357 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.d < 110 Or item.d > 150 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_38.plan index 37fee3454df2..31844d1c6357 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.d < 110 Or item.d > 150 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_4.plan index de80184cc0f2..3f7eacafb188 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -109,9 +132,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -127,9 +160,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_5.plan index f1dbf26b52ea..946c9d5306f1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c > item.d Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_6.plan index 011103c6d9db..8b9c4bfaa7ec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c > item.d Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_7.plan index 2b886c84d212..e42b596ff0b5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.b > item.c Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_8.plan index d94d78095092..b7f36c78b4cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.b > item.c Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_9.plan index 9f0258d79898..5660d4f9a0cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_1.plan index c226dd4321ab..15fc0b6b1018 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.b > item.c And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_10.plan index 19dd90137628..eeb5879b029b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_100.plan index 69cd8123fe9d..26d88e164350 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_101.plan index 974cf0413133..d721591d4fa6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_102.plan index d37419c6c8e0..a5b235ead157 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_103.plan index f805e49040ee..0055de68cad9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_104.plan index fa4d1851398a..02654ad58ae0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_105.plan index fa4d1851398a..02654ad58ae0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_106.plan index 365810cdb0b8..7716862f3dab 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e > item.a And item.e < item.b Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_107.plan index cf9e1d94966e..b8e9619d3bb9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e > item.a And item.e < item.b Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_108.plan index 95ea86a9582d..7e831cb3c03c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.d > item.e Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_109.plan index 95ea86a9582d..7e831cb3c03c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_109.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.d > item.e Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_11.plan index 19dd90137628..eeb5879b029b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_110.plan index 4bcb158de4c0..b7113a8ae747 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.d > item.e Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_111.plan index 4bcb158de4c0..b7113a8ae747 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.d > item.e Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_112.plan index 66321cdedc42..748aa3d9764a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_113.plan index 66321cdedc42..748aa3d9764a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_114.plan index 19dd90137628..eeb5879b029b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_115.plan index 19dd90137628..eeb5879b029b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_116.plan index c36228e4defb..2655bd5bd301 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_116.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_117.plan index c36228e4defb..2655bd5bd301 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_118.plan index 8bd72acf3704..c3e11afd78f1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_119.plan index 1b7b2dc8dc51..671591c8c78c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_12.plan index af8822691411..153c49bd0ce0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_120.plan index 8cb7e44ee438..9b458f67e655 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_120.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_121.plan index dd50038cc494..c8f2616b3805 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_122.plan index 29ae6f78cd1f..08c51f25df36 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_122.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_123.plan index 27da5310da32..75113a47d561 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_123.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_124.plan index 8251e6caedad..960e9d54cadc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_124.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_125.plan index 8251e6caedad..960e9d54cadc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_125.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_126.plan index 37d5373d53cd..d6461f559369 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_126.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_127.plan index 1d8c79c6c023..9409fea1e741 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_127.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_128.plan index 8b96a3cdf0c5..79b51ff4d06a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_128.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_129.plan index 87b04199f464..7878c16ec86d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_129.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_13.plan index a7d0be8b4fe5..bbc930fffa5d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_130.plan index e23617f66794..03adebaf922a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_130.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_131.plan index 4acf4cf8fce8..127add5e9b50 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_131.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_132.plan index e826e6a3f830..d6b2d1dd41ab 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_132.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_133.plan index 2aac57a5a733..e1b15ac56f28 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_133.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_134.plan index 53a7e46e7e4a..545f132529df 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_134.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_135.plan index 10e5f775af69..2f21f6b3b5af 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_135.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_136.plan index c8552efc77b7..bcd5f5a29b77 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_136.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_137.plan index 385482392656..ea2346177b4f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_137.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_137.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_138.plan index ed14607c83fd..dc0f7c873791 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_138.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_138.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_139.plan index a474af86afed..b867843c0723 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_139.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_139.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_14.plan index 2dd731b22bab..2c1cb0f412f8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_140.plan index 18da7ee2e262..03a2b49d5fd4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_140.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_140.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_141.plan index 7be9d30fb0c0..732aac01ebc2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_141.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_141.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_142.plan index 474d3d380f2c..08bc289566ca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_142.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_142.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_143.plan index 474d3d380f2c..08bc289566ca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_143.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_143.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_144.plan index 9d83a5c4c67e..1b33c93ad1cd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_144.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_144.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_145.plan index 582a727454c7..096f30d230c9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_145.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_145.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_15.plan index 883426733153..cd162a319c84 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_16.plan index 2d8c90ca0e49..ff21461ec4be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_17.plan index 0a3bea2467f1..10e3f25fe8a6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_18.plan index 2e387c2ae27f..ea81061e61b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_19.plan index 735413004b92..98c8690d0f98 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_2.plan index 54cc2bc85a7c..f6b0b2026f5a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_20.plan index fca63d0420cd..dab4e783f8a9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_21.plan index 66bdd6e878d7..fe2875c87af1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_22.plan index 645c9937e36d..27d298687f32 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_23.plan index 712d31184d92..809d065a4db1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_24.plan index 3d4f3ff60b33..4bd43afe0a0d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_25.plan index 4c4214b50910..6baf3ba7368e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_26.plan index 77180e1e9a90..b440cd4b2327 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_27.plan index 8eb5f9eb8bc0..96cf52a7bf57 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_28.plan index 90c63906f65b..8897060d196a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_29.plan index 608e2a5bafc1..768e5b67d05f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_3.plan index aefa1e02cb85..b667f0092a22 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_30.plan index 0785a46dd0d5..889f5072f372 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c > item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_31.plan index d3787043f628..b4ce525eef04 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c > item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_32.plan index 5971320d5ac2..497c3e683a85 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c > item.d Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_33.plan index 5971320d5ac2..497c3e683a85 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c > item.d Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_34.plan index 6a69985b806c..6a159e9d30bd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_35.plan index ce9295b70e28..6770959bd2e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_36.plan index d8da9db3a3f1..2ffb9fdfee61 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_37.plan index 174177457613..1955832f864d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_38.plan index f5ce0cce8d0e..51559bb24a91 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_39.plan index 5164f418aeb7..ef1dd692d45d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_4.plan index 6a4b16d48525..9359abc5e25d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_40.plan index e291c28534c7..7f8c801f4c8c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_41.plan index 155fdc4cf2a1..7a208bea25b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_42.plan index fca63d0420cd..dab4e783f8a9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_43.plan index 0f1fa29fb106..e2a0395c5882 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_44.plan index 711ea80dc804..7eb339c28f1a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -83,6 +110,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_45.plan index a51500681b5d..d940f271a8ff 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -83,6 +110,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_46.plan index 2f52b094e7d2..b7a446d07345 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_47.plan index d9124d6535d8..0a8508560865 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_48.plan index 8185270e307a..91799f3ef0e7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a > item.b Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_49.plan index c7322d7d52b9..e33161e1d490 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a > item.b Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_5.plan index f3d737024bb5..09934cad19fe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_50.plan index 8cadbacdc3ef..a5b08009daba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_51.plan index c73ad286ffce..771498ad0f10 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_52.plan index fca63d0420cd..dab4e783f8a9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_53.plan index 88c85162d48c..ae9a764bc5b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_54.plan index b22b466fbd7f..30c04f738829 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_55.plan index b9f7434ade63..647814cb9f8a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_56.plan index 20955bb6013f..7c2808cd4085 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_57.plan index ead0b9d6c929..c6c60d60dc4c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_58.plan index e1c0ba232a35..1ee9c1315599 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_59.plan index 62d601b639d1..b0d4c7c93bcd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_6.plan index 62451a2ae775..310794c3423a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_60.plan index b470ddca77b5..9a1a3b3d36fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_61.plan index 53f132a0e0a4..cc5b98e8840c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_62.plan index bfdabe92435a..600885fb4cb5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_63.plan index 9bc919ace9b1..fd90509893e2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_64.plan index 77528e210dc1..0458edba3d56 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_65.plan index a33d7aefa9ef..50495c8e736b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_66.plan index 378929fb82db..9dc85a94275b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_67.plan index 8c5b7359b5a4..16d96904dbdb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_68.plan index 150a1435827e..efad3f11d3b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_69.plan index ec8f5ba1cf22..f66aac8cc71c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_7.plan index 62451a2ae775..310794c3423a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_70.plan index 93a97b9555c4..2981fc353dde 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_71.plan index c54b424a9717..c998bcdbcc73 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_72.plan index 86b0a0cbe4de..14bfbe02c5d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_73.plan index f30807716478..7d5614e5ed15 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_74.plan index cb008c613a93..5bccfe6b70d8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_75.plan index cb008c613a93..5bccfe6b70d8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_76.plan index 150a1435827e..efad3f11d3b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_77.plan index fc596e58765f..a02ad7eeffb4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_78.plan index 69859b48c8c8..9ccb0d5c3ccf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_79.plan index 39681b7dc6bc..4481cbb8eed9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_8.plan index 5c78069db822..f594dfcb41fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_80.plan index 11a8435846a8..0abe153e05f2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.d > item.e And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_81.plan index c1ab57dfa2bf..fa8f5f7361b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.d > item.e And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_82.plan index e95a5d349439..bc1bef4cb8e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_83.plan index 57614ff8302c..eec032491740 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_84.plan index 77861b6c8b4f..569a351825e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_85.plan index 2a0634c980aa..4f3ad4d31d71 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_86.plan index 3ede896cf708..0251588ea6ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c > item.d And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_87.plan index 3ede896cf708..0251588ea6ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c > item.d And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_88.plan index 75059a870956..feb54095934d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.c Or item.e < item.d And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_89.plan index 75059a870956..feb54095934d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.c Or item.e < item.d And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_9.plan index 5c78069db822..f594dfcb41fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_90.plan index b94f79976747..143c951ea222 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_91.plan index b94f79976747..143c951ea222 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_92.plan index daa7c0325c80..47f71744ba04 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_93.plan index 40bc341c22c8..26952d591f60 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_94.plan index bd3fd1ee212c..abfbc5503b1c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -110,9 +133,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -128,9 +161,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_95.plan index df9905f5945d..b0fd177e02f0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -110,9 +133,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -128,9 +161,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_96.plan index 3a09929c608d..602466711128 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_97.plan index 3a09929c608d..602466711128 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_98.plan index 86b0a0cbe4de..14bfbe02c5d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_99.plan index 2a980a1323aa..af2639ccc271 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_1.plan index ec1518271afb..cef4c60554b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_10.plan index da417360d193..1433802a4bd9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_100.plan index d66c59265653..1715d568d7f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_101.plan index d5d744156fe5..4bb656fdc752 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_102.plan index fd38a642b14e..946de92af86d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_103.plan index 9a3a4c3e7697..406e2ff657d2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_104.plan index 2ab16eea380c..80144b9918e6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_105.plan index 2148b5c75de3..58d7f3bf88d2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_106.plan index 98e917273f80..c528e05c462d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_107.plan index 024b79298be6..69abb59efab0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_108.plan index 81d884c3054b..3dda65c3ae19 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_109.plan index a84ebb123ece..18854eaf205e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_109.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_11.plan index d88e2c47b8d6..e96c4dec91a4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_110.plan index eb3fb051eb1e..097c524a3523 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_111.plan index 772761989009..2757560914dd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_112.plan index 437e3ceb5508..1e6d7123553d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_113.plan index 921e4e9501c5..c59c6cc148f2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_114.plan index 222ec073dfd1..6b67c675a172 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_115.plan index c5d8c09118b3..0f5ccfdc42ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_116.plan index ecce79d0d54e..faeb4f5592e2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_116.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_117.plan index 754e32b3bc83..cda8ef7be8e6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_118.plan index 754e32b3bc83..cda8ef7be8e6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_119.plan index 2768a9b01870..cfbe5100b121 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -111,9 +134,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -129,9 +162,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_12.plan index 7c1495673657..7cd58f250e08 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_120.plan index 127909946326..94d8304ee1ef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_120.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -111,9 +134,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -129,9 +162,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_121.plan index 1e0046c0eeb1..c9c2050df4ad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_122.plan index f849fee31fa4..dc98c5e9044d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_122.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_123.plan index 6838db07d61b..a2729f64f976 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_123.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_124.plan index 6838db07d61b..a2729f64f976 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_124.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_125.plan index 148df90b14b0..0e6f8b930727 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_125.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_126.plan index 43c826ab7062..1184b86aa6cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_126.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_127.plan index f2e136707f5e..68e3c4b75ef5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_127.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_13.plan index 641f7958d84a..dbd9af5b06b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_14.plan index 94056cc802ac..a3c11d5cb4d1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_15.plan index a1fe3b1e6e71..4eb483e5498e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_16.plan index 6fb66cffca22..297141f86e38 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_17.plan index fe4b15a2ce86..00efc3801126 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_18.plan index fe4b15a2ce86..00efc3801126 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_19.plan index e46486b732e1..22f78ee01f47 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_2.plan index b1aa52524edc..ccac13cc7f63 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_20.plan index 46a6d9a31fca..fa771719f523 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_21.plan index ce0d9783513c..01757acf9292 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_22.plan index afb9abad68b5..83859387e512 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_23.plan index 382bd6721ac4..ae9230cb8e12 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_24.plan index 382bd6721ac4..ae9230cb8e12 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_25.plan index 251eaf116a9c..63633967156c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_26.plan index 251eaf116a9c..63633967156c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_27.plan index a1fe3b1e6e71..4eb483e5498e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_28.plan index 0d488dd10ad8..34b0ebab800e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_29.plan index 8417b9ec91c3..e477522c20ed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_3.plan index 30930f14e715..a1ab8b1378d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_30.plan index c32bacf44ef5..ce2cf78343b5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_31.plan index 233d0d727557..3bb3d57de0a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_32.plan index a1802b4c30f9..a79f49a03306 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_33.plan index 9f32a9b40f69..6b168dc7a7ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_34.plan index a8233f361b50..ec16978c8830 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_35.plan index 74fdebafccf7..4ccfc15f02fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_36.plan index 74fdebafccf7..4ccfc15f02fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_37.plan index 2e02a1a2210b..9598132f5da4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_38.plan index 527bf115f4d2..87cb9177d1b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_39.plan index 5960ad3d2891..3572d3495d3b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_4.plan index 064603eae1d9..a1fa79810a3c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_40.plan index 300a3845104a..9bd6a744061d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_41.plan index 7174d30e11e8..7203b444adbb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_42.plan index 7174d30e11e8..7203b444adbb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_43.plan index 8417b9ec91c3..e477522c20ed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_44.plan index 2d94b7ba2527..d1b915df817d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_45.plan index 8417b9ec91c3..e477522c20ed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_46.plan index 0c82ecf48410..6f40dfb9ba8a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_47.plan index a5a139c2ccb2..aa6fc2081796 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_48.plan index 700550f5f5ad..1ac4343c993a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_49.plan index a814a07a8c4a..e4f166f330dd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_5.plan index 9d44ca44fdcc..18411382f3e0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_50.plan index 32e236a70dc7..4b501a2ca3bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_51.plan index c0a14a711173..c6022ef32e42 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d < 110 Or item.d > 150 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_52.plan index d6030efe9a04..deacc9f74ab4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d < 110 Or item.d > 150 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_53.plan index 295816a02736..323210143a74 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.a > item.b Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_54.plan index 346092e42eac..3d0ed1510bab 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.a > item.b Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_55.plan index cab0330e4607..e041a199fe7f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c > item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_56.plan index afeabb9116e9..5ac001cc2a4b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c > item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_57.plan index a32b0e4eee20..5900be508b94 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_58.plan index a32b0e4eee20..5900be508b94 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_59.plan index fc41e2f9db52..3c4cd3747d20 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_6.plan index 3eeec5533656..6f7d2ac2d1c1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_60.plan index fc41e2f9db52..3c4cd3747d20 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_61.plan index 30887fa1e034..bbbbf8db934b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_62.plan index 30887fa1e034..bbbbf8db934b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_63.plan index b401f13b3199..a3b87da62ec4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d > item.e And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_64.plan index b401f13b3199..a3b87da62ec4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d > item.e And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_65.plan index 567d64a13a68..cf66a35f6d16 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.b > item.c And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_66.plan index 567d64a13a68..cf66a35f6d16 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.b > item.c And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_67.plan index 3aa5d94cf28a..64c07ec6249d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.b > item.c And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_68.plan index 3aa5d94cf28a..64c07ec6249d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.b > item.c And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_69.plan index 3d5447028adc..a06fd992027d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.d > item.e And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_7.plan index 59cc0ccadacd..52cd4a9ace12 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e > item.c Or item.e < item.d Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_70.plan index 3d5447028adc..a06fd992027d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.d > item.e And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_71.plan index 760f30fda7c2..71cd7ee07f6d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_72.plan index 760f30fda7c2..71cd7ee07f6d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_73.plan index 8d5ffdcbc189..6cbc84637eb8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_74.plan index 599542238929..87b484eaf046 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_75.plan index 36b4266f241c..6fef2eea1f39 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.a > item.b - 2 And item.a < item.b + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_76.plan index 525f8d6efdef..c11ad796c560 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.a > item.b - 2 And item.a < item.b + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_77.plan index 9ce31875e677..bcc18797823f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.e > item.c Or item.e < item.d And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_78.plan index 8687c84beb44..654ea76aa9cd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.e > item.c Or item.e < item.d And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_79.plan index 7d60d11c52a2..824ac713e17b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.c Or item.e < item.d And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_8.plan index 2a0cf2d5208d..5a65ebb68531 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e > item.c Or item.e < item.d Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_80.plan index 7036fcf3485c..e59f52676e66 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.c Or item.e < item.d And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_81.plan index b752a1595bb1..1971f0088465 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_82.plan index 7df63adf3db5..2c31cf1644c0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_83.plan index 02f884332a60..29216d69a199 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_84.plan index 97307e101fe1..7cbaf553953f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_85.plan index eebbd2c302b9..94a8b92b30f4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_86.plan index eebbd2c302b9..94a8b92b30f4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_87.plan index b8979b4ab434..73c3d2ecac94 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_88.plan index bff68c32f20f..d2eca6dd9181 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_89.plan index 00553c2f0346..46eec5757efe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_9.plan index 81d6a26058a4..232664fc5fac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_90.plan index 4856fbb4cf7b..33a588295f43 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_91.plan index 1f1e02970e8d..bf9cced8a565 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_92.plan index 7c57314138ab..531c767ea25c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_93.plan index d13d0055a24c..77686d33b7e8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_94.plan index ce3c36731f4e..904b2e7538d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_95.plan index c5d8c09118b3..0f5ccfdc42ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_96.plan index f5b33a03df54..6476a5974f64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_97.plan index ed6fe94af909..ff186c587ea1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_98.plan index 0ef8c2e1e16f..f02b25a81919 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_99.plan index 30ba60e7f502..ba206e9f6c2c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_1.plan index 310de584c720..b2ac5fdfdfdc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_10.plan index a7b3f672533f..dad93d000a8b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_100.plan index 11e6fa77decd..4b2b1a431f5e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_101.plan index fd0fbdbccbf5..c2aa5eef1851 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_11.plan index a7b3f672533f..dad93d000a8b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_12.plan index 7cc296108908..9b08bbc8b0dd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_13.plan index 7cc296108908..9b08bbc8b0dd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_14.plan index d213d061579a..2c7857aea5e8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_15.plan index 8e3eebc752a5..e798777250e7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_16.plan index c7e3142842e0..c87bcc84cf14 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_17.plan index 9e38b33ef73f..150182240726 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_18.plan index 725c90ac4610..db776103bdd6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_19.plan index 725c90ac4610..db776103bdd6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_2.plan index bb8783a8e6c5..c0e6a5c2656e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_20.plan index 88c1f153a52c..1c9c69c0f880 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_21.plan index 965642095fec..ec3dd6fdc8a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_22.plan index b7c8539f9ac6..9d89754299aa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_23.plan index 0416003c5890..2add91b6359d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_24.plan index 3bb49b55038e..315a36d8a949 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_25.plan index 168027ffd3b8..dbe2d120ba81 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_26.plan index fd77899a0a60..712a5b95a0cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_27.plan index fd77899a0a60..712a5b95a0cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_28.plan index 39d8ddadcb84..a8b0fd6d1c90 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_29.plan index 28fd8b744dab..da9dc92ced07 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_3.plan index bb8783a8e6c5..c0e6a5c2656e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_30.plan index e96fdf28b7c3..5a4be9932220 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_31.plan index e96fdf28b7c3..5a4be9932220 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_32.plan index 5eb43b8da0df..5473c242d149 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_33.plan index 5eb43b8da0df..5473c242d149 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_34.plan index 9ab72d4dd4d2..539868014925 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_35.plan index 9afa1090ebb5..e8f609e89bf6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_36.plan index b3d70e006121..c91ef8d1779e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_37.plan index 62b46896cad0..6fb06ee4cfcf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_38.plan index 9bcb1321cbfa..fbd1328eecc7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_39.plan index 9bcb1321cbfa..fbd1328eecc7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_4.plan index f807b404d2de..c76a8a24e1e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_40.plan index 64c778c28019..1f3fa5869924 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_41.plan index 357559bc6087..116659fcad10 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_42.plan index 8bb2269bd990..2a40f6e024c9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_43.plan index 8bb2269bd990..2a40f6e024c9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_44.plan index b128edd75401..e1daab413dea 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.b > item.c And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_45.plan index c897b597ffde..c00c12860f3e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.b > item.c And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_46.plan index ee1e0c8647fe..b33671a0e71b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_47.plan index 3158d511c07e..e7f60c1e0dae 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_48.plan index 74eedee6f1c7..1450da2dcb87 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.b > item.c And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_49.plan index 3a4ab37e14da..6ec3535803ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.b > item.c And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_5.plan index f807b404d2de..c76a8a24e1e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_50.plan index a8a3f7307d65..8d72b9237f59 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_51.plan index 8ec0483d7b69..5d8c8068b204 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_52.plan index 7b7ea5b20d1a..8cedfbd7435c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.a > item.b And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_53.plan index 5bbe55740bc9..16d1ac48412e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.a > item.b And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_54.plan index dba84f1f0fdc..f2d2eab810f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.d > item.e And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_55.plan index 93eb57c37bf6..77802857622d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.d > item.e And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_56.plan index 322b458dc773..5d04761f4b9b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_57.plan index 13dc58f0cd4d..78cc81e9905f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_58.plan index 3572ebe0dba4..08f3d9b07be1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_59.plan index 3572ebe0dba4..08f3d9b07be1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_6.plan index e683b8eb4c13..e4262d501866 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_60.plan index 1bad0228b065..a67712a9021e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.c > item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_61.plan index 2642ee7651f5..36c6d98ca482 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.c > item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_62.plan index dac15f02a38e..65d728354a84 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c > item.d Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_63.plan index dac15f02a38e..65d728354a84 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c > item.d Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_64.plan index 0defe4d70dae..cdf23d919e35 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e > item.c Or item.e < item.d Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_65.plan index 54400cf063cc..e096653dba9f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e > item.c Or item.e < item.d Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_66.plan index c55812658642..646612d86666 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_67.plan index b209c5f691b3..bec1c2a11837 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_68.plan index a90c112ab49d..11dc90941b79 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.c Or item.e < item.d And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_69.plan index 2122646ec69e..45f90d589f19 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e > item.c Or item.e < item.d And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_7.plan index 8ef7f240f812..f62a81c9342c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_70.plan index c82d16b3b3f6..5d15f5e11735 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.a > item.b - 2 And item.a < item.b + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_71.plan index 918ac6f03c69..a76a87d29e54 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.a > item.b - 2 And item.a < item.b + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_72.plan index af24cf8ad3d2..48f423e20a48 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_73.plan index af24cf8ad3d2..48f423e20a48 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_74.plan index 18efd01fcb2d..3d953487f43b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_75.plan index 18efd01fcb2d..3d953487f43b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_76.plan index 236489ce6fbb..bc25853552a7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -110,9 +133,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -128,9 +161,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_77.plan index 236489ce6fbb..bc25853552a7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -110,9 +133,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -128,9 +161,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_78.plan index e0f4139476f6..7e02174a3785 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_79.plan index 820393b0f2fa..bbd7517045e6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_8.plan index 87b3428a1d13..29851d2fa1fd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_80.plan index ffb39fa3e146..8358934bc0b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_81.plan index 2cf492063360..4c4401957453 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_82.plan index 1ca22a5a1eb6..f5df4db87452 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_83.plan index c46fb4fd9ae0..0a51b16fb7fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_84.plan index c42f24e0afe4..57d3e146f3f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_85.plan index 851c7c5f6dcb..f61f578b40e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_86.plan index 7ee67a6b8643..bbddec90a124 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_87.plan index 7ee67a6b8643..bbddec90a124 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_88.plan index 17080b7e389d..3c457b9a36ff 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_89.plan index cf6081429c75..420b8c89ffb7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_9.plan index 87b3428a1d13..29851d2fa1fd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_90.plan index b85b4ca380e5..90fb31cec50e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_91.plan index 28001c3d3ead..9e317997aa52 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_92.plan index 5fcf93eeb369..9b9b90d90bef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_93.plan index 41bd41d42aa4..40a9fdee4f38 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_94.plan index 11e6fa77decd..4b2b1a431f5e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_95.plan index 3a1c6ccb1b2c..5e75cc3aed2c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_96.plan index 9fe1a9a97a09..96dd1e25d857 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_97.plan index 06079b4970a6..fc01dcc1e406 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_98.plan index 00617c444dbd..9a692cb945fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_99.plan index 595064494fd7..a477c9cff3a4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_1.plan index 96a0699e2ef1..adc93798a676 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_10.plan index efb466535d21..13adf55a34ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_100.plan index 2550f11bfe74..ebadca9a7f64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_101.plan index b23638741b1e..f9f78036b77b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_102.plan index b23638741b1e..f9f78036b77b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_103.plan index 49c6fa1916bf..85d925e13b38 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_104.plan index 112bc8265b04..bc63aae397bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_105.plan index 052728656025..3e4fdbcfc23b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_106.plan index 991f635af05d..bfc3bb33838b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_107.plan index 339c9ce44085..970c93f6650c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_108.plan index 339c9ce44085..970c93f6650c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_11.plan index e893194deeb7..e7970d8cbe8b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_12.plan index 2f084515a252..8a46627ee0b4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_13.plan index d1f743fd9ec7..17d371a672fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_14.plan index d1f743fd9ec7..17d371a672fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +142,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +170,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_15.plan index c009be25b13a..a201d4aa17b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_16.plan index c009be25b13a..a201d4aa17b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_17.plan index adc6e8097d6a..56b9d5ffa82c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_18.plan index adc6e8097d6a..56b9d5ffa82c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_19.plan index a733bd16a46a..45dd2dc76be1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_2.plan index b5222ace5c18..b9436b9d2567 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_20.plan index 54b182f08a4d..bb36fbf5c72f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_21.plan index 205c98ad2097..9cc93372f79f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -83,6 +110,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -112,9 +140,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -130,9 +168,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_22.plan index 205c98ad2097..9cc93372f79f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -83,6 +110,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -112,9 +140,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -130,9 +168,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_23.plan index 184cce7b90ed..6fdfd47c1442 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_24.plan index bb363c0ff292..a1f70da0debd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_25.plan index 184cce7b90ed..6fdfd47c1442 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_26.plan index 8b5ad676852a..567e9840c313 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_27.plan index 821a7f909bc3..3f9ad00fe29f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_28.plan index 6ed5d3e4cb99..16311f1a4c54 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +138,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +166,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_29.plan index 7fb9e6081732..baae193f3cb7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_3.plan index 9d304da258ca..f6447bc11e8d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_30.plan index 075fdffe19f6..65f8d9b8db88 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_31.plan index fd312392a106..afe114b38bf4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_32.plan index ed462bf7ab2f..071054379865 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_33.plan index 15aa79c68fae..0db70ae06335 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_34.plan index 9bf8aacf449d..e49551404848 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_35.plan index a73eb828ee63..6b3ae5148000 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_36.plan index 079f9641c2a4..6666098fd05c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_37.plan index ddb4a176ef41..c3e9a941eb89 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_38.plan index ddb4a176ef41..c3e9a941eb89 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_39.plan index ec49f7026259..7641de7ef452 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_4.plan index 5b4044307b58..9b9926360f2b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_40.plan index a04b54bfa9d3..af29500b7509 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_41.plan index 4ce72ad71a25..d5d6ab0789c7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_42.plan index ba378bced7f8..7cb7761ca68c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_43.plan index 8edad00b1651..20b5124105f1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_44.plan index 8edad00b1651..20b5124105f1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_45.plan index 71be92ea2f19..e01834e722e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.c > item.d Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_46.plan index 71be92ea2f19..e01834e722e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.c > item.d Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_47.plan index 55382da5f289..4e394e632c01 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c > item.d Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_48.plan index a314fa2df358..2312108165bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c > item.d Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_49.plan index 15e8775e43bd..9b9281fa2b93 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.e > item.a And item.e < item.b Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_5.plan index 7c3aaeed1d63..61e4138754a6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.a > item.b - 2 And item.a < item.b + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_50.plan index 701a934cd526..fe49dbf8f0f9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.e > item.a And item.e < item.b Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_51.plan index 1582303938d6..4aef66973a4a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.a And item.e < item.b Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_52.plan index 7a501dac31c0..ed6a1f806fa2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.a And item.e < item.b Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_53.plan index 9d304da258ca..f6447bc11e8d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_54.plan index 1e0e2511a441..bc60adc4202e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_55.plan index 7b274b460b7a..3517997368e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -108,9 +131,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -126,9 +159,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_56.plan index 7b274b460b7a..3517997368e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -108,9 +131,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -126,9 +159,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_57.plan index 6187142d493e..259d2fd9b3c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_58.plan index 6187142d493e..259d2fd9b3c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_59.plan index f066fb2a0a1f..447cc724d137 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_6.plan index be4888ef0bee..bfd4efdd9156 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.a > item.b - 2 And item.a < item.b + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_60.plan index f066fb2a0a1f..447cc724d137 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_61.plan index 349b64069bb5..b65164ec9e56 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_62.plan index 349b64069bb5..b65164ec9e56 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_63.plan index ebeea04415ed..81bcdee87cee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_64.plan index ebeea04415ed..81bcdee87cee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_65.plan index 0549419952c2..9e059263742e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_66.plan index daf8ba5ed084..f13676384438 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_67.plan index c13812d7c186..5c5b8f2d7d2d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_68.plan index c13812d7c186..5c5b8f2d7d2d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_69.plan index f23de87aa8fd..7a72bf6a880f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_7.plan index 7d34ff6b0044..26e9236fbbd3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_70.plan index 893b970e8fd0..056e616ab996 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_71.plan index 451e906d3d17..d45c4ad230cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_72.plan index 8c838d19e694..072536204cc0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_73.plan index 1533d4926828..8fff92e88e4a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_74.plan index 909f72e48d52..6ab69fdaeed1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_75.plan index dbcfcde87cef..7fa6cc5f6ce6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_76.plan index dd0a4e0e4e1c..0979c6ffdf76 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_77.plan index 7ea7bbe5591b..effa6b133846 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_78.plan index 7d8136e93306..7fa8ea741732 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_79.plan index 184cce7b90ed..6fdfd47c1442 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_8.plan index adfe626917b7..83da4241712c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_80.plan index 70062ac3d23a..762279e7a9f3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_81.plan index 98ce94d4af8b..a0ee0c4e4c75 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_82.plan index 98ce94d4af8b..a0ee0c4e4c75 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_83.plan index 3742e888dc8b..e8e628dcbc68 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e > item.a And item.e < item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_84.plan index 4bb270f06da2..a3f53e9ae8ce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e > item.a And item.e < item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_85.plan index 017e5eb88eac..38f3ea355f6f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d > item.e Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_86.plan index 109316bd0f43..9be71cea4286 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d > item.e Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_87.plan index 5240c037c1c0..82ea12ff2105 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b - 2 And item.a < item.b + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_88.plan index dfef71bce324..151d1755f46c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b - 2 And item.a < item.b + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_89.plan index 27ebc8f8e9b2..84a5449d42ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c > item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_9.plan index efb466535d21..13adf55a34ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_90.plan index c95f8ca6ae9c..4fac2753f4b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c > item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_91.plan index fecd976a0a31..5b80ec5dc6aa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c > item.d Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_92.plan index c234a81e6869..6e059512120d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c > item.d Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_93.plan index b63eca10245f..49ec66f640c5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_94.plan index e5247045ce54..f423ec23a73d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_95.plan index 19354baef110..97b6b25716d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_96.plan index e08787f20773..6f6d4d5d4ad1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_97.plan index 234a25c1c3bf..0430805c3851 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_98.plan index 234a25c1c3bf..0430805c3851 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_99.plan index 2550f11bfe74..ebadca9a7f64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_1.plan index 330d32113f4f..2ddc18b1fd3e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d < 110 Or item.d > 150 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_10.plan index 290e9703144a..ae2169f810d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_100.plan index 4e4137c2495c..b57749794073 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_101.plan index 1a11c337ae79..732968e90d7e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_102.plan index 3557ba7f5119..df837c7b9cd9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_103.plan index 7c3bc9f1c823..4a56ca1a1b6b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_104.plan index 3a0bdaff7148..4858c74bfea9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_105.plan index 87715cbccafa..c6e9e061dcbc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_106.plan index 987e28682573..7170cdeecf03 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_107.plan index 63587ebe5e84..0caaa7e25c1a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_108.plan index 6d2be53d1493..4ab92f274a1d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +136,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +164,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_109.plan index f89baa7a6744..b850772d359d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_109.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_11.plan index c93d749c112e..9e21958818fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_110.plan index b85785a3681c..bf615a392f87 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_111.plan index 686ba3648feb..291faad3247f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_112.plan index 67714fd47a04..148db02bc140 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_113.plan index 6adb0af2b508..936a5a2f040c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_114.plan index d2b65fc29f5e..055a92ebfb45 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_115.plan index 179539dab6fe..c1131e0cea77 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_116.plan index 5ce278d51733..84cb5adaff96 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_116.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_117.plan index eac4dafaa1ca..99c5a9a28d2b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_118.plan index eac4dafaa1ca..99c5a9a28d2b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_119.plan index 079281f07bc7..75e9fd17c244 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_12.plan index ea6e4ba1986c..3302a61f057e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_120.plan index 079281f07bc7..75e9fd17c244 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_120.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_121.plan index ca57c41dfd5f..f3c3becd432a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_122.plan index ca57c41dfd5f..f3c3becd432a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_122.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_123.plan index 32fd2981e7bc..ddef48fe4072 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_123.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.d > item.e Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_124.plan index 32fd2981e7bc..ddef48fe4072 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_124.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.d > item.e Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_125.plan index a0eb40560a13..799fa54c294d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_125.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d > item.e Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_126.plan index a0eb40560a13..799fa54c294d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_126.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d > item.e Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_127.plan index c337666b39ee..d7ac1fb101ea 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_127.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_128.plan index c337666b39ee..d7ac1fb101ea 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_128.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_129.plan index 69267b6568fa..38d44ecb0b19 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_129.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_13.plan index 75001dbfb437..574888582cc1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_130.plan index 69267b6568fa..38d44ecb0b19 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_130.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_131.plan index f069a6a70b37..f20c977018a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_131.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_132.plan index f72eeb0ffddb..575b47dd53c1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_132.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_133.plan index aac5653b5bb2..d43a7bbe0aaa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_133.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_134.plan index bbb71984345b..6199541916a2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_134.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_135.plan index c93d749c112e..9e21958818fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_135.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_136.plan index 1ff6425667f4..8eb2161d4803 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_136.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_14.plan index 75001dbfb437..574888582cc1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_15.plan index c93d749c112e..9e21958818fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_16.plan index ea6e4ba1986c..3302a61f057e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_17.plan index 266ea0b75da7..fa83b8f07ac9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c > item.d And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_18.plan index 2bcb3829dc99..d33411323ee1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.c > item.d And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_19.plan index 953e79b507ed..8a5d878823c7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.b > item.c And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_2.plan index 9728d8666bd5..80912087742e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.d < 110 Or item.d > 150 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_20.plan index fbcc0c641e8f..daec4357ee4e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.b > item.c And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_21.plan index ea3ba36e2b98..2821f826093b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c > item.d And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_22.plan index 6596aabc491e..ff409935a2c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c > item.d And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_23.plan index a6394e629684..ba150a472088 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_24.plan index ce70e730e844..e4b63eed616a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_25.plan index c41423698ea6..e3c47af01311 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_26.plan index 32093198a8f8..7d3ca0a645d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_27.plan index b647e3d21114..db58ab1b876a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_28.plan index 9e287d462e5b..f8227b2ac57d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_29.plan index 6e449eee3814..09dd8b6c88f1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_3.plan index a3f8cd1d6d00..8e1c5d59ac8d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_30.plan index 1cfb15dd0549..bdd48ff8da6b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_31.plan index 8532e217ca13..de27438809b6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_32.plan index e672052a8d5a..0157012a6b7e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_33.plan index 219dcc48303a..236a486b97be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +141,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +169,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_34.plan index 219dcc48303a..236a486b97be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +141,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +169,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_35.plan index 58f354e0fea2..0a8967b21e1d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +141,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +169,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_36.plan index 58f354e0fea2..0a8967b21e1d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -113,9 +141,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -131,9 +169,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_37.plan index fb59597f9474..d2756602e161 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_38.plan index f9d3e58f87e2..e65d63fe85f3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_39.plan index 8389dcde3272..e6929f0fc77c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_4.plan index 411398a8b0c6..b5ab5e40b969 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_40.plan index 8389dcde3272..e6929f0fc77c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_41.plan index 5c8b74d82fc6..e80b87e71784 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b - 2 And item.a < item.b + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_42.plan index 87dd2f5a00cd..007d015841f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.a > item.b - 2 And item.a < item.b + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_43.plan index 3f4bea0c5a5f..8f13fe5f1dcd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_44.plan index 3f4bea0c5a5f..8f13fe5f1dcd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_45.plan index 09dc54a3bdef..bd86520463cd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.c Or item.e < item.d Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_46.plan index 3e4317393246..5f08ba992da6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.c Or item.e < item.d Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_47.plan index 7c315b568f06..e25585749687 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_48.plan index ddd639b9c483..a922e9f4a342 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_49.plan index fbdf3837ea22..f4cbf71e64a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_5.plan index eb8ae79cf1e6..9db5be37c1e2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.d < 110 Or item.d > 150 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_50.plan index 381ef16f02b8..daa590b50e0d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_51.plan index c93d749c112e..9e21958818fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_52.plan index dd0b1c36fd99..533966c6a967 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_53.plan index c93d749c112e..9e21958818fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_54.plan index db7dd9907edd..e41c0c700a5e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_55.plan index c93d749c112e..9e21958818fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_56.plan index f8ebd34fd470..1302d71da061 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_57.plan index c93d749c112e..9e21958818fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_58.plan index d6597a0c2963..84644f1d8157 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_59.plan index 2602ff68141d..df3d4b038319 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_6.plan index 458b81cd4aae..a38829960ffd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.d < 110 Or item.d > 150 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_60.plan index 2602ff68141d..df3d4b038319 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_61.plan index cb03111f67b1..b407a5ce962b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_62.plan index cb03111f67b1..b407a5ce962b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_63.plan index 5204f3fe29d9..9d78e51d3f1e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_64.plan index 5204f3fe29d9..9d78e51d3f1e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_65.plan index d573d514a647..f8e94a021743 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_66.plan index 0837f341f412..528f578b895e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_67.plan index 4461f026fa0e..01487b6d7e1d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_68.plan index 4461f026fa0e..01487b6d7e1d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_69.plan index 5f87bded4d64..942466d2c69d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_7.plan index 6c5fe288fa4f..644cc7b51686 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_70.plan index a49d0c7fe3d9..b2d06f66770f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_71.plan index 116e14bfacff..6470e778b4d2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_72.plan index 3566dcbf03c7..999144a8952c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_73.plan index 31c885faa954..b0490f56ed02 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_74.plan index 31c885faa954..b0490f56ed02 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_75.plan index 7cccfb21c167..e7ee7bf483a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_76.plan index 7cccfb21c167..e7ee7bf483a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_77.plan index 5442b262fb2b..c55095f2ad0a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_78.plan index 61d60aa7ca37..6353b7ec5bd0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_79.plan index 267efd2128cb..8b95a91c3506 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_8.plan index 6c5fe288fa4f..644cc7b51686 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_80.plan index a59e73cca1db..9858afcb3c01 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_81.plan index 681d10f15098..5d55d53d9a15 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_82.plan index f2478d70ca52..1491774eaafa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_83.plan index e785db37efde..1dfc045894d1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_84.plan index 1a17db6e9fdf..0b3f4d6887ae 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_85.plan index efccb174b52e..9195c7c723da 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_86.plan index 392a14937954..5fa31533aacf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_87.plan index 6ed8e2be4e16..bea004976ad0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_88.plan index 6ed8e2be4e16..bea004976ad0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_89.plan index 3cb09e75c37a..7699afea7fc1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_9.plan index 7b6d251f9e26..22a4fa5ddee7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_90.plan index 96c59220541d..fdbf8abab172 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_91.plan index 4783de250ea1..b644b0f1fdc4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_92.plan index 4783de250ea1..b644b0f1fdc4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_93.plan index c4c5b7dc5174..2fcdf9bfd054 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_94.plan index c4c5b7dc5174..2fcdf9bfd054 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_95.plan index 9c7fba17c144..d102e3dcf2be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_96.plan index 9c7fba17c144..d102e3dcf2be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_97.plan index 14cc26c2728d..fb5ca77136be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_98.plan index 14cc26c2728d..fb5ca77136be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_99.plan index 1e95f3a13459..e96da257f27e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_1.plan index 33266da8b7a5..d203c8915ff7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_10.plan index b0a1f67bb67b..a83bfe642d65 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_100.plan index 0737b3eecec6..297ace7909ed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d > item.e Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_101.plan index 3fb31104e822..25b3945878a4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c > item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_102.plan index 02cf4b50de13..39fbcae34ecb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c > item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_103.plan index beb7f4daf546..684a91a85f69 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.d > item.e Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_104.plan index c3a4c2b2af09..0da12a6b950b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.d > item.e Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_105.plan index 7d80bc9de669..c67f75d23960 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.e > item.a And item.e < item.b Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_106.plan index e1aa71a4b727..69b4636ba079 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.e > item.a And item.e < item.b Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_107.plan index b523cf600a99..bbd786c06bb2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_108.plan index 453d27c6bc90..0a550e01d27d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_109.plan index b40d31fcaa7d..edc9729e38b5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_109.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_11.plan index 119b6dec610e..45cddbc45d87 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_110.plan index dd54e9e3b550..30bcc53edd10 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_111.plan index 3567ade7251d..64cea4b4965e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_112.plan index fe7d0562bb32..41defe002940 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_113.plan index 253483547827..0ba9bf339c0a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_114.plan index 8f879e58deba..906a235820cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_115.plan index 8b2a45b9ade3..8d6eed256bba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.a > item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_116.plan index 0d01f6d4a1cd..4ceacea8576b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_116.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.a > item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_117.plan index 1add53b50aaf..e584071fad74 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_118.plan index cf95252e724d..f978418ac37f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_119.plan index 31b713b9ed57..a3826536c16c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_12.plan index 36b048b24fe0..a5ec0cc2a3d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_120.plan index 7e3997d72cc0..c528c2065dc2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_120.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_121.plan index 367af2d8c049..0ebf190fb51f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_122.plan index a8781659021b..04b4b084ac04 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_122.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_123.plan index 7c1cb36840f4..081801b89bad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_123.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d > item.e And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_13.plan index 50838d46f887..d43f23cb9a86 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_14.plan index 50838d46f887..d43f23cb9a86 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_15.plan index bf4be55a8221..d1c7349a4836 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c > item.d Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_16.plan index c26f68c8658d..6304933375ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c > item.d Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_17.plan index 8dc48701e2b9..bb6aa8a33ca3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.a > item.b Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_18.plan index 77fa2c0af4d0..dbf1accb0fd2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.a > item.b Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_19.plan index 8651e33bde61..e66612930fd9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.a > item.b - 2 And item.a < item.b + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_2.plan index 64865001c3b8..8be2ceba87db 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_20.plan index 09d8fcf39bf7..1aad0eb0a6dc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.a > item.b - 2 And item.a < item.b + 2 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_21.plan index 9e8704b1b8a4..816ac1ec60b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_22.plan index 9e8704b1b8a4..816ac1ec60b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_23.plan index 171a7f03e622..21b9f7d01753 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_24.plan index 171a7f03e622..21b9f7d01753 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_25.plan index ea8652ff32aa..c8b4880c5ffa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_26.plan index e693d4c801e6..d34e4f33ad64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_27.plan index 678cf898e30c..63ce0f71c976 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c > item.d And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_28.plan index 395cd41afb43..c8c291843b7a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.c > item.d And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_29.plan index e94484380e30..f9b24a5bf0f9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.a > item.b And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_3.plan index 257cc1e2f94e..347642017483 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_30.plan index a46efe42b3fc..75c4468c6bad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.a > item.b And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_31.plan index 14a53c9911f9..b386dd6eae91 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_32.plan index 14a53c9911f9..b386dd6eae91 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_33.plan index 4fb309705f16..f2d61edebefc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.d < 110 Or item.d > 150 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_34.plan index 4fb309705f16..f2d61edebefc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.d < 110 Or item.d > 150 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_35.plan index 218f6561a21f..e4d0f4e887d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_36.plan index 218f6561a21f..e4d0f4e887d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_37.plan index 16f75eb39ce1..11ed08a8fe5a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d < 110 Or item.d > 150 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_38.plan index ba3e61cf927a..43a0047fe228 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.d < 110 Or item.d > 150 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_39.plan index ab5350269a26..5884c1ec70fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_4.plan index f99114412f5d..2f2a4c44f8ae 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_40.plan index 5760e9ef6d2e..0f4156ed269f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_41.plan index 6e93564c5496..8f19886836ff 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_42.plan index 0b5155d9cec0..1a09918ad4b6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_43.plan index a849270befa6..6d78be0911c9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_44.plan index 5988c31d0f6a..ae364ddaed18 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_45.plan index c363ababbe5b..70e8cfe68f9d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_46.plan index 0e419b11e06c..d3be4041427a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_47.plan index a8e8f9e69860..35d0d5229d8b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_48.plan index 450c503ea432..2767ad9cf19e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_49.plan index b1ceb85284db..d2a805d6f8d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_5.plan index 3c15b901b68a..c437a880749a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_50.plan index 5f40d636617e..0bee978cb99e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_51.plan index c079890eb0a7..1c42a9e86b1f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_52.plan index 9853d3aee3dc..85f9879e61cc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_53.plan index 701b1197ba48..8f704302f5f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_54.plan index 0d88765be32d..3575ee4c8dbb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_55.plan index 5d390a2a848b..240950731d26 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_56.plan index 5d390a2a848b..240950731d26 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_57.plan index 7fdc783390ea..52505327d20a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.d < 110 Or item.d > 150 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_58.plan index 7fdc783390ea..52505327d20a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.d < 110 Or item.d > 150 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_59.plan index 9898db219fe9..1c5b3fa25a9d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c > item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_6.plan index 3c15b901b68a..c437a880749a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_60.plan index 9898db219fe9..1c5b3fa25a9d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c > item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_61.plan index 1ed2749cb84d..6f851ed534d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d > item.e Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_62.plan index 1ed2749cb84d..6f851ed534d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d > item.e Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_63.plan index 070aa3cbc512..d49d186942d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_64.plan index 50f2b080e988..334072f761b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_65.plan index 1f20c42c6218..d6bf1a9a8f06 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_66.plan index cf58b3cd6445..aff2e768d863 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_67.plan index fd3d9bbac914..7c080a6239fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.c Or item.e < item.d Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_68.plan index 1cbd123e39cb..a8361de7f1c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.c Or item.e < item.d Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_69.plan index ccc5a9c4a418..f99890834ee9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.e > item.c Or item.e < item.d And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_7.plan index dd27488f12d0..896696657231 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_70.plan index ccc5a9c4a418..f99890834ee9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.e > item.c Or item.e < item.d And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_71.plan index 89ad410f51e0..f0703284c573 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_72.plan index 8b7d91f5e09f..01af142da5ab 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_73.plan index caae5eff6944..964a1dc2a16f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_74.plan index 9020d75121f5..6ea20a270c10 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_75.plan index ce4c3e7733db..14b08ad2f773 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.a > item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_76.plan index d6323d70c8eb..11305b858171 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.a > item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_77.plan index b1faa82597d6..14eeffca20c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_78.plan index 7bfdc0231892..55f3fb63419f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_79.plan index 2384ef7087d0..f973745710fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_8.plan index 8fa81f22986c..44785d00c109 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_80.plan index 7a3fa978c582..5bb30fa6fa33 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_81.plan index 42562138f519..21b1f9dd974f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_82.plan index 9d9a56354aad..a4b5a8eebb19 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_83.plan index e45b6ed6d84b..85ebddfb8a44 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.d > item.e And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_84.plan index e20e155b7d63..70930a45820e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.d > item.e And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_85.plan index 4fd448d38df9..5b6498aa0757 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2 And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_86.plan index 7b0447c342bd..65bc09171e11 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2 And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_87.plan index 3567ade7251d..64cea4b4965e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_88.plan index 3c50654bbd8d..3feb3ec69916 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_89.plan index 7d4d9d48df6e..dd652de95b58 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_9.plan index b0a1f67bb67b..a83bfe642d65 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_90.plan index d112749d39d5..4d65d59dedfe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_91.plan index f68be25914b4..88738154f803 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_92.plan index f68be25914b4..88738154f803 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_93.plan index 890fe95a64b6..fc5eafcc89d0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_94.plan index 1cc911854c90..932a1caddac9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_95.plan index 43bbded72fe8..34e7a4c36b32 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_96.plan index d80ea36d25c0..9ec89a2ca246 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_97.plan index 30d864a57b6a..91113515fb9d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_98.plan index 30d864a57b6a..91113515fb9d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_99.plan index ec968a444e84..3f821d24fcfc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d Or item.d > item.e Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_1.plan index bd9509d45da9..004e710225db 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b And item.d > item.e And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_10.plan index 6630635ed2f6..d489c62c8295 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_100.plan index 7c1eaf2d5c2a..981f73c332fe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_101.plan index 7c1eaf2d5c2a..981f73c332fe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_102.plan index 3e05a20d2a60..1a5fde1bef64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_103.plan index 3e05a20d2a60..1a5fde1bef64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_104.plan index 16f2aa2ca3da..b0a5e70a9052 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_105.plan index ca9fd6863b9d..f3911f28c5ce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_106.plan index d6f1bd280bb2..8b032345118f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_107.plan index 6e458b4292fc..5454e8a565aa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_108.plan index 1ffeb84dbca8..f961420e30c9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_109.plan index bfe843eb8437..74922259d6f9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_109.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_11.plan index 6630635ed2f6..d489c62c8295 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_110.plan index feb79d812858..b86b88521ea5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_111.plan index 4498ee4a0a39..573a51c487d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_112.plan index 9e622dd69e9b..07ef3409d879 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_113.plan index 1d73e743661b..a5905f5d9f32 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_114.plan index a5266bba457d..c4af6e96f68d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_115.plan index a0983e997628..099e2cf73b72 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_116.plan index a3f2087a8df0..a2fdc4f42dfd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_116.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_117.plan index ab1c8f6fd540..a3fb99a04cf0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_118.plan index 07044d44e8b5..c5d3db8a4edd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_119.plan index 07044d44e8b5..c5d3db8a4edd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "c", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_12.plan index 81a9e3cfe321..67673c8e5932 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_120.plan index 376081769e33..66b8cd804ade 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_120.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_121.plan index fe8833bd0c0a..db063a7a18dc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -115,9 +143,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -133,9 +171,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_13.plan index 5f36ab3626c7..e6a92af7b0bd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_14.plan index 8de978ed8f15..e1a29c2330e7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_15.plan index 4847beb5f73a..3ec73365d09f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_16.plan index 73acc3e3e569..a5d584896102 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_17.plan index 38e7ec20d396..75d6c8fd7af7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_18.plan index 7ad501fdcdd0..3d3473d229ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_19.plan index 8df3f709c324..3d841e92b963 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_2.plan index 5371477ab586..43201a45391a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_20.plan index 8811210be849..ad93669605bd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_21.plan index 26f56d85f8f3..3ff21f1eb196 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_22.plan index 4e558bbdb52e..3d1d8efe5cb4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_23.plan index b3afcfd02b86..5cfead2d8c4c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_24.plan index ad54462c3952..9a7977a49ef0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d > item.e And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_25.plan index 13f9930461f9..c5d3d442fa41 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d > item.e And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_26.plan index 8d60fa5f6d3d..bc0085fe47bd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_27.plan index 56d0baea0fed..cb36a3196da9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c <= item.d - 2 Or item.c >= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_28.plan index 755a0935c156..5a11340d3f85 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_29.plan index 2788dc06ec77..456fd3124440 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_3.plan index 997c45d36c17..c1dc6a59640f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e > item.a And item.e < item.b And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_30.plan index 257a8230fcda..b5d7608606f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_31.plan index 257a8230fcda..b5d7608606f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_32.plan index 2abf4b4bd47d..f8ccb520a5e9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e > item.c Or item.e < item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_33.plan index 2abf4b4bd47d..f8ccb520a5e9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e > item.c Or item.e < item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_34.plan index 60f3df7d546a..4d3268571dfd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_35.plan index 60f3df7d546a..4d3268571dfd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_36.plan index 8968519ec2c4..b5171a12d59a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.b > item.c Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_37.plan index 8968519ec2c4..b5171a12d59a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.b > item.c Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_38.plan index ed99dc68992e..f20411f9f372 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_39.plan index ed99dc68992e..f20411f9f372 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_4.plan index 257a8230fcda..b5d7608606f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_40.plan index 06013ee7bb35..d40ba6ae4483 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_41.plan index 6331534e423a..3cc5fcf53d52 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_42.plan index b72e9058a929..1f59b4ac5794 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_43.plan index a6e7f02caa02..ef160409e867 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_44.plan index 206ed064b6f8..931daea26b82 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b - 2 And item.a < item.b + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_45.plan index c72c24c8b3b9..5a24d052513b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b - 2 And item.a < item.b + 2 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_46.plan index f554de45df7f..4b4cdc4f94ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.a > item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_47.plan index 60d35410deb2..adfb7dba80c9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.a > item.b And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_48.plan index 15841aad8324..3ed5fe88b23c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e > item.c Or item.e < item.d Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_49.plan index faf2fe880667..0027b4e3d6b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e > item.c Or item.e < item.d Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_5.plan index 257a8230fcda..b5d7608606f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_50.plan index cfedc895859f..a47dd6a9177d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_51.plan index 799bb91b6640..740350a57ec0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_52.plan index fe9e380ebc1d..d68369429301 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_53.plan index f9267a3b102e..79616d5a9ef4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_54.plan index 90ad0dcac7f9..4585993ad578 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_55.plan index c6bbbe7a3db5..704d3b85c790 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_56.plan index cb82816af1d7..6e549acbffbb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_57.plan index 9ff1d2dacf9a..6cd4d86f2319 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_58.plan index 102c62a618f1..aa2c8c3db338 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_59.plan index 5b4fcfc587e0..f6ebd7c185ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.a > item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_6.plan index 3c6fadc1ba89..51b6e65ce685 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_60.plan index 54f5e382d24a..b4d57bbfa333 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_61.plan index b58e151cdc84..399a5c88806c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_62.plan index 967d8ba351fc..401818d7057e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_63.plan index 359c43839d09..ce183352b50c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_64.plan index e117117d5029..b7b91fc31350 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_65.plan index 1b0c72319075..db5fe2a91aee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_66.plan index 8811210be849..ad93669605bd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_67.plan index 7be9a8669380..118fafebe785 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_68.plan index 9528f8a33e5f..3db2ff7ff9cf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_69.plan index 8e3e99da256a..cbc5eb1e00bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_7.plan index e0bae97dcf9f..05fb63bdc4d0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_70.plan index 403106fa92b3..921d19fdd3fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_71.plan index 403106fa92b3..921d19fdd3fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b - 2 And item.a < item.b + 2 Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_72.plan index 4bb3f2cf025b..a2b13425c8df 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_73.plan index e5a82025311f..3fcc7c0a285e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.b > item.c Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_74.plan index 733ab1fb8afe..5138ed64854a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_75.plan index 1ffb1c007bf1..69dbf90d8ce2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_76.plan index d6f133694665..f28abb07c80c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_77.plan index 63104478d4e4..d72d7c3bd446 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_78.plan index 5c30681abaea..98105d0fbe1a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_79.plan index 5a7916139df8..b4e2cc3c822c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_8.plan index 8950a9a14bd2..adbc89acc7ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_80.plan index 6c1e6d006f00..baab69061b23 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.d < 110 Or item.d > 150 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_81.plan index 99d7c2f70099..bb4fb26de62e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.d < 110 Or item.d > 150 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_82.plan index f59ebde4f31a..8a39512ae2bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e > item.a And item.e < item.b Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_83.plan index b7a7ec346ebd..12b9e08de665 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e > item.a And item.e < item.b Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_84.plan index b2d77b299986..31de0fc43fd5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.d < 110 Or item.d > 150 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_85.plan index 9923e1ab05b5..3fe7d2a35e5a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.d < 110 Or item.d > 150 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_86.plan index 098a7022d36b..97c90ec3c3ad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.e > item.c Or item.e < item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_87.plan index 6eed686efea2..d058096c6fb6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.e > item.c Or item.e < item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_88.plan index fdbc26cb3bf6..754c69a34240 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_89.plan index fdbc26cb3bf6..754c69a34240 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_9.plan index 8950a9a14bd2..adbc89acc7ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_90.plan index b71f3de8c204..f12e2ab4fd24 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_91.plan index b71f3de8c204..f12e2ab4fd24 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_92.plan index 07fc3bed45d1..d81641413011 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -110,9 +133,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -128,9 +161,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_93.plan index 1c7bab4126bf..1a25657b5297 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -110,9 +133,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -128,9 +161,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_94.plan index 7f312416df8d..d88dc46bfc67 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c > item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_95.plan index 2e7cab5d5817..ae37ac92ed94 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.c > item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_96.plan index 58c7081de9e1..bbb7235e5ec1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_97.plan index a334fdf36d7a..322ff0ccd822 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_98.plan index 5534fb4c9d7c..7c8e3dc55c4f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_99.plan index f1c7bdd45a20..4218904848d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_1.plan index c05b4e1ddaa8..ae4fcba5a428 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_1.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_10.plan index f3f88e0d2511..c993ebd59fc9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_10.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_100.plan index 39f4ac4a6f02..166ba59fbf05 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_100.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_101.plan index ef95efef0f95..6cd673d4e9ed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_101.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_102.plan index 39da4948a0c7..b5ca460a5c50 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_102.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_103.plan index 72c48eb2b1d6..b885c84ece27 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_103.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_104.plan index 72c48eb2b1d6..b885c84ece27 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_104.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,10 +32,16 @@ "Node Type": "Limit-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "Limit" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_105.plan index 512a107d9f0d..43d28cdd6d15 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_105.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_106.plan index 96c760553e58..746b2cd12b10 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_106.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.a > item.b Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_107.plan index e5eeaf2fcbb1..d36c73105c2f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_107.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e > item.c Or item.e < item.d Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_108.plan index fba92693963e..01b6fa096213 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_108.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.e > item.c Or item.e < item.d Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_109.plan index ef6c8ecb891b..3ce5ddb82cfe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_109.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.a > item.b Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_11.plan index dd776970beca..dbc282bf2ea4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_11.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.a > item.b - 2 And item.a < item.b + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_110.plan index ecb77e98e855..2f7b2af71b89 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_110.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.a > item.b Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_111.plan index 0a9ecdd0f319..f588621aefc7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_111.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_112.plan index 6bc1cc5a33fc..af6493a6fa8b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_112.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_113.plan index 0a9ecdd0f319..f588621aefc7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_113.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_114.plan index 1fb9f143b223..3d3d3b6d3225 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_114.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_115.plan index db47dd790af2..7b0ae23ecab2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_115.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_116.plan index db47dd790af2..7b0ae23ecab2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_116.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b" diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_117.plan index 8a327f4617ae..b580a45a79fe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_117.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.d > item.e And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_118.plan index b7a74ba15778..0614cb3bc3b6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_118.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.d > item.e And item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_119.plan index ae7542eb9a3c..2795bc0a5a29 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_119.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_12.plan index dd776970beca..dbc282bf2ea4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_12.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.a > item.b - 2 And item.a < item.b + 2 Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_120.plan index ae7542eb9a3c..2795bc0a5a29 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_120.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.c >= item.b - 2 And item.c <= item.d + 2 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_121.plan index 7c5dad539599..9b5e2e7e69b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_121.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_122.plan index 7c5dad539599..9b5e2e7e69b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_122.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_123.plan index 9f01edf1f007..9a57645276ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_123.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.a And item.e < item.b Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_124.plan index 9f01edf1f007..9a57645276ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_124.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.a And item.e < item.b Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_125.plan index 2a4da75d4028..e77a710ba343 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_125.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.b > item.c Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_126.plan index 2a4da75d4028..e77a710ba343 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_126.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.b > item.c Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_127.plan index 28543e61146b..1270c119f666 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_127.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_128.plan index 38b7fe95f82b..197f150f756f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_128.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_129.plan index bdb1b3ea5094..692a4a4d978c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_129.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_13.plan index 81a61c0026be..695518dbb594 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_13.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b - 2 And item.a < item.b + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_130.plan index 7c6970be5754..6b3369a43b59 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_130.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_131.plan index 55ebebf8a6c9..7630a3857592 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_131.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_132.plan index 211910448156..0953badea2e7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_132.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_133.plan index 5f2248b1baa1..bd34f469441d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_133.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_134.plan index 12aeda79f361..3862a44bc386 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_134.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_135.plan index 82e05a83605d..4673809cc198 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_135.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_136.plan index 82e05a83605d..4673809cc198 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_136.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.a And item.e < item.b Or item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_137.plan index 6dd8ba5d6717..0a25cec8e505 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_137.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_137.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_138.plan index 6dd8ba5d6717..0a25cec8e505 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_138.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_138.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 Or item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_139.plan index 0b4a492f5222..b68b9c69db52 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_139.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_139.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_14.plan index 81a61c0026be..695518dbb594 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_14.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b - 2 And item.a < item.b + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_140.plan index 58d96e0827a5..6122f59cdde3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_140.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_140.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_141.plan index e494e4432282..988ed7a64a31 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_141.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_141.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_142.plan index e494e4432282..988ed7a64a31 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_142.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_142.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_143.plan index 35661be107b7..90746148fc68 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_143.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_143.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.d > item.e Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_144.plan index af1c5389b8fd..567fac913852 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_144.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_144.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b Or item.d > item.e Or item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_145.plan index bde3ee908656..b1929dd0b7c6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_145.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_145.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a > item.b Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_146.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_146.plan index abcd5e15e415..93539da6e9da 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_146.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_146.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a > item.b Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_147.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_147.plan index a1a0ace5f66b..f3ed97e201e5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_147.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_147.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_148.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_148.plan index 92aba35a4ab7..80dfe8626110 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_148.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_148.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.c <= item.d - 2 Or item.c >= item.d + 2 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_149.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_149.plan index ea1cc49f33d1..b844f4dd8136 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_149.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_149.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_15.plan index 1a78ca861096..7300fe9da750 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_15.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d < 110 Or item.d > 150 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_150.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_150.plan index 0ecac9fc1329..8cb898488946 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_150.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_150.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_16.plan index 1a78ca861096..7300fe9da750 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_16.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d < 110 Or item.d > 150 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_17.plan index 40bcd272ce48..a5058424a2b6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_17.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e > item.c Or item.e < item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_18.plan index 46b8834d5fd6..c6b720581815 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_18.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e > item.c Or item.e < item.d Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_19.plan index 667fb8c1cd87..32baec4308e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_19.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.d > item.e Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_2.plan index 4d7ca88fdfac..8c358a4e83c2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_2.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_20.plan index 0db4e060c3cf..cdb9e9ff3786 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_20.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.d > item.e Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_21.plan index 5e56b43f7c49..632fc45b4ba3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_21.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_22.plan index 9efaacae1641..d37050b64140 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_22.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 Or item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_23.plan index 1dfdce805113..97b5eaad56d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_23.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_24.plan index 15274adbbb6f..b666cbdadf78 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_24.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 Or item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_25.plan index b2016b880b62..a9210145947b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_25.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_26.plan index 37c0473545e9..c98f3a3f69c8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_26.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.e > item.a And item.e < item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_27.plan index e37a28cada57..6ba26e146659 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_27.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_28.plan index a7312a13e146..7e31c31237da 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_28.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +139,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +167,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_29.plan index 463decc7bd1a..365bf4ea3fef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_29.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_3.plan index ac233e13aafc..ea9cbd91862c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_3.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_30.plan index bc1ee6a6dd97..ab766c84bd56 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_30.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_31.plan index 732ce3a1228a..b38b1e3d323d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_31.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -110,9 +133,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -128,9 +161,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_32.plan index 8e55296deee9..fbee8cfa2e15 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_32.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -79,6 +101,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -110,9 +133,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -128,9 +161,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_33.plan index 7ae01c6a59ff..19484b640df7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_33.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_34.plan index a07004b37da1..69728d914403 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_34.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_35.plan index 347eff7bb572..46b41e9b41ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_35.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_36.plan index ed60e0c24ee7..879e1a5ef6a6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_36.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_37.plan index 8bdb9f988e15..7507a9b491d0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_37.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_38.plan index 9c8d20dbd781..3c8f98e0aac0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_38.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_39.plan index 13316d82cbe7..c151a94db7f2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_39.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_4.plan index cb5c7cd354ef..08f2b5297391 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_4.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -116,9 +144,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -134,9 +172,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_40.plan index eae77d333f89..877fa562c1b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_40.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_41.plan index c1c69c5a3591..7fbc002bb8b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_41.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_42.plan index c1c69c5a3591..7fbc002bb8b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_42.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.d < 110 Or item.d > 150" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_43.plan index b28d0d50867d..341f40b682ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_43.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_44.plan index b28d0d50867d..341f40b682ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_44.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_45.plan index 0b4a492f5222..b68b9c69db52 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_45.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_46.plan index 33e8e32c2307..79448aabd7fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_46.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_47.plan index 8e42a641d397..1bc71a9ed5ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_47.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_48.plan index 8e42a641d397..1bc71a9ed5ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_48.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_49.plan index 4a76c76f5baa..ce646f1c6f9d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_49.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_5.plan index 5128ac4b6ab4..a00ca1c4fe75 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_5.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_50.plan index 2c82885160a7..cdf73a696907 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_50.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e Or item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_51.plan index 438cddec78ba..9b585077cc8d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_51.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_52.plan index 438cddec78ba..9b585077cc8d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_52.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.a > item.b Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_53.plan index cf9032930b70..bfadbe4170b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_53.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_54.plan index c2df23c2cfcd..8e8d6d3b3baf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_54.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_55.plan index 9ba7d3655456..4dc3145c51fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_55.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_56.plan index 9ba7d3655456..4dc3145c51fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_56.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.b > item.c And item.a > item.b - 2 And item.a < item.b + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_57.plan index 289ba02732e4..e985cdf74892 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_57.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_58.plan index 7edc210483a6..b85ce16a0ef0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_58.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c And item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_59.plan index 2dc45fba07cf..a2a5fc2aa75c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_59.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_6.plan index 5128ac4b6ab4..a00ca1c4fe75 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_6.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "d", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_60.plan index f70a8e3cdee9..947b9a3352f1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_60.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e And item.a > item.b - 2 And item.a < item.b + 2 And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_61.plan index 20340ea76f6b..a517aad802cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_61.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_62.plan index ecf7e9b68e79..e230d0992891 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_62.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_63.plan index 935e9c146a61..27f565b7e695 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_63.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_64.plan index d4572301a031..37230dc7163f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_64.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.e > item.c Or item.e < item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_65.plan index 67897c7bc0ec..2580d770eb79 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_65.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_66.plan index d9037307b28a..eaf8dad14f2a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_66.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.e > item.c Or item.e < item.d Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -117,9 +145,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -135,9 +173,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_67.plan index 57314d5ed561..77a2defe4173 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_67.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_68.plan index f6a574c3c0d4..5b7f5e99b5d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_68.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_69.plan index e574475521a2..cd9dcba8b4bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_69.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_7.plan index 463decc7bd1a..365bf4ea3fef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_7.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_70.plan index e574475521a2..cd9dcba8b4bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_70.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_71.plan index 14bce597db71..84484c77af40 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_71.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_72.plan index 14bce597db71..84484c77af40 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_72.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "b", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_73.plan index 9ddd50275d3e..a97ac62addf3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_73.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_74.plan index 6244ed23eae4..b948a92cad32 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_74.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -120,9 +148,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -138,9 +176,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_75.plan index 58e8fe08e725..268a9485656e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_75.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_76.plan index 58e8fe08e725..268a9485656e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_76.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d < 110 Or item.d > 150 And item.a > item.b And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_77.plan index fe118bc336dc..11c8bffc79f1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_77.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.d < 110 Or item.d > 150 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_78.plan index fe118bc336dc..11c8bffc79f1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_78.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.a > item.b And item.d < 110 Or item.d > 150 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_79.plan index e61882aafe1b..8d193de97e1d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_79.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.d < 110 Or item.d > 150 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_8.plan index 10e42a257082..62234fd915de 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_8.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -81,6 +103,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -114,9 +137,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -132,9 +165,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_80.plan index e61882aafe1b..8d193de97e1d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_80.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.col1" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c > item.d And item.d < 110 Or item.d > 150 And item.a > item.b" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_81.plan index 20340ea76f6b..a517aad802cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_81.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_82.plan index fb46b6fd3eb9..e80c26453ea5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_82.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_83.plan index 5ce65e927ad3..0b19aa2ba754 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_83.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_84.plan index 5ce65e927ad3..0b19aa2ba754 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_84.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.c <= item.d - 2 Or item.c >= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_85.plan index 545abea84fad..1da3727c0f14 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_85.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_86.plan index 5008e1a64be9..eee58ce6b92f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_86.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130 Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_87.plan index 1f78e24bdb7b..e51cd1387c69 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_87.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_88.plan index b2adf51b0f57..a8c71c0de91a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_88.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_89.plan index 2b02afcc27bb..11a8db3e4efe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_89.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_9.plan index f5ddaa26433a..2a763c4dcb4b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_9.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,17 @@ "Node Type": "TopSort-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_90.plan index 2fb06674e3cb..08cc8fe4e22c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_90.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.e + item.d >= item.a + item.b - 10 And item.e + item.d <= item.c + 130" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_91.plan index 7fc175019b5a..ac3c949815fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_91.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -111,9 +134,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -129,9 +162,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_92.plan index 0a0c25751c5b..67013b2bb5b8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_92.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,6 +67,7 @@ "Node Type": "TableFullScan", "Operators": [ { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -80,6 +102,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -111,9 +134,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -129,9 +162,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_93.plan index 38b57c6b2e15..d85e3e8e33ca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_93.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_94.plan index 1a652792defb..fbfa9921723c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_94.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -84,6 +111,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -118,9 +146,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -136,9 +174,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_95.plan index 3e8f3a9ca409..93b0a7cb469b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_95.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_96.plan index f03aa7f8f542..22e4fa26397c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_96.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.d > item.e Or item.b > item.c" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_97.plan index b7d0c34ef6f5..e59e7586a486 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_97.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_98.plan index b7d0c34ef6f5..e59e7586a486 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_98.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,15 +32,26 @@ "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], "Name": "Filter", "Predicate": "item.b > item.c Or item.d > item.e" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_99.plan index 4603ab575f5b..9cdb665b501c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_99.plan @@ -12,6 +12,11 @@ "Node Type": "Limit", "Operators": [ { + "Inputs": [ + { + "ExternalPlanNodeId": 11 + } + ], "Limit": "1001", "Name": "Limit" } @@ -27,11 +32,27 @@ "Node Type": "TopSort-Aggregate", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + }, + { + "ExternalPlanNodeId": 9 + }, + { + "InternalOperatorId": 1 + } + ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], "Name": "Aggregate" } ], @@ -46,10 +67,16 @@ "Node Type": "Filter-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Filter", "Predicate": "item.c >= item.b - 2 And item.c <= item.d + 2 And item.c > item.d" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", @@ -85,6 +112,7 @@ "Node Type": "ConstantExpr", "Operators": [ { + "Inputs": [], "Iterator": "precompute_0_0", "Name": "Iterator" } @@ -119,9 +147,19 @@ "Node Type": "Aggregate-Limit", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], "Limit": "1", "Name": "Limit" } @@ -137,9 +175,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], "Name": "Aggregate" }, { + "Inputs": [], "Name": "TableFullScan", "ReadColumns": [ "a", diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestScriptingServiceHelp.test_help/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestScriptingServiceHelp.test_help/result.output index 22b854372c92..91513150312d 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestScriptingServiceHelp.test_help/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestScriptingServiceHelp.test_help/result.output @@ -14,8 +14,8 @@ Options: --flame-graph [Path] Path for statistics flame graph image, works only with full stats {-s|--script} [String] Text of script to execute {-f|--file} PATH [Required] Script file - --explain Explain query (default: 0) - --show-response-metadata Show response metadata for ydb call (default: 0) + --explain Explain query + --show-response-metadata Show response metadata for ydb call --format STRING Output format. Available options: pretty Human readable output diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestScriptingServiceHelp.test_help_ex/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestScriptingServiceHelp.test_help_ex/result.output index 4f73bb8caa8a..2de35cc314bd 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestScriptingServiceHelp.test_help_ex/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestScriptingServiceHelp.test_help_ex/result.output @@ -14,8 +14,8 @@ Options: --flame-graph [Path] Path for statistics flame graph image, works only with full stats {-s|--script} [String] Text of script to execute {-f|--file} PATH [Required] Script file - --explain Explain query (default: 0) - --show-response-metadata Show response metadata for ydb call (default: 0) + --explain Explain query + --show-response-metadata Show response metadata for ydb call --format STRING Output format. Available options: pretty Human readable output