Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit92c9236

Browse files
committed
resovle rebase conflicts
1 parent325fe7c commit92c9236

File tree

2 files changed

+14
-17
lines changed

2 files changed

+14
-17
lines changed

‎src/query/storages/fuse/src/io/read/meta/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
mod meta_readers;
1616

17-
pubuse meta_readers::bytes_reader;
18-
pubuse meta_readers::read_thrift_file_metadata;
1917
pubuse meta_readers::CompactSegmentInfoReader;
2018
pubuse meta_readers::MetaReaders;
2119
pubuse meta_readers::SegmentStatsReader;
2220
pubuse meta_readers::TableSnapshotReader;
21+
pubuse meta_readers::bytes_reader;
22+
pubuse meta_readers::read_thrift_file_metadata;

‎src/query/storages/fuse/src/table_functions/fuse_encoding.rs‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,10 @@ use databend_common_catalog::catalog_kind::CATALOG_DEFAULT;
1919
use databend_common_catalog::plan::DataSourcePlan;
2020
use databend_common_catalog::plan::Filters;
2121
use databend_common_catalog::table::Table;
22-
use databend_common_catalog::table_args::string_value;
2322
use databend_common_catalog::table_args::TableArgs;
23+
use databend_common_catalog::table_args::string_value;
2424
use databend_common_exception::ErrorCode;
2525
use databend_common_exception::Result;
26-
use databend_common_expression::expr::*;
27-
use databend_common_expression::types::nullable::NullableColumnBuilder;
28-
use databend_common_expression::types::string::StringColumnBuilder;
29-
use databend_common_expression::types::BooleanType;
30-
use databend_common_expression::types::NumberDataType;
31-
use databend_common_expression::types::StringType;
32-
use databend_common_expression::types::UInt32Type;
33-
use databend_common_expression::types::UInt64Type;
3426
use databend_common_expression::Column;
3527
use databend_common_expression::ColumnId;
3628
use databend_common_expression::DataBlock;
@@ -45,11 +37,19 @@ use databend_common_expression::TableField;
4537
use databend_common_expression::TableSchema;
4638
use databend_common_expression::TableSchemaRef;
4739
use databend_common_expression::TableSchemaRefExt;
40+
use databend_common_expression::expr::*;
41+
use databend_common_expression::types::BooleanType;
42+
use databend_common_expression::types::NumberDataType;
43+
use databend_common_expression::types::StringType;
44+
use databend_common_expression::types::UInt32Type;
45+
use databend_common_expression::types::UInt64Type;
46+
use databend_common_expression::types::nullable::NullableColumnBuilder;
47+
use databend_common_expression::types::string::StringColumnBuilder;
4848
use databend_common_functions::BUILTIN_FUNCTIONS;
4949
use databend_common_native::read::reader::NativeReader;
50-
use databend_common_native::stat::stat_simple;
5150
use databend_common_native::stat::ColumnInfo;
5251
use databend_common_native::stat::PageBody;
52+
use databend_common_native::stat::stat_simple;
5353
use databend_storages_common_io::MergeIOReader;
5454
use databend_storages_common_io::ReadSettings;
5555
use databend_storages_common_table_meta::meta::SegmentInfo;
@@ -61,15 +61,12 @@ use parquet::format::Type as ParquetPhysicalType;
6161
usecrate::BlockReadResult;
6262
usecrate::FuseStorageFormat;
6363
usecrate::FuseTable;
64-
usecrate::io::read::meta::read_thrift_file_metadata;
6564
usecrate::io::SegmentsIO;
65+
usecrate::io::read::meta::read_thrift_file_metadata;
6666
usecrate::sessions::TableContext;
67-
usecrate::table_functions::string_literal;
6867
usecrate::table_functions::SimpleArgFunc;
6968
usecrate::table_functions::SimpleArgFuncTemplate;
70-
usecrate::BlockReadResult;
71-
usecrate::FuseStorageFormat;
72-
usecrate::FuseTable;
69+
usecrate::table_functions::string_literal;
7370

7471
pubstructFuseEncodingArgs{
7572
database_name:String,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp