Skip to content

Commit b10073a

Browse files
gavinchougavinchou
andauthored
[branch-4.1] Fix meta tool build (#63371)
## Proposed changes Fix meta_tool build on branch-4.1 by: - adding the repository root include path for meta_tool so common/cpp/private_member_accessor.hpp can be resolved - qualifying Doris types in meta_tool.cpp - fixing private member pointer access through ExecEnv* ## Testing - sh format_code.sh be/src/tools/meta_tool.cpp - sh build.sh --be --meta-tool -j100 Co-authored-by: gavinchou <gavinchou@apache.org>
1 parent 0731a76 commit b10073a

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

be/src/tools/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ add_executable(meta_tool
2525
meta_tool.cpp
2626
)
2727

28+
target_include_directories(meta_tool PRIVATE ${PROJECT_SOURCE_DIR}/..)
29+
2830
pch_reuse(meta_tool)
2931

3032
# This permits libraries loaded by dlopen to link to the symbols in the program.

be/src/tools/meta_tool.cpp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ void print_column_data_values(const doris::segment_v2::ColumnMetaPB& column_meta
631631
return;
632632
}
633633

634-
MutableColumnPtr dst_column = data_type->create_column();
634+
doris::MutableColumnPtr dst_column = data_type->create_column();
635635

636636
// Determine how many rows to display (max 10 rows for readability)
637637
const size_t max_display_rows = 10;
@@ -658,11 +658,11 @@ void print_column_data_values(const doris::segment_v2::ColumnMetaPB& column_meta
658658
for (size_t i = 0; i < rows_read; ++i) {
659659
std::cout << indent << " [" << i << "] ";
660660
if (column_meta.is_nullable()) {
661-
const auto& nullable_col = assert_cast<const ColumnNullable&>(*dst_column);
661+
const auto& nullable_col = assert_cast<const doris::ColumnNullable&>(*dst_column);
662662
if (nullable_col.is_null_at(i)) {
663663
std::cout << "NULL";
664664
} else {
665-
const IColumn& nested_col = nullable_col.get_nested_column();
665+
const doris::IColumn& nested_col = nullable_col.get_nested_column();
666666
std::cout << format_column_value(nested_col, i, field_type);
667667
}
668668
} else {
@@ -764,11 +764,12 @@ void print_column_meta(const doris::segment_v2::ColumnMetaPB& column_meta,
764764
}
765765

766766
// Register hijacked accessors
767-
ACCESS_PRIVATE_FIELD(ExecEnv_encoding_info_resolver, ExecEnv,
767+
ACCESS_PRIVATE_FIELD(ExecEnv_encoding_info_resolver, doris::ExecEnv,
768768
doris::segment_v2::EncodingInfoResolver*, _encoding_info_resolver);
769-
ACCESS_PRIVATE_FIELD(ExecEnv_orphan_mem_tracker, ExecEnv, std::shared_ptr<doris::MemTrackerLimiter>,
770-
_orphan_mem_tracker);
771-
ACCESS_PRIVATE_STATIC_FIELD(ExecEnv_tracking_memory, ExecEnv, std::atomic_bool, _s_tracking_memory);
769+
ACCESS_PRIVATE_FIELD(ExecEnv_orphan_mem_tracker, doris::ExecEnv,
770+
std::shared_ptr<doris::MemTrackerLimiter>, _orphan_mem_tracker);
771+
ACCESS_PRIVATE_STATIC_FIELD(ExecEnv_tracking_memory, doris::ExecEnv, std::atomic_bool,
772+
_s_tracking_memory);
772773

773774
void show_segment_data(const std::string& file_name) {
774775
// Initialize ExecEnv components needed for ColumnReader
@@ -779,15 +780,15 @@ void show_segment_data(const std::string& file_name) {
779780
auto mem_tracker = GET_PRIVATE_FIELD(ExecEnv_orphan_mem_tracker);
780781
auto tracking_memory = GET_PRIVATE_STATIC_FIELD(ExecEnv_tracking_memory);
781782
// Initialize encoding info resolver for ColumnReader
782-
if (exec_env.*resolver == nullptr) {
783-
exec_env.*resolver = new doris::segment_v2::EncodingInfoResolver();
783+
if ((*exec_env).*resolver == nullptr) {
784+
(*exec_env).*resolver = new doris::segment_v2::EncodingInfoResolver();
784785
}
785786
// Initialize mem tracker limiter pool and orphan mem tracker for ThreadMemTrackerMgr
786787
if (exec_env->mem_tracker_limiter_pool.empty()) {
787788
exec_env->mem_tracker_limiter_pool.resize(doris::MEM_TRACKER_GROUP_NUM,
788789
doris::TrackerLimiterGroup());
789790
tracking_memory->store(true, std::memory_order_release);
790-
exec_env.*mem_tracker = doris::MemTrackerLimiter::create_shared(
791+
(*exec_env).*mem_tracker = doris::MemTrackerLimiter::create_shared(
791792
doris::MemTrackerLimiter::Type::GLOBAL, "Orphan");
792793
}
793794

0 commit comments

Comments
 (0)