This is an automated email from the ASF dual-hosted git repository.
eldenmoon pushed a commit to branch branch-2.0-var
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0-var by this push:
new 6a57aa9e18c [Bug](topn) fix wrong column id for `_runtime_predicate`
(#27021)
6a57aa9e18c is described below
commit 6a57aa9e18c5e548d1c04092b4a03beea22f2492
Author: lihangyu <[email protected]>
AuthorDate: Wed Nov 15 20:51:54 2023 +0800
[Bug](topn) fix wrong column id for `_runtime_predicate` (#27021)
---
be/src/olap/rowset/segment_v2/segment_iterator.cpp | 6 +++---
fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/be/src/olap/rowset/segment_v2/segment_iterator.cpp
b/be/src/olap/rowset/segment_v2/segment_iterator.cpp
index b5e72b6586c..0154b3bba78 100644
--- a/be/src/olap/rowset/segment_v2/segment_iterator.cpp
+++ b/be/src/olap/rowset/segment_v2/segment_iterator.cpp
@@ -490,9 +490,9 @@ Status
SegmentIterator::_get_row_ranges_from_conditions(RowRanges* condition_row
and_predicate.add_column_predicate(single_predicate);
RowRanges column_rp_row_ranges =
RowRanges::create_single(num_rows());
-
RETURN_IF_ERROR(_column_iterators[_schema->column_id(runtime_predicate->column_id())]
-
->get_row_ranges_by_zone_map(&and_predicate, nullptr,
-
&column_rp_row_ranges));
+ RETURN_IF_ERROR(
+
_column_iterators[runtime_predicate->column_id()]->get_row_ranges_by_zone_map(
+ &and_predicate, nullptr, &column_rp_row_ranges));
// intersect different columns's row ranges to get final row
ranges by zone map
RowRanges::ranges_intersection(zone_map_row_ranges,
column_rp_row_ranges,
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java
index acfee8af7d8..d915b3d4d4e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java
@@ -783,7 +783,8 @@ public class SelectStmt extends QueryStmt {
LOG.debug("only support duplicate key or MOW model");
return false;
}
- if (!olapTable.getEnableLightSchemaChange() ||
!Strings.isNullOrEmpty(olapTable.getStoragePolicy())) {
+ if (!olapTable.getEnableLightSchemaChange() ||
!Strings.isNullOrEmpty(olapTable.getStoragePolicy())
+ || olapTable.hasVariantColumns()) {
return false;
}
if (getOrderByElements() != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
