Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(storage): improve inverted index read fst file first to reduce load index #16385

Merged
merged 4 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 14 additions & 20 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ serde_with = { version = "3.8.1" }
serfig = "0.1.0"
sled = { version = "0.34", default-features = false }
stream-more = "0.1.3"
tantivy = "0.22.0"
tantivy = { git = "https://github.com/b41sh/tantivy", rev = "37aeac0" }
thiserror = { version = "1" }
tikv-jemalloc-ctl = { version = "0.5.0", features = ["use_std"] }
tokio = { version = "1.35.0", features = ["full"] }
Expand Down
2 changes: 2 additions & 0 deletions src/common/io/src/constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ pub const DEFAULT_BLOCK_INDEX_BUFFER_SIZE: usize = 300 * 1024;
pub const DEFAULT_BLOCK_MAX_ROWS: usize = 1000 * 1000;
// The min number of a block by default.
pub const DEFAULT_BLOCK_MIN_ROWS: usize = 800 * 1000;
/// The number of bytes read at the end of the file on first read
pub const DEFAULT_FOOTER_READ_SIZE: u64 = 64 * 1024;

// The min values of table option data_retention_period_in_hours
pub const DEFAULT_MIN_TABLE_LEVEL_DATA_RETENTION_PERIOD_IN_HOURS: u64 = 1;
37 changes: 26 additions & 11 deletions src/query/ee/tests/it/inverted_index/index_refresh.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.

use std::collections::BTreeMap;
use std::collections::HashSet;

use databend_common_base::base::tokio;
use databend_common_catalog::plan::InvertedIndexInfo;
Expand All @@ -38,6 +39,7 @@ use databend_query::interpreters::RefreshTableIndexInterpreter;
use databend_query::test_kits::append_string_sample_data;
use databend_query::test_kits::*;
use databend_storages_common_cache::LoadParams;
use tantivy::schema::IndexRecordOption;

#[tokio::test(flavor = "multi_thread")]
async fn test_fuse_do_refresh_inverted_index() -> Result<()> {
Expand Down Expand Up @@ -144,14 +146,17 @@ async fn test_fuse_do_refresh_inverted_index() -> Result<()> {
let field_nums = query_fields.len();
let has_score = true;
let need_position = false;
let mut field_ids = HashSet::new();
field_ids.insert(0);
field_ids.insert(1);
let index_record = IndexRecordOption::WithFreqsAndPositions;

let index_reader =
InvertedIndexReader::try_create(dal.clone(), field_nums, need_position, &index_loc).await?;
let index_reader = InvertedIndexReader::create(dal.clone());

let queries = vec![
("rust".to_string(), vec![0, 1]),
("java".to_string(), vec![2]),
("data".to_string(), vec![4, 1, 5]),
("data".to_string(), vec![1, 4, 5]),
];

for (query_text, ids) in queries.into_iter() {
Expand All @@ -166,14 +171,24 @@ async fn test_fuse_do_refresh_inverted_index() -> Result<()> {
inverted_index_option: None,
};

let (query, tokenizer_manager) = create_inverted_index_query(&inverted_index_info)?;

let matched_rows = index_reader.clone().do_filter(
has_score,
&query,
tokenizer_manager,
block_meta.row_count,
)?;
let (query, fuzziness, tokenizer_manager) =
create_inverted_index_query(&inverted_index_info)?;

let matched_rows = index_reader
.clone()
.do_filter(
field_nums,
need_position,
has_score,
query.box_clone(),
&field_ids,
&index_record,
&fuzziness,
tokenizer_manager,
block_meta.row_count as u32,
&index_loc,
)
.await?;
assert!(matched_rows.is_some());
let matched_rows = matched_rows.unwrap();
assert_eq!(matched_rows.len(), ids.len());
Expand Down
12 changes: 6 additions & 6 deletions src/query/ee/tests/it/inverted_index/pruning.rs
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ async fn test_block_pruner() -> Result<()> {
}),
..Default::default()
};
let e13 = PushDownInfo {
let _e13 = PushDownInfo {
inverted_index: Some(InvertedIndexInfo {
index_name: index_name.clone(),
index_version: index_version.clone(),
Expand All @@ -720,7 +720,7 @@ async fn test_block_pruner() -> Result<()> {
}),
..Default::default()
};
let e14 = PushDownInfo {
let _e14 = PushDownInfo {
inverted_index: Some(InvertedIndexInfo {
index_name: index_name.clone(),
index_version: index_version.clone(),
Expand All @@ -733,7 +733,7 @@ async fn test_block_pruner() -> Result<()> {
}),
..Default::default()
};
let e15 = PushDownInfo {
let _e15 = PushDownInfo {
inverted_index: Some(InvertedIndexInfo {
index_name: index_name.clone(),
index_version: index_version.clone(),
Expand All @@ -759,9 +759,9 @@ async fn test_block_pruner() -> Result<()> {
(Some(e10), 2, 2),
(Some(e11), 9, 15),
(Some(e12), 2, 2),
(Some(e13), 3, 3),
(Some(e14), 2, 2),
(Some(e15), 2, 5),
//(Some(e13), 3, 3),
//(Some(e14), 2, 2),
//(Some(e15), 2, 5),
];

for (extra, expected_blocks, expected_rows) in extras {
Expand Down
4 changes: 3 additions & 1 deletion src/query/storages/common/index/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@ databend-common-functions = { workspace = true }
databend-storages-common-table-meta = { workspace = true }
fastrace = { workspace = true }
jsonb = { workspace = true }
levenshtein_automata = "0.2.1"
log = { workspace = true }
match-template = { workspace = true }
parquet = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
tantivy = { workspace = true }
tantivy-common = "0.7.0"
tantivy-common = { git = "https://github.com/b41sh/tantivy", rev = "37aeac0", package = "tantivy-common" }
tantivy-fst = "0.5"
thiserror = { workspace = true }
xorfilter-rs = { workspace = true, features = ["cbordata"] }

Expand Down
Loading
Loading