Repository navigation
Commit cc615ab
committed
[fix](be) Merge master and migrate search scoring to unified indexes
Problem Summary:
Resolve conflicts with the unified MATCH and SEARCH index execution refactor.
Preserve this PR's scoring behavior through the new query and reader interfaces.
Related PR: #68758
Release note: Preserve search scoring fixes after index execution unification.
Tests: ASAN unit validation in progress; header hygiene and clang-format 16 passed.
Behavior changed: No additional behavior beyond the existing scoring fix.
Documentation: Not required; no new syntax or settings.1,157 files changed
Lines changed: 46181 additions & 38542 deletions
File tree
- .github
- workflows
- be
- benchmark
- src
- cloud
- core
- block
- data_type_serde
- data_type
- exec
- common
- data_gen_functions
- operator
- scan
- exprs
- function
- array
- search
- format_v2
- delimited_text
- json
- table
- format
- csv
- json
- orc
- parquet
- table
- load
- channel
- delta_writer
- group_commit/wal
- runtime
- index_policy
- storage
- compaction
- index
- ann
- inverted
- analysis
- analyzer
- basic
- icu
- ik
- cfg
- core
- dic
- kuromoji
- dict
- char_filter
- gram
- normalizer
- token_filter
- tokenizer
- basic
- char
- empty
- icu
- ik
- keyword
- ngram
- pinyin
- standard
- clucene
- spi
- common
- query_v2
- boolean_query
- collect
- phrase_prefix_query
- phrase_query
- prefix_query
- regexp_query
- scored_bit_set_query
- wildcard_query
- query
- engine
- all_query
- bit_set_query
- boolean_query
- collect
- const_score_query
- expand_query
- phrase_prefix_query
- phrase_query
- postings
- term_query
- union
- wand
- exec
- logical
- gram
- phrase_query
- phrase
- scoring
- spi
- reader
- snii
- bkd
- common
- compaction
- encoding
- format
- io
- query
- internal
- reader
- writer
- util
- snii
- io
- query
- internal
- predicate
- rowset
- schema_change
- segment
- tablet
- task
- tools
- util
- test
- core/data_type
- exec
- scan
- sink
- exprs
- function
- cast
- search
- format/table/iceberg
- runtime
- index_policy
- storage
- cache
- index
- ann
- inverted
- analysis
- analyzer
- kuromoji
- char_filter
- gram
- token_filter
- tokenizer
- clucene/compaction
- util
- common
- query_v2
- query
- engine
- boolean_query
- exec
- logical/gram
- phrase_query
- phrase
- scoring
- spi
- reader
- snii
- bench
- bkd
- common
- compaction
- encoding
- format
- io
- query
- reader
- stats
- writer
- util
- snii
- bench
- io
- query
- predicate
- rowset
- segment
- tablet
- variant
- testutil
- build-support
- compile-bench
- tests
- fe
- fe-connector
- fe-connector-hive/src
- main/java/org/apache/doris/connector/hive
- test/java/org/apache/doris/connector/hive
- fe-connector-hms/src
- main/java/org/apache/doris/connector/hms
- test/java/org/apache/doris/connector/hms
- fe-connector-iceberg/src
- main/java/org/apache/doris/connector/iceberg
- test/java/org/apache/doris/connector/iceberg
- fe-connector-spi/src
- main/java/org/apache/doris/connector/spi
- scan
- write
- test
- java/org/apache/doris/connector/spi
- scan
- resources
- fe-core/src
- main/java/org/apache/doris
- datasource
- scan
- split
- job
- extensions/insert/streaming
- offset
- jdbc
- nereids/trees
- expressions
- plans
- commands/insert
- physical
- persist
- qe
- test/java/org/apache/doris
- datasource
- scan
- split
- job
- extensions/insert/streaming
- offset/jdbc
- nereids
- properties
- trees/plans/physical
- types
- util
- planner
- qe
- fe-filesystem
- fe-filesystem-oss/src
- main/java/org/apache/doris/filesystem/oss
- test/java/org/apache/doris/filesystem/oss
- fe-filesystem-spi/src
- main/java/org/apache/doris/filesystem/spi
- test/java/org/apache/doris/filesystem/spi
- regression-test
- data
- external_table_p0
- hive
- iceberg/write
- external_table_p2/maxcompute
- inverted_index_p0
- nereids_syntax_p0
- query_p0/sql_functions
- search
- suites
- external_table_p0
- hive
- iceberg
- write
- external_table_p2
- iceberg
- maxcompute
- write
- inverted_index_p0
- nereids_syntax_p0
- query_p0/sql_functions
- search
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
29 | | - | |
| 28 | + | |
30 | 29 | | |
31 | 30 | | |
32 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
138 | 138 | | |
139 | 139 | | |
140 | 140 | | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
141 | 145 | | |
142 | 146 | | |
143 | 147 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
126 | 126 | | |
127 | 127 | | |
128 | 128 | | |
129 | | - | |
| 129 | + | |
130 | 130 | | |
131 | 131 | | |
132 | 132 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
369 | 369 | | |
370 | 370 | | |
371 | 371 | | |
372 | | - | |
| 372 | + | |
373 | 373 | | |
374 | 374 | | |
375 | 375 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
78 | | - | |
| 78 | + | |
79 | 79 | | |
80 | 80 | | |
81 | 81 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
| 27 | + | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | | - | |
| 54 | + | |
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| |||
0 commit comments