Skip to content

Commit

Permalink
Merge branch 'apache:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@xyfsjq
xyfsjq authored Jul 26, 2024
2 parents 312ed51 + 9741887 commit 582bb02
Show file tree
Hide file tree
Showing 193 changed files with 1,659 additions and 310 deletions.
16 changes: 8 additions & 8 deletions be/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,29 +373,29 @@ endif()
# For CMAKE_BUILD_TYPE=Debug
if (OS_MACOSX AND ARCH_ARM)
# Using -O0 may meet ARM64 branch out of range errors when linking with tcmalloc.
set(CXX_FLAGS_DEBUG "${CXX_GCC_FLAGS} -Og")
set(CXX_FLAGS_DEBUG "-Og")
else()
set(CXX_FLAGS_DEBUG "${CXX_GCC_FLAGS} -O0")
set(CXX_FLAGS_DEBUG "-O0")
endif()

# For CMAKE_BUILD_TYPE=Release
# -O3: Enable all compiler optimizations
# -DNDEBUG: Turn off dchecks/asserts/debug only code.
set(CXX_FLAGS_RELEASE "${CXX_GCC_FLAGS} -O3 -DNDEBUG")
set(CXX_FLAGS_ASAN "${CXX_GCC_FLAGS} -O0 -fsanitize=address -fsanitize=undefined -fno-strict-aliasing -fno-sanitize=alignment,signed-integer-overflow,float-cast-overflow -DUNDEFINED_BEHAVIOR_SANITIZER -DADDRESS_SANITIZER")
set(CXX_FLAGS_LSAN "${CXX_GCC_FLAGS} -O0 -fsanitize=leak -DLEAK_SANITIZER")
set(CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
set(CXX_FLAGS_ASAN "-O0 -fsanitize=address -fsanitize=undefined -fno-strict-aliasing -fno-sanitize=alignment,signed-integer-overflow,float-cast-overflow -DUNDEFINED_BEHAVIOR_SANITIZER -DADDRESS_SANITIZER")
set(CXX_FLAGS_LSAN "-O0 -fsanitize=leak -DLEAK_SANITIZER")
## Use for BE-UT
set(CXX_FLAGS_ASAN_UT "${CXX_GCC_FLAGS} -O0 -fsanitize=address -DADDRESS_SANITIZER")
set(CXX_FLAGS_ASAN_UT "-O0 -fsanitize=address -DADDRESS_SANITIZER")

# Set the flags to the undefined behavior sanitizer, also known as "ubsan"
# Turn on sanitizer and debug symbols to get stack traces:
set(CXX_FLAGS_UBSAN "${CXX_GCC_FLAGS} -O0 -fno-wrapv -mcmodel=medium -fsanitize=undefined -DUNDEFINED_BEHAVIOR_SANITIZER")
set(CXX_FLAGS_UBSAN "-O0 -fno-wrapv -mcmodel=medium -fsanitize=undefined -DUNDEFINED_BEHAVIOR_SANITIZER")

# Set the flags to the thread sanitizer, also known as "tsan"
# Turn on sanitizer and debug symbols to get stack traces:
# Use -Wno-builtin-declaration-mismatch to mute warnings like "new declaration ‘__tsan_atomic16 __tsan_atomic16_fetch_nand(..."
# If use -O0 to compile, BE will stack overflow when start. https://github.com/apache/doris/issues/8868
set(CXX_FLAGS_TSAN "${CXX_GCC_FLAGS} -O1 -fsanitize=thread -DTHREAD_SANITIZER -Wno-missing-declarations")
set(CXX_FLAGS_TSAN "-O1 -fsanitize=thread -DTHREAD_SANITIZER -Wno-missing-declarations")

# Set compile flags based on the build type.
if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
Expand Down
4 changes: 3 additions & 1 deletion be/src/exprs/create_predicate_function.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ class MinmaxFunctionTraits {
using BasePtr = MinMaxFuncBase*;
template <PrimitiveType type, size_t N>
static BasePtr get_function() {
return new MinMaxNumFunc<typename PrimitiveTypeTraits<type>::CppType>();
using CppType = typename PrimitiveTypeTraits<type>::CppType;
return new MinMaxNumFunc<
std::conditional_t<std::is_same_v<CppType, StringRef>, std::string, CppType>>();
}
};

Expand Down
60 changes: 17 additions & 43 deletions be/src/exprs/minmax_predicate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "vec/columns/column_nullable.h"
#include "vec/columns/column_string.h"
#include "vec/common/assert_cast.h"
#include "vec/common/string_ref.h"

namespace doris {
// only used in Runtime Filter
Expand Down Expand Up @@ -75,19 +76,22 @@ class MinMaxNumFunc : public MinMaxFuncBase {
for (size_t i = start; i < size; i++) {
if (nullmap == nullptr || !nullmap[i]) {
if constexpr (NeedMin) {
_min = std::min(_min, column_string.get_data_at(i));
if (column_string.get_data_at(i) < StringRef(_min)) {
_min = column_string.get_data_at(i).to_string();
}
}
if constexpr (NeedMax) {
_max = std::max(_max, column_string.get_data_at(i));
if (column_string.get_data_at(i) > StringRef(_max)) {
_max = column_string.get_data_at(i).to_string();
}
}
}
}
store_string_ref();
}

void update_batch(const vectorized::ColumnPtr& column, size_t start) {
const auto size = column->size();
if constexpr (std::is_same_v<T, StringRef>) {
if constexpr (std::is_same_v<T, std::string>) {
if (column->is_column_string64()) {
_update_batch_string(assert_cast<const vectorized::ColumnString64&>(*column),
nullptr, start, size);
Expand All @@ -111,7 +115,7 @@ class MinMaxNumFunc : public MinMaxFuncBase {
void update_batch(const vectorized::ColumnPtr& column, const vectorized::NullMap& nullmap,
size_t start) {
const auto size = column->size();
if constexpr (std::is_same_v<T, StringRef>) {
if constexpr (std::is_same_v<T, std::string>) {
if (column->is_column_string64()) {
_update_batch_string(assert_cast<const vectorized::ColumnString64&>(*column),
nullmap.data(), start, size);
Expand All @@ -135,26 +139,15 @@ class MinMaxNumFunc : public MinMaxFuncBase {
}

Status merge(MinMaxFuncBase* minmax_func) override {
if constexpr (std::is_same_v<T, StringRef>) {
auto* other_minmax = static_cast<MinMaxNumFunc<T>*>(minmax_func);
if constexpr (NeedMin) {
_min = std::min(_min, other_minmax->_min);
}
if constexpr (NeedMax) {
_max = std::max(_max, other_minmax->_max);
}
store_string_ref();
} else {
auto* other_minmax = static_cast<MinMaxNumFunc<T>*>(minmax_func);
if constexpr (NeedMin) {
if (other_minmax->_min < _min) {
_min = other_minmax->_min;
}
auto* other_minmax = static_cast<MinMaxNumFunc<T>*>(minmax_func);
if constexpr (NeedMin) {
if (other_minmax->_min < _min) {
_min = other_minmax->_min;
}
if constexpr (NeedMax) {
if (other_minmax->_max > _max) {
_max = other_minmax->_max;
}
}
if constexpr (NeedMax) {
if (other_minmax->_max > _max) {
_max = other_minmax->_max;
}
}

Expand All @@ -172,28 +165,9 @@ class MinMaxNumFunc : public MinMaxFuncBase {
return Status::OK();
}

void store_string_ref() {
if constexpr (std::is_same_v<T, StringRef>) {
if constexpr (NeedMin) {
if (_min.data != _stored_min.data()) {
_stored_min = _min.to_string();
_min = StringRef(_stored_min);
}
}
if constexpr (NeedMax) {
if (_max.data != _stored_max.data()) {
_stored_max = _max.to_string();
_max = StringRef(_stored_max);
}
}
}
}

protected:
T _max = type_limit<T>::min();
T _min = type_limit<T>::max();
std::string _stored_min;
std::string _stored_max;
};

template <class T>
Expand Down
Loading

0 comments on commit 582bb02

Please sign in to comment.