This is an automated email from the ASF dual-hosted git repository.
panxiaolei pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 6185d29b75 fix compile failed on 2.0 (#23511)
6185d29b75 is described below
commit 6185d29b75120e63dc8085439943ba7c6a3ba3df
Author: Pxl <pxl...@qq.com>
AuthorDate: Fri Aug 25 20:17:29 2023 +0800
fix compile failed on 2.0 (#23511)
---
be/src/vec/common/field_visitors.h | 444 ++++---------------------------------
be/src/vec/common/uint128.h | 6 +-
2 files changed, 48 insertions(+), 402 deletions(-)
diff --git a/be/src/vec/common/field_visitors.h
b/be/src/vec/common/field_visitors.h
index c2d92a90d9..c6726fe822 100644
--- a/be/src/vec/common/field_visitors.h
+++ b/be/src/vec/common/field_visitors.h
@@ -24,12 +24,8 @@
#include "vec/core/accurate_comparison.h"
#include "vec/core/field.h"
-class SipHash;
-
namespace doris::vectorized {
-UInt128 string_to_uuid(const String&);
-
/** StaticVisitor (and its descendants) - class with overloaded operator() for
all types of fields.
* You could call visitor for field using function 'apply_visitor'.
* Also "binary visitor" is supported - its operator() takes two arguments.
@@ -67,408 +63,62 @@ typename std::decay_t<Visitor>::ResultType
apply_visitor(Visitor&& visitor, F&&
return visitor(field.template get<DecimalField<Decimal128>>());
case Field::Types::Decimal128I:
return visitor(field.template get<DecimalField<Decimal128I>>());
+
default:
LOG(FATAL) << "Bad type of Field";
return {};
}
}
-/** Prints Field as literal in SQL query */
-class FieldVisitorToString : public StaticVisitor<String> {
-public:
- String operator()(const Null& x) const;
- String operator()(const UInt64& x) const;
- String operator()(const UInt128& x) const;
- String operator()(const Int64& x) const;
- String operator()(const Float64& x) const;
- String operator()(const String& x) const;
- String operator()(const Array& x) const;
- String operator()(const Tuple& x) const;
- String operator()(const DecimalField<Decimal32>& x) const;
- String operator()(const DecimalField<Decimal64>& x) const;
- String operator()(const DecimalField<Decimal128>& x) const;
- String operator()(const DecimalField<Decimal128I>& x) const;
- String operator()(const AggregateFunctionStateData& x) const;
-};
-
-/** Print readable and unique text dump of field type and value. */
-class FieldVisitorDump : public StaticVisitor<String> {
-public:
- String operator()(const Null& x) const;
- String operator()(const UInt64& x) const;
- String operator()(const UInt128& x) const;
- String operator()(const Int64& x) const;
- String operator()(const Float64& x) const;
- String operator()(const String& x) const;
- String operator()(const Array& x) const;
- String operator()(const Tuple& x) const;
- String operator()(const DecimalField<Decimal32>& x) const;
- String operator()(const DecimalField<Decimal64>& x) const;
- String operator()(const DecimalField<Decimal128>& x) const;
- String operator()(const DecimalField<Decimal128I>& x) const;
- String operator()(const AggregateFunctionStateData& x) const;
-};
-
-/** Converts numeric value of any type to specified type. */
-template <typename T>
-class FieldVisitorConvertToNumber : public StaticVisitor<T> {
-public:
- T operator()(const Null&) const {
- LOG(FATAL) << "Cannot convert NULL to " << demangle(typeid(T).name());
- return {};
- }
-
- T operator()(const String&) const {
- LOG(FATAL) << "Cannot convert String to " <<
demangle(typeid(T).name());
- return {};
- }
-
- T operator()(const Array&) const {
- LOG(FATAL) << "Cannot convert Array to " << demangle(typeid(T).name());
- return {};
- }
-
- T operator()(const Tuple&) const {
- LOG(FATAL) << "Cannot convert Tuple to " << demangle(typeid(T).name());
- return {};
- }
-
- T operator()(const UInt64& x) const { return x; }
- T operator()(const Int64& x) const { return x; }
- T operator()(const Float64& x) const { return x; }
-
- T operator()(const UInt128&) const {
- LOG(FATAL) << "Cannot convert UInt128 to " <<
demangle(typeid(T).name());
- return {};
- }
-
- template <typename U>
- T operator()(const DecimalField<U>& x) const {
- if constexpr (std::is_floating_point_v<T>)
- return static_cast<T>(x.get_value()) / x.get_scale_multiplier();
- else {
- return x.get_value() / x.get_scale_multiplier();
- }
- }
+template <typename Visitor, typename F1, typename F2>
+typename std::decay_t<Visitor>::ResultType apply_visitor(Visitor&& visitor,
F1&& field1,
+ F2&& field2) {
+ switch (field1.getType()) {
+ case Field::Types::Null:
+ return apply_binary_visitor_impl(std::forward<Visitor>(visitor),
+ field1.template get<Null>(),
std::forward<F2>(field2));
+ case Field::Types::UInt64:
+ return apply_binary_visitor_impl(std::forward<Visitor>(visitor),
+ field1.template get<UInt64>(),
std::forward<F2>(field2));
+ case Field::Types::UInt128:
+ return apply_binary_visitor_impl(std::forward<Visitor>(visitor),
+ field1.template get<UInt128>(),
std::forward<F2>(field2));
+ case Field::Types::Int64:
+ return apply_binary_visitor_impl(std::forward<Visitor>(visitor),
+ field1.template get<Int64>(),
std::forward<F2>(field2));
+ case Field::Types::Float64:
+ return apply_binary_visitor_impl(std::forward<Visitor>(visitor),
+ field1.template get<Float64>(),
std::forward<F2>(field2));
+ case Field::Types::String:
+ return apply_binary_visitor_impl(std::forward<Visitor>(visitor),
+ field1.template get<String>(),
std::forward<F2>(field2));
+ case Field::Types::Array:
+ return apply_binary_visitor_impl(std::forward<Visitor>(visitor),
+ field1.template get<Array>(),
std::forward<F2>(field2));
+ case Field::Types::Tuple:
+ return apply_binary_visitor_impl(std::forward<Visitor>(visitor),
+ field1.template get<Tuple>(),
std::forward<F2>(field2));
+ case Field::Types::Decimal32:
+ return apply_binary_visitor_impl(std::forward<Visitor>(visitor),
+ field1.template
get<DecimalField<Decimal32>>(),
+ std::forward<F2>(field2));
+ case Field::Types::Decimal64:
+ return apply_binary_visitor_impl(std::forward<Visitor>(visitor),
+ field1.template
get<DecimalField<Decimal64>>(),
+ std::forward<F2>(field2));
+ case Field::Types::Decimal128:
+ return apply_binary_visitor_impl(std::forward<Visitor>(visitor),
+ field1.template
get<DecimalField<Decimal128>>(),
+ std::forward<F2>(field2));
+ case Field::Types::Decimal128I:
+ return apply_binary_visitor_impl(std::forward<Visitor>(visitor),
+ field1.template
get<DecimalField<Decimal128I>>(),
+ std::forward<F2>(field2));
- T operator()(const AggregateFunctionStateData&) const {
- LOG(FATAL) << "Cannot convert AggregateFunctionStateData to " <<
demangle(typeid(T).name());
+ default:
+ LOG(FATAL) << "Bad type of Field";
return {};
}
-};
-
-/** Updates SipHash by type and value of Field */
-class FieldVisitorHash : public StaticVisitor<> {
-private:
- SipHash& hash;
-
-public:
- FieldVisitorHash(SipHash& hash_);
-
- void operator()(const Null& x) const;
- void operator()(const UInt64& x) const;
- void operator()(const UInt128& x) const;
- void operator()(const Int64& x) const;
- void operator()(const Float64& x) const;
- void operator()(const String& x) const;
- void operator()(const Array& x) const;
- void operator()(const Tuple& x) const;
- void operator()(const DecimalField<Decimal32>& x) const;
- void operator()(const DecimalField<Decimal64>& x) const;
- void operator()(const DecimalField<Decimal128>& x) const;
- void operator()(const DecimalField<Decimal128I>& x) const;
- void operator()(const AggregateFunctionStateData& x) const;
-};
-
-template <typename T>
-constexpr bool is_decimalField() {
- return false;
-}
-template <>
-constexpr bool is_decimalField<DecimalField<Decimal32>>() {
- return true;
}
-template <>
-constexpr bool is_decimalField<DecimalField<Decimal64>>() {
- return true;
-}
-template <>
-constexpr bool is_decimalField<DecimalField<Decimal128>>() {
- return true;
-}
-template <>
-constexpr bool is_decimalField<DecimalField<Decimal128I>>() {
- return true;
-}
-
-/** More precise comparison, used for index.
- * Differs from Field::operator< and Field::operator== in that it also
compares values of different types.
- * Comparison rules are same as in FunctionsComparison (to be consistent with
expression evaluation in query).
- */
-class FieldVisitorAccurateEquals : public StaticVisitor<bool> {
-public:
- bool operator()(const UInt64& l, const Null& r) const { return
cant_compare(l, r); }
- bool operator()(const UInt64& l, const UInt64& r) const { return l == r; }
- bool operator()(const UInt64& l, const UInt128& r) const { return
cant_compare(l, r); }
- bool operator()(const UInt64& l, const Int64& r) const { return
accurate::equalsOp(l, r); }
- bool operator()(const UInt64& l, const Float64& r) const { return
accurate::equalsOp(l, r); }
- bool operator()(const UInt64& l, const String& r) const { return
cant_compare(l, r); }
- bool operator()(const UInt64& l, const Array& r) const { return
cant_compare(l, r); }
- bool operator()(const UInt64& l, const Tuple& r) const { return
cant_compare(l, r); }
- bool operator()(const UInt64& l, const AggregateFunctionStateData& r)
const {
- return cant_compare(l, r);
- }
-
- bool operator()(const Int64& l, const Null& r) const { return
cant_compare(l, r); }
- bool operator()(const Int64& l, const UInt64& r) const { return
accurate::equalsOp(l, r); }
- bool operator()(const Int64& l, const UInt128& r) const { return
cant_compare(l, r); }
- bool operator()(const Int64& l, const Int64& r) const { return l == r; }
- bool operator()(const Int64& l, const Float64& r) const { return
accurate::equalsOp(l, r); }
- bool operator()(const Int64& l, const String& r) const { return
cant_compare(l, r); }
- bool operator()(const Int64& l, const Array& r) const { return
cant_compare(l, r); }
- bool operator()(const Int64& l, const Tuple& r) const { return
cant_compare(l, r); }
- bool operator()(const Int64& l, const AggregateFunctionStateData& r) const
{
- return cant_compare(l, r);
- }
-
- bool operator()(const Float64& l, const Null& r) const { return
cant_compare(l, r); }
- bool operator()(const Float64& l, const UInt64& r) const { return
accurate::equalsOp(l, r); }
- bool operator()(const Float64& l, const UInt128& r) const { return
cant_compare(l, r); }
- bool operator()(const Float64& l, const Int64& r) const { return
accurate::equalsOp(l, r); }
- bool operator()(const Float64& l, const Float64& r) const { return l == r;
}
- bool operator()(const Float64& l, const String& r) const { return
cant_compare(l, r); }
- bool operator()(const Float64& l, const Array& r) const { return
cant_compare(l, r); }
- bool operator()(const Float64& l, const Tuple& r) const { return
cant_compare(l, r); }
- bool operator()(const Float64& l, const AggregateFunctionStateData& r)
const {
- return cant_compare(l, r);
- }
-
- template <typename T>
- bool operator()(const Null&, const T&) const {
- return std::is_same_v<T, Null>;
- }
-
- template <typename T>
- bool operator()(const String& l, const T& r) const {
- if constexpr (std::is_same_v<T, String>) return l == r;
- if constexpr (std::is_same_v<T, UInt128>) return string_to_uuid(l) ==
r;
- return cant_compare(l, r);
- }
-
- template <typename T>
- bool operator()(const UInt128& l, const T& r) const {
- if constexpr (std::is_same_v<T, UInt128>) return l == r;
- if constexpr (std::is_same_v<T, String>) return l == string_to_uuid(r);
- return cant_compare(l, r);
- }
-
- template <typename T>
- bool operator()(const Array& l, const T& r) const {
- if constexpr (std::is_same_v<T, Array>) return l == r;
- return cant_compare(l, r);
- }
-
- template <typename T>
- bool operator()(const Tuple& l, const T& r) const {
- if constexpr (std::is_same_v<T, Tuple>) return l == r;
- return cant_compare(l, r);
- }
-
- template <typename T, typename U>
- bool operator()(const DecimalField<T>& l, const U& r) const {
- if constexpr (is_decimalField<U>()) return l == r;
- if constexpr (std::is_same_v<U, Int64> || std::is_same_v<U, UInt64>)
- return l == DecimalField<Decimal128>(r, 0);
- return cant_compare(l, r);
- }
-
- template <typename T>
- bool operator()(const UInt64& l, const DecimalField<T>& r) const {
- return DecimalField<Decimal128>(l, 0) == r;
- }
- template <typename T>
- bool operator()(const Int64& l, const DecimalField<T>& r) const {
- return DecimalField<Decimal128>(l, 0) == r;
- }
- template <typename T>
- bool operator()(const Float64& l, const DecimalField<T>& r) const {
- return cant_compare(l, r);
- }
-
- template <typename T>
- bool operator()(const AggregateFunctionStateData& l, const T& r) const {
- if constexpr (std::is_same_v<T, AggregateFunctionStateData>) return l
== r;
- return cant_compare(l, r);
- }
-
-private:
- template <typename T, typename U>
- bool cant_compare(const T&, const U&) const {
- if constexpr (std::is_same_v<U, Null>) return false;
- LOG(FATAL) << fmt::format("Cannot compare {} with {}",
demangle(typeid(T).name()),
- demangle(typeid(U).name()));
- }
-};
-
-class FieldVisitorAccurateLess : public StaticVisitor<bool> {
-public:
- bool operator()(const UInt64& l, const Null& r) const { return
cant_compare(l, r); }
- bool operator()(const UInt64& l, const UInt64& r) const { return l < r; }
- bool operator()(const UInt64& l, const UInt128& r) const { return
cant_compare(l, r); }
- bool operator()(const UInt64& l, const Int64& r) const { return
accurate::lessOp(l, r); }
- bool operator()(const UInt64& l, const Float64& r) const { return
accurate::lessOp(l, r); }
- bool operator()(const UInt64& l, const String& r) const { return
cant_compare(l, r); }
- bool operator()(const UInt64& l, const Array& r) const { return
cant_compare(l, r); }
- bool operator()(const UInt64& l, const Tuple& r) const { return
cant_compare(l, r); }
- bool operator()(const UInt64& l, const AggregateFunctionStateData& r)
const {
- return cant_compare(l, r);
- }
-
- bool operator()(const Int64& l, const Null& r) const { return
cant_compare(l, r); }
- bool operator()(const Int64& l, const UInt64& r) const { return
accurate::lessOp(l, r); }
- bool operator()(const Int64& l, const UInt128& r) const { return
cant_compare(l, r); }
- bool operator()(const Int64& l, const Int64& r) const { return l < r; }
- bool operator()(const Int64& l, const Float64& r) const { return
accurate::lessOp(l, r); }
- bool operator()(const Int64& l, const String& r) const { return
cant_compare(l, r); }
- bool operator()(const Int64& l, const Array& r) const { return
cant_compare(l, r); }
- bool operator()(const Int64& l, const Tuple& r) const { return
cant_compare(l, r); }
- bool operator()(const Int64& l, const AggregateFunctionStateData& r) const
{
- return cant_compare(l, r);
- }
-
- bool operator()(const Float64& l, const Null& r) const { return
cant_compare(l, r); }
- bool operator()(const Float64& l, const UInt64& r) const { return
accurate::lessOp(l, r); }
- bool operator()(const Float64& l, const UInt128& r) const { return
cant_compare(l, r); }
- bool operator()(const Float64& l, const Int64& r) const { return
accurate::lessOp(l, r); }
- bool operator()(const Float64& l, const Float64& r) const { return l < r; }
- bool operator()(const Float64& l, const String& r) const { return
cant_compare(l, r); }
- bool operator()(const Float64& l, const Array& r) const { return
cant_compare(l, r); }
- bool operator()(const Float64& l, const Tuple& r) const { return
cant_compare(l, r); }
- bool operator()(const Float64& l, const AggregateFunctionStateData& r)
const {
- return cant_compare(l, r);
- }
-
- template <typename T>
- bool operator()(const Null&, const T&) const {
- return !std::is_same_v<T, Null>;
- }
-
- template <typename T>
- bool operator()(const String& l, const T& r) const {
- if constexpr (std::is_same_v<T, String>) return l < r;
- if constexpr (std::is_same_v<T, UInt128>) return string_to_uuid(l) < r;
- return cant_compare(l, r);
- }
-
- template <typename T>
- bool operator()(const UInt128& l, const T& r) const {
- if constexpr (std::is_same_v<T, UInt128>) return l < r;
- if constexpr (std::is_same_v<T, String>) return l < string_to_uuid(r);
- return cant_compare(l, r);
- }
-
- template <typename T>
- bool operator()(const Array& l, const T& r) const {
- if constexpr (std::is_same_v<T, Array>) return l < r;
- return cant_compare(l, r);
- }
-
- template <typename T>
- bool operator()(const Tuple& l, const T& r) const {
- if constexpr (std::is_same_v<T, Tuple>) return l < r;
- return cant_compare(l, r);
- }
-
- template <typename T, typename U>
- bool operator()(const DecimalField<T>& l, const U& r) const {
- if constexpr (is_decimalField<U>())
- return l < r;
- else if constexpr (std::is_same_v<U, Int64> || std::is_same_v<U,
UInt64>)
- return l < DecimalField<Decimal128>(r, 0);
- return cant_compare(l, r);
- }
-
- template <typename T>
- bool operator()(const UInt64& l, const DecimalField<T>& r) const {
- return DecimalField<Decimal128>(l, 0) < r;
- }
- template <typename T>
- bool operator()(const Int64& l, const DecimalField<T>& r) const {
- return DecimalField<Decimal128>(l, 0) < r;
- }
- template <typename T>
- bool operator()(const Float64&, const DecimalField<T>&) const {
- return false;
- }
-
- template <typename T>
- bool operator()(const AggregateFunctionStateData& l, const T& r) const {
- return cant_compare(l, r);
- }
-
-private:
- template <typename T, typename U>
- bool cant_compare(const T&, const U&) const {
- LOG(FATAL) << fmt::format("Cannot compare {} with {}",
demangle(typeid(T).name()),
- demangle(typeid(U).name()));
- return false;
- }
-};
-
-/** Implements `+=` operation.
- * Returns false if the result is zero.
- */
-class FieldVisitorSum : public StaticVisitor<bool> {
-private:
- const Field& rhs;
-
-public:
- explicit FieldVisitorSum(const Field& rhs_) : rhs(rhs_) {}
-
- bool operator()(UInt64& x) const {
- x += get<UInt64>(rhs);
- return x != 0;
- }
- bool operator()(Int64& x) const {
- x += get<Int64>(rhs);
- return x != 0;
- }
- bool operator()(Float64& x) const {
- x += get<Float64>(rhs);
- return x != 0;
- }
-
- bool operator()(Null&) const {
- LOG(FATAL) << "Cannot sum Nulls";
- return false;
- }
-
- bool operator()(String&) const {
- LOG(FATAL) << "Cannot sum Strings";
- return false;
- }
- bool operator()(Array&) const {
- LOG(FATAL) << "Cannot sum Arrays";
- return false;
- }
- bool operator()(Tuple&) const {
- LOG(FATAL) << "Cannot sum Tuples";
- return false;
- }
- bool operator()(UInt128&) const {
- LOG(FATAL) << "Cannot sum UUIDs";
- return false;
- }
- bool operator()(AggregateFunctionStateData&) const {
- LOG(FATAL) << "Cannot sum AggregateFunctionStates";
- return false;
- }
-
- template <typename T>
- bool operator()(DecimalField<T>& x) const {
- x += get<DecimalField<T>>(rhs);
- return x.get_value() != 0;
- }
-};
} // namespace doris::vectorized
diff --git a/be/src/vec/common/uint128.h b/be/src/vec/common/uint128.h
index 4d35cfdd00..e849bc8c61 100644
--- a/be/src/vec/common/uint128.h
+++ b/be/src/vec/common/uint128.h
@@ -50,11 +50,7 @@ struct UInt128 {
}
bool operator==(const UInt128 rhs) const { return tuple() == rhs.tuple(); }
- bool operator!=(const UInt128 rhs) const { return tuple() != rhs.tuple(); }
- bool operator<(const UInt128 rhs) const { return tuple() < rhs.tuple(); }
- bool operator<=(const UInt128 rhs) const { return tuple() <= rhs.tuple(); }
- bool operator>(const UInt128 rhs) const { return tuple() > rhs.tuple(); }
- bool operator>=(const UInt128 rhs) const { return tuple() >= rhs.tuple(); }
+ auto operator<=>(const UInt128 rhs) const { return tuple() <=>
rhs.tuple(); }
UInt128 operator<<(const UInt128& rhs) const {
const uint64_t shift = rhs.low;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
