Skip to content

Commit 8aabb9e

Browse files
committed
chore: fix ci fail
Signed-off-by: Kould <kould2333@gmail.com>
1 parent 8a987e4 commit 8aabb9e

File tree

8 files changed

+1
-22
lines changed

8 files changed

+1
-22
lines changed

src/query/service/src/test_kits/block_writer.rs

-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ impl<'a> BlockWriter<'a> {
109109
bloom_filter_index_size,
110110
None,
111111
None,
112-
None,
113112
Compression::Lz4Raw,
114113
Some(Utc::now()),
115114
);

src/query/storages/common/table_meta/src/meta/v2/segment.rs

-5
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ pub struct BlockMeta {
169169
#[serde(default)]
170170
pub bloom_filter_index_size: u64,
171171
pub inverted_index_size: Option<u64>,
172-
pub ngram_filter_index_size: Option<u64>,
173172
/// The block meta of virtual columns.
174173
pub virtual_block_meta: Option<VirtualBlockMeta>,
175174
pub compression: Compression,
@@ -191,7 +190,6 @@ impl BlockMeta {
191190
bloom_filter_index_location: Option<Location>,
192191
bloom_filter_index_size: u64,
193192
inverted_index_size: Option<u64>,
194-
ngram_filter_index_size: Option<u64>,
195193
virtual_block_meta: Option<VirtualBlockMeta>,
196194
compression: Compression,
197195
create_on: Option<DateTime<Utc>>,
@@ -207,7 +205,6 @@ impl BlockMeta {
207205
bloom_filter_index_location,
208206
bloom_filter_index_size,
209207
inverted_index_size,
210-
ngram_filter_index_size,
211208
virtual_block_meta,
212209
compression,
213210
create_on,
@@ -370,7 +367,6 @@ impl BlockMeta {
370367
inverted_index_size: None,
371368
virtual_block_meta: None,
372369
create_on: None,
373-
ngram_filter_index_size: None,
374370
}
375371
}
376372

@@ -396,7 +392,6 @@ impl BlockMeta {
396392
inverted_index_size: None,
397393
virtual_block_meta: None,
398394
create_on: None,
399-
ngram_filter_index_size: None,
400395
}
401396
}
402397
}

src/query/storages/common/table_meta/src/meta/v3/frozen/block_meta.rs

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ impl From<BlockMeta> for crate::meta::BlockMeta {
6262
bloom_filter_index_location: value.bloom_filter_index_location,
6363
bloom_filter_index_size: value.bloom_filter_index_size,
6464
inverted_index_size: None,
65-
ngram_filter_index_size: None,
6665
virtual_block_meta: None,
6766
compression: value.compression.into(),
6867
create_on: None,

src/query/storages/fuse/src/io/write/block_writer.rs

-2
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,6 @@ impl BlockBuilder {
226226
inverted_index_size,
227227
virtual_block_meta: None,
228228
create_on: Some(Utc::now()),
229-
// TODO(kould): ngram index
230-
ngram_filter_index_size: None,
231229
};
232230

233231
let serialized = BlockSerialization {

src/query/storages/fuse/src/io/write/stream/block_builder.rs

-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@ impl StreamBlockBuilder {
332332
compression: self.properties.write_settings.table_compression.into(),
333333
inverted_index_size,
334334
create_on: Some(Utc::now()),
335-
ngram_filter_index_size: None,
336335
virtual_block_meta: None,
337336
};
338337
let serialized = BlockSerialization {

src/query/storages/fuse/src/statistics/reducers.rs

-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ pub fn reduce_block_metas<T: Borrow<BlockMeta>>(
234234
compressed_byte_size += b.file_size;
235235
index_size += b.bloom_filter_index_size;
236236
index_size += b.inverted_index_size.unwrap_or_default();
237-
index_size += b.ngram_filter_index_size.unwrap_or_default();
238237
if let Some(virtual_block_meta) = &b.virtual_block_meta {
239238
index_size += virtual_block_meta.virtual_column_size;
240239
virtual_block_count += 1;

src/query/storages/fuse/src/table_functions/fuse_block.rs

-10
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,6 @@ impl TableMetaFunc for FuseBlock {
6565
"inverted_index_size",
6666
TableDataType::Nullable(Box::new(TableDataType::Number(NumberDataType::UInt64))),
6767
),
68-
TableField::new(
69-
"ngram_index_size",
70-
TableDataType::Nullable(Box::new(TableDataType::Number(NumberDataType::UInt64))),
71-
),
7268
])
7369
}
7470

@@ -90,7 +86,6 @@ impl TableMetaFunc for FuseBlock {
9086
let mut bloom_filter_location = vec![];
9187
let mut bloom_filter_size = Vec::with_capacity(len);
9288
let mut inverted_index_size = Vec::with_capacity(len);
93-
let mut ngram_index_size = Vec::with_capacity(len);
9489

9590
let segments_io = SegmentsIO::create(ctx.clone(), tbl.operator.clone(), tbl.schema());
9691

@@ -118,7 +113,6 @@ impl TableMetaFunc for FuseBlock {
118113
);
119114
bloom_filter_size.push(block.bloom_filter_index_size);
120115
inverted_index_size.push(block.inverted_index_size);
121-
ngram_index_size.push(block.ngram_filter_index_size);
122116

123117
row_num += 1;
124118
if row_num >= limit {
@@ -163,10 +157,6 @@ impl TableMetaFunc for FuseBlock {
163157
DataType::Nullable(Box::new(DataType::Number(NumberDataType::UInt64))),
164158
Value::Column(UInt64Type::from_opt_data(inverted_index_size)),
165159
),
166-
BlockEntry::new(
167-
DataType::Nullable(Box::new(DataType::Number(NumberDataType::UInt64))),
168-
Value::Column(UInt64Type::from_opt_data(ngram_index_size)),
169-
),
170160
],
171161
row_num,
172162
))

tests/sqllogictests/suites/base/09_fuse_engine/09_0006_func_fuse_history.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ insert into t values (1)
2121
query III
2222
select block_count, row_count, index_size from fuse_snapshot('db_09_0006', 't') order by row_count desc limit 1
2323
----
24-
1 1 0
24+
1 1 426
2525

2626
query I
2727
select count(1) from fuse_block('db_09_0006', 't')

0 commit comments

Comments
 (0)