Skip to content

Commit

Permalink
ok
Browse files Browse the repository at this point in the history
  • Loading branch information
ByteYue committed Jul 30, 2024
1 parent eb38dc6 commit 59c27b4
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 8 deletions.
2 changes: 0 additions & 2 deletions be/src/common/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1143,8 +1143,6 @@ DEFINE_mInt32(buffered_reader_read_timeout_ms, "20000");

DEFINE_Bool(enable_snapshot_action, "false");

DEFINE_mInt32(s3_writer_buffer_allocation_timeout_second, "60");

DEFINE_mBool(enable_column_type_check, "true");

// Tolerance for the number of partition id 0 in rowset, default 0
Expand Down
3 changes: 0 additions & 3 deletions be/src/common/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -1193,9 +1193,6 @@ DECLARE_mInt32(buffered_reader_read_timeout_ms);
// whether to enable /api/snapshot api
DECLARE_Bool(enable_snapshot_action);

// The timeout config for S3 write buffer allocation
DECLARE_mInt32(s3_writer_buffer_allocation_timeout_second);

DECLARE_mBool(enable_column_type_check);

// Tolerance for the number of partition id 0 in rowset, default 0
Expand Down
4 changes: 1 addition & 3 deletions be/src/io/fs/s3_file_write_bufferpool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ struct S3FileBuffer::PartData {
Memory<> _memory;
PartData() : _memory(config::s3_write_buffer_size) {}
~PartData() = default;
[[nodiscard]] Slice data() const { return Slice {_memory._data, _memory._size}; }
[[nodiscard]] size_t size() const { return _memory._size; }
};

void S3FileBuffer::on_finished() {
Expand Down Expand Up @@ -90,7 +88,7 @@ Status S3FileBuffer::append_data(const Slice& data) {

void S3FileBuffer::submit() {
if (LIKELY(nullptr != _inner_data)) {
_stream_ptr = std::make_shared<StringViewStream>(_inner_data->data(), _size);
_stream_ptr = std::make_shared<StringViewStream>(_inner_data->_memory._data, _size);
}

_thread_pool->submit_func([buf = this->shared_from_this()]() { buf->_on_upload(); });
Expand Down

0 comments on commit 59c27b4

Please sign in to comment.