Skip to content

Commit 2e67e36

Browse files
authored
always uses block engine reader for olap tables (#20604)
1 parent 561068e commit 2e67e36

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

.github/config/muted_ya.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,18 @@ ydb/core/kqp/ut/federated_query/s3 sole chunk chunk
4343
ydb/core/kqp/ut/indexes KqpMultishardIndex.WriteIntoRenamingAsyncIndex
4444
ydb/core/kqp/ut/indexes KqpMultishardIndex.WriteIntoRenamingSyncIndex
4545
ydb/core/kqp/ut/olap [*/*] chunk chunk
46+
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestAggregation
47+
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestFilterCompare
48+
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestFilterEqual
49+
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestFilterNulls
50+
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestJoinByDecimal
51+
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestJoinById
52+
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestOrderByDecimal
53+
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestSimpleQueries
54+
ydb/core/kqp/ut/scheme KqpOlapScheme.AddPgColumnWithStore
55+
ydb/core/kqp/ut/scheme KqpOlapTypes.Decimal
56+
ydb/core/kqp/ut/scheme KqpOlapTypes.Decimal35
57+
ydb/core/kqp/ut/scheme KqpOlapTypes.DecimalCsv
4658
ydb/core/kqp/ut/opt KqpKv.ReadRows_TimeoutCancelsReads
4759
ydb/core/kqp/ut/query KqpAnalyze.AnalyzeTable+ColumnStore
4860
ydb/core/kqp/ut/query KqpAnalyze.AnalyzeTable-ColumnStore

ydb/core/kqp/opt/peephole/kqp_opt_peephole_wide_read.cpp

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ TExprBase KqpBuildWideReadTable(const TExprBase& node, TExprContext& ctx, TTypeA
1717
return node;
1818
}
1919

20+
Y_UNUSED(typesCtx);
21+
2022
auto rowType = node.Ref().GetTypeAnn()->Cast<TFlowExprType>()->GetItemType()->Cast<TStructExprType>();
2123

2224
TVector<TCoArgument> args;
@@ -41,18 +43,14 @@ TExprBase KqpBuildWideReadTable(const TExprBase& node, TExprContext& ctx, TTypeA
4143
} else if (auto maybeRead = node.Maybe<TKqpReadTableRanges>()) {
4244
wideRead = ctx.RenameNode(*node.Raw(), TKqpWideReadTableRanges::CallableName());
4345
} else if (auto maybeRead = node.Maybe<TKqpReadOlapTableRanges>()) {
44-
if (typesCtx.IsBlockEngineEnabled()) {
45-
wideRead = Build<TCoToFlow>(ctx, node.Pos())
46-
.Input<TCoWideFromBlocks>()
47-
.Input<TCoFromFlow>()
48-
.Input(ctx.RenameNode(*node.Raw(), TKqpBlockReadOlapTableRanges::CallableName()))
49-
.Build()
46+
wideRead = Build<TCoToFlow>(ctx, node.Pos())
47+
.Input<TCoWideFromBlocks>()
48+
.Input<TCoFromFlow>()
49+
.Input(ctx.RenameNode(*node.Raw(), TKqpBlockReadOlapTableRanges::CallableName()))
5050
.Build()
51-
.Done()
52-
.Ptr();
53-
} else {
54-
wideRead = ctx.RenameNode(*node.Raw(), TKqpWideReadOlapTableRanges::CallableName());
55-
}
51+
.Build()
52+
.Done()
53+
.Ptr();
5654
} else {
5755
YQL_ENSURE(false, "Unknown read table operation: " << node.Ptr()->Content());
5856
}

0 commit comments

Comments
 (0)