Skip to content

Commit 8f93283

Browse files
committed
[chore](io) Fix clang-format for file_size propagation and bvar changes
1 parent d4e3c49 commit 8f93283

4 files changed

Lines changed: 8 additions & 11 deletions

File tree

be/src/format/table/iceberg_delete_file_reader_helper.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,7 @@ Status read_iceberg_position_delete_file(const TIcebergDeleteFileDesc& delete_fi
277277
}
278278

279279
TFileRangeDesc delete_range = build_iceberg_delete_file_range(
280-
delete_file.path,
281-
delete_file.__isset.file_size ? delete_file.file_size : -1);
280+
delete_file.path, delete_file.__isset.file_size ? delete_file.file_size : -1);
282281
if (options.fs_name != nullptr && !options.fs_name->empty()) {
283282
delete_range.__set_fs_name(*options.fs_name);
284283
}
@@ -351,8 +350,7 @@ Status read_iceberg_deletion_vector(const TIcebergDeleteFileDesc& delete_file,
351350
{ return Status::EndOfFile("stop read."); });
352351

353352
TFileRangeDesc delete_range = build_iceberg_delete_file_range(
354-
delete_file.path,
355-
delete_file.__isset.file_size ? delete_file.file_size : -1);
353+
delete_file.path, delete_file.__isset.file_size ? delete_file.file_size : -1);
356354
if (options.fs_name != nullptr && !options.fs_name->empty()) {
357355
delete_range.__set_fs_name(*options.fs_name);
358356
}

be/src/format_v2/table/iceberg_reader.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,8 +1522,7 @@ Status IcebergTableReader::_create_delete_file_reader(const TIcebergDeleteFileDe
15221522
delete_file.file_format);
15231523
}
15241524
auto delete_range = build_iceberg_delete_file_range(
1525-
delete_file.path,
1526-
delete_file.__isset.file_size ? delete_file.file_size : -1);
1525+
delete_file.path, delete_file.__isset.file_size ? delete_file.file_size : -1);
15271526
if (_current_task != nullptr && _current_task->data_file != nullptr &&
15281527
!_current_task->data_file->fs_name.empty()) {
15291528
delete_range.__set_fs_name(_current_task->data_file->fs_name);

be/src/io/fs/hdfs_file_reader.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ Status HdfsFileReader::do_read_at_impl(size_t offset, Slice result, size_t* byte
168168
tSize loop_read;
169169
{
170170
SCOPED_BVAR_LATENCY(hdfs_bvar::hdfs_read_latency);
171-
loop_read = hdfsPread(_handle->fs(), _handle->file(), offset + has_read,
172-
to + has_read, to_read);
171+
loop_read = hdfsPread(_handle->fs(), _handle->file(), offset + has_read, to + has_read,
172+
to_read);
173173
}
174174
{
175175
[[maybe_unused]] Status error_ret;

be/test/format_v2/table/iceberg_reader_test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5062,9 +5062,9 @@ TEST(IcebergV2ReaderTest, IcebergEqualityDeleteFileSizePropagatedToReader) {
50625062
auto split_options = build_split_options(file_path);
50635063
split_options.cache = &cache;
50645064
split_options.current_range.__set_table_format_params(make_iceberg_table_format_desc(
5065-
file_path, {make_iceberg_equality_delete_file(delete_file_path, {0},
5066-
TFileFormatType::FORMAT_PARQUET,
5067-
delete_file_size)}));
5065+
file_path,
5066+
{make_iceberg_equality_delete_file(
5067+
delete_file_path, {0}, TFileFormatType::FORMAT_PARQUET, delete_file_size)}));
50685068
ASSERT_TRUE(reader.prepare_split(split_options).ok());
50695069

50705070
Block block = build_table_block(projected_columns);

0 commit comments

Comments
 (0)