Skip to content
Open
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
2 changes: 1 addition & 1 deletion be/src/cloud/cloud_rowset_writer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ Status CloudRowsetWriter::_collect_packed_slice_location(io::FileWriter* file_wr
}

rowset_meta->add_packed_slice_location(file_path, index.packed_file_path, index.offset,
index.size);
index.size, index.packed_file_size);
LOG(INFO) << "collect packed file index: " << file_path << " -> " << index.packed_file_path
<< ", offset: " << index.offset << ", size: " << index.size;
return Status::OK();
Expand Down
9 changes: 9 additions & 0 deletions be/src/io/fs/packed_file_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,15 @@ void PackedFileManager::process_uploading_packed_files() {
first_slice = false;
slices_stream << small_file_path << "(txn=" << index.txn_id
<< ", offset=" << index.offset << ", size=" << index.size << ")";

// Update packed_file_size in global index
{
std::lock_guard<std::mutex> global_lock(_global_index_mutex);
auto it = _global_slice_locations.find(small_file_path);
if (it != _global_slice_locations.end()) {
it->second.packed_file_size = packed_file->total_size;
}
}
}
LOG(INFO) << "Packed file " << packed_file->packed_file_path
<< " uploaded; slices=" << packed_file->slice_locations.size()
Expand Down
1 change: 1 addition & 0 deletions be/src/io/fs/packed_file_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ struct PackedSliceLocation {
std::string rowset_id;
std::string resource_id;
int64_t txn_id = 0;
int64_t packed_file_size = -1; // Total size of the packed file, -1 means not set
};

struct PackedAppendContext {
Expand Down
10 changes: 4 additions & 6 deletions be/src/io/fs/packed_file_system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,11 @@ Status PackedFileSystem::open_file_impl(const Path& file, FileReaderSPtr* reader
FileReaderSPtr inner_reader;
// Create a new FileReaderOptions with the correct file size
FileReaderOptions local_opts = opts ? *opts : FileReaderOptions();
// DCHECK(opts->file_size == -1 || opts->file_size == index.size)
// << "file size is not correct, expected: " << index.size
// << ", actual: " << opts->file_size;
// local_opts.file_size = index.size + index.offset;
local_opts.file_size = -1;
// Set file_size to packed file size to avoid head object request
local_opts.file_size = index.packed_file_size;
LOG(INFO) << "open packed file: " << index.packed_file_path << ", file: " << file.native()
<< ", offset: " << index.offset << ", size: " << index.size;
<< ", offset: " << index.offset << ", size: " << index.size
<< ", packed_file_size: " << index.packed_file_size;
RETURN_IF_ERROR(
_inner_fs->open_file(Path(index.packed_file_path), &inner_reader, &local_opts));

Expand Down
2 changes: 2 additions & 0 deletions be/src/olap/rowset/rowset_meta.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ io::FileSystemSPtr RowsetMeta::fs() {
index.packed_file_path = index_pb.packed_file_path();
index.offset = index_pb.offset();
index.size = index_pb.size();
index.packed_file_size =
index_pb.has_packed_file_size() ? index_pb.packed_file_size() : -1;
index.tablet_id = tablet_id();
index.rowset_id = _rowset_id.to_string();
index.resource_id = wrapped->id();
Expand Down
3 changes: 2 additions & 1 deletion be/src/olap/rowset/rowset_meta.h
Original file line number Diff line number Diff line change
Expand Up @@ -426,12 +426,13 @@ class RowsetMeta : public MetadataAdder<RowsetMeta> {

void add_packed_slice_location(const std::string& segment_path,
const std::string& packed_file_path, int64_t offset,
int64_t size) {
int64_t size, int64_t packed_file_size) {
auto* index_map = _rowset_meta_pb.mutable_packed_slice_locations();
auto& index_pb = (*index_map)[segment_path];
index_pb.set_packed_file_path(packed_file_path);
index_pb.set_offset(offset);
index_pb.set_size(size);
index_pb.set_packed_file_size(packed_file_size);
}

private:
Expand Down
1 change: 1 addition & 0 deletions gensrc/proto/olap_file.proto
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ message PackedSliceLocationPB {
optional string packed_file_path = 1;
optional int64 offset = 2;
optional int64 size = 3;
optional int64 packed_file_size = 4; // Total size of the packed file
}

// ATTN: When adding or deleting fields, please update `message RowsetMetaCloudPB`
Expand Down
Loading