This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 09e5535effd Revert "branch-3.0: [fix](inverted index) fix wrong read
data for primary key #47841 (#48206)" (#49337)
09e5535effd is described below
commit 09e5535effd155587df10976a7d28b213b96447e
Author: airborne12 <jiang...@selectdb.com>
AuthorDate: Fri Mar 21 20:45:02 2025 +0800
Revert "branch-3.0: [fix](inverted index) fix wrong read data for primary
key #47841 (#48206)" (#49337)
This reverts commit 7dcb1f7acc60fb927d443f032dd7c76073ab4cbf.
---
be/src/olap/rowset/segment_v2/segment_iterator.cpp | 14 +-------------
.../inverted_index_p0/test_pk_no_need_read_data.groovy | 13 +++++--------
2 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/be/src/olap/rowset/segment_v2/segment_iterator.cpp
b/be/src/olap/rowset/segment_v2/segment_iterator.cpp
index d4827ac2d4b..817a45b97d6 100644
--- a/be/src/olap/rowset/segment_v2/segment_iterator.cpp
+++ b/be/src/olap/rowset/segment_v2/segment_iterator.cpp
@@ -2487,19 +2487,7 @@ bool SegmentIterator::_no_need_read_key_data(ColumnId
cid, vectorized::MutableCo
return false;
}
- // seek_schema is set when get_row_ranges_by_keys, it is null when there
is no primary key range
- // in this case, we need to read data
- if (!_seek_schema) {
- return false;
- }
- // check if the column is in the seek_schema
- if (std::none_of(_seek_schema->columns().begin(),
_seek_schema->columns().end(),
- [&](const Field* col) {
- return (col &&
_opts.tablet_schema->field_index(col->unique_id()) == cid);
- })) {
- return false;
- }
- if (!_check_all_conditions_passed_inverted_index_for_column(cid, true)) {
+ if (!_check_all_conditions_passed_inverted_index_for_column(cid)) {
return false;
}
diff --git
a/regression-test/suites/inverted_index_p0/test_pk_no_need_read_data.groovy
b/regression-test/suites/inverted_index_p0/test_pk_no_need_read_data.groovy
index 976ef3623b9..1641d0e3e16 100644
--- a/regression-test/suites/inverted_index_p0/test_pk_no_need_read_data.groovy
+++ b/regression-test/suites/inverted_index_p0/test_pk_no_need_read_data.groovy
@@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-suite("test_pk_no_need_read_data", "nonConcurrent"){
+suite("test_pk_no_need_read_data", "p0"){
def table1 = "test_pk_no_need_read_data"
sql "drop table if exists ${table1}"
@@ -56,15 +56,12 @@ suite("test_pk_no_need_read_data", "nonConcurrent"){
sql "set enable_count_on_index_pushdown = true"
sql """ set enable_common_expr_pushdown = true """
- try {
-
GetDebugPoint().enableDebugPointForAllBEs("segment_iterator._read_columns_by_index")
- qt_select_0 "SELECT COUNT() FROM ${table1} WHERE date='2017-10-01'"
- } finally {
-
GetDebugPoint().disableDebugPointForAllBEs("segment_iterator._read_columns_by_index")
- }
+ qt_select_0 "SELECT COUNT() FROM ${table1} WHERE date='2017-10-01'"
qt_select_1 "SELECT COUNT() FROM ${table1} WHERE year(date)='2017'"
- // case2: disable count on index
+
+ // case1: disable count on index
sql "set enable_count_on_index_pushdown = false"
+
qt_select_2 "SELECT COUNT() FROM ${table1} WHERE date='2017-10-01'"
qt_select_3 "SELECT COUNT() FROM ${table1} WHERE year(date)='2017'"
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
