This is an automated email from the ASF dual-hosted git repository.
gabriellee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new d2e0f2363b7 [env](compile)open compile check in spill file (#42604)
d2e0f2363b7 is described below
commit d2e0f2363b7f1742ee63e954ad579a83caa4c268
Author: Mryange <[email protected]>
AuthorDate: Tue Oct 29 15:28:05 2024 +0800
[env](compile)open compile check in spill file (#42604)
---
be/src/vec/spill/spill_reader.cpp | 4 +++-
be/src/vec/spill/spill_reader.h | 4 +++-
be/src/vec/spill/spill_stream.cpp | 1 +
be/src/vec/spill/spill_stream.h | 4 +++-
be/src/vec/spill/spill_stream_manager.cpp | 10 +++++-----
be/src/vec/spill/spill_stream_manager.h | 6 ++++--
be/src/vec/spill/spill_writer.cpp | 1 +
be/src/vec/spill/spill_writer.h | 3 +++
8 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/be/src/vec/spill/spill_reader.cpp
b/be/src/vec/spill/spill_reader.cpp
index f0320ee9b49..3c2f00273a4 100644
--- a/be/src/vec/spill/spill_reader.cpp
+++ b/be/src/vec/spill/spill_reader.cpp
@@ -19,6 +19,7 @@
#include <algorithm>
+#include "common/cast_set.h"
#include "common/exception.h"
#include "io/file_factory.h"
#include "io/fs/file_reader.h"
@@ -27,6 +28,7 @@
#include "util/slice.h"
#include "vec/core/block.h"
namespace doris {
+#include "common/compile_check_begin.h"
namespace io {
class FileSystem;
} // namespace io
@@ -113,7 +115,7 @@ Status SpillReader::read(Block* block, bool* eos) {
if (bytes_read > 0) {
{
SCOPED_TIMER(deserialize_timer_);
- if (!pb_block_.ParseFromArray(result.data, result.size)) {
+ if (!pb_block_.ParseFromArray(result.data,
cast_set<int>(result.size))) {
return Status::InternalError("Failed to read spilled block");
}
RETURN_IF_ERROR(block->deserialize(pb_block_));
diff --git a/be/src/vec/spill/spill_reader.h b/be/src/vec/spill/spill_reader.h
index 6694bf91572..6dea8376206 100644
--- a/be/src/vec/spill/spill_reader.h
+++ b/be/src/vec/spill/spill_reader.h
@@ -28,6 +28,7 @@
#include "util/runtime_profile.h"
namespace doris::vectorized {
+#include "common/compile_check_begin.h"
class Block;
class SpillReader {
public:
@@ -78,4 +79,5 @@ private:
using SpillReaderUPtr = std::unique_ptr<SpillReader>;
-} // namespace doris::vectorized
\ No newline at end of file
+} // namespace doris::vectorized
+#include "common/compile_check_end.h"
diff --git a/be/src/vec/spill/spill_stream.cpp
b/be/src/vec/spill/spill_stream.cpp
index 7189fad262c..d83cbabb189 100644
--- a/be/src/vec/spill/spill_stream.cpp
+++ b/be/src/vec/spill/spill_stream.cpp
@@ -34,6 +34,7 @@
#include "vec/spill/spill_writer.h"
namespace doris::vectorized {
+#include "common/compile_check_begin.h"
SpillStream::SpillStream(RuntimeState* state, int64_t stream_id, SpillDataDir*
data_dir,
std::string spill_dir, size_t batch_rows, size_t
batch_bytes,
RuntimeProfile* profile)
diff --git a/be/src/vec/spill/spill_stream.h b/be/src/vec/spill/spill_stream.h
index ad30a0bbd1d..a95a4760322 100644
--- a/be/src/vec/spill/spill_stream.h
+++ b/be/src/vec/spill/spill_stream.h
@@ -24,6 +24,7 @@
#include "vec/spill/spill_writer.h"
namespace doris {
+#include "common/compile_check_begin.h"
class RuntimeProfile;
class ThreadPool;
@@ -109,4 +110,5 @@ private:
};
using SpillStreamSPtr = std::shared_ptr<SpillStream>;
} // namespace vectorized
-} // namespace doris
\ No newline at end of file
+} // namespace doris
+#include "common/compile_check_end.h"
diff --git a/be/src/vec/spill/spill_stream_manager.cpp
b/be/src/vec/spill/spill_stream_manager.cpp
index 61e96559d23..89bd09b7fad 100644
--- a/be/src/vec/spill/spill_stream_manager.cpp
+++ b/be/src/vec/spill/spill_stream_manager.cpp
@@ -41,6 +41,7 @@
#include "vec/spill/spill_stream.h"
namespace doris::vectorized {
+#include "common/compile_check_begin.h"
SpillStreamManager::SpillStreamManager(
std::unordered_map<std::string,
std::unique_ptr<vectorized::SpillDataDir>>&&
@@ -350,8 +351,8 @@ Status SpillDataDir::update_capacity() {
&_available_bytes));
spill_disk_capacity->set_value(_disk_capacity_bytes);
spill_disk_avail_capacity->set_value(_available_bytes);
- auto disk_use_max_bytes = (int64_t)(_disk_capacity_bytes *
-
config::storage_flood_stage_usage_percent / (double)100);
+ auto disk_use_max_bytes =
+ (int64_t)(_disk_capacity_bytes *
config::storage_flood_stage_usage_percent / 100);
bool is_percent = true;
_spill_data_limit_bytes =
ParseUtil::parse_mem_spec(config::spill_storage_limit, -1,
_disk_capacity_bytes,
&is_percent);
@@ -363,9 +364,8 @@ Status SpillDataDir::update_capacity() {
return Status::InvalidArgument(err_msg);
}
if (is_percent) {
- _spill_data_limit_bytes =
- (int64_t)(_spill_data_limit_bytes *
config::storage_flood_stage_usage_percent /
- (double)100);
+ _spill_data_limit_bytes = (int64_t)(_spill_data_limit_bytes *
+
config::storage_flood_stage_usage_percent / 100);
}
if (_spill_data_limit_bytes > disk_use_max_bytes) {
_spill_data_limit_bytes = disk_use_max_bytes;
diff --git a/be/src/vec/spill/spill_stream_manager.h
b/be/src/vec/spill/spill_stream_manager.h
index 66c71724f16..7bcfe950097 100644
--- a/be/src/vec/spill/spill_stream_manager.h
+++ b/be/src/vec/spill/spill_stream_manager.h
@@ -28,6 +28,7 @@
#include "util/threadpool.h"
#include "vec/spill/spill_stream.h"
namespace doris {
+#include "common/compile_check_begin.h"
class RuntimeProfile;
namespace vectorized {
@@ -77,7 +78,7 @@ private:
double _get_disk_usage(int64_t incoming_data_size) const {
return _disk_capacity_bytes == 0
? 0
- : (_disk_capacity_bytes - _available_bytes +
incoming_data_size) /
+ : (double)(_disk_capacity_bytes - _available_bytes +
incoming_data_size) /
(double)_disk_capacity_bytes;
}
@@ -146,4 +147,5 @@ private:
std::atomic_uint64_t id_ = 0;
};
} // namespace vectorized
-} // namespace doris
\ No newline at end of file
+} // namespace doris
+#include "common/compile_check_end.h"
diff --git a/be/src/vec/spill/spill_writer.cpp
b/be/src/vec/spill/spill_writer.cpp
index 46a97285802..bf755e76452 100644
--- a/be/src/vec/spill/spill_writer.cpp
+++ b/be/src/vec/spill/spill_writer.cpp
@@ -27,6 +27,7 @@
#include "vec/spill/spill_stream_manager.h"
namespace doris::vectorized {
+#include "common/compile_check_begin.h"
Status SpillWriter::open() {
if (file_writer_) {
return Status::OK();
diff --git a/be/src/vec/spill/spill_writer.h b/be/src/vec/spill/spill_writer.h
index d77bbd6908c..921bd8ea874 100644
--- a/be/src/vec/spill/spill_writer.h
+++ b/be/src/vec/spill/spill_writer.h
@@ -25,6 +25,7 @@
#include "util/runtime_profile.h"
#include "vec/core/block.h"
namespace doris {
+#include "common/compile_check_begin.h"
class RuntimeState;
namespace vectorized {
@@ -86,3 +87,5 @@ private:
using SpillWriterUPtr = std::unique_ptr<SpillWriter>;
} // namespace vectorized
} // namespace doris
+
+#include "common/compile_check_end.h"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
