[doris] branch master updated: [Bug](compile) fix compiling error due to merge conflicts (#23351)

[panxiaolei]

This is an automated email from the ASF dual-hosted git repository.

panxiaolei 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 450b90c082 [Bug](compile) fix compiling error due to merge conflicts 
(#23351)
450b90c082 is described below

commit 450b90c08217354c630a7ed2fba3e60e59b0036a
Author: Gabriel <gabrielleeb...@gmail.com>
AuthorDate: Wed Aug 23 11:57:57 2023 +0800

    [Bug](compile) fix compiling error due to merge conflicts (#23351)
    
    fix compiling error due to merge conflicts
---
 be/src/pipeline/exec/scan_operator.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/be/src/pipeline/exec/scan_operator.cpp 
b/be/src/pipeline/exec/scan_operator.cpp
index 1c7b840657..1ecc9c0598 100644
--- a/be/src/pipeline/exec/scan_operator.cpp
+++ b/be/src/pipeline/exec/scan_operator.cpp
@@ -855,10 +855,10 @@ Status 
ScanLocalState::_change_value_range(ColumnValueRange<PrimitiveType>& temp
                          (PrimitiveType == TYPE_BOOLEAN) || (PrimitiveType == 
TYPE_DATEV2)) {
         if constexpr (IsFixed) {
             func(temp_range,
-                 reinterpret_cast<typename 
VecPrimitiveTypeTraits<PrimitiveType>::CppType*>(value));
+                 reinterpret_cast<typename 
PrimitiveTypeTraits<PrimitiveType>::CppType*>(value));
         } else {
             func(temp_range, to_olap_filter_type(fn_name, slot_ref_child),
-                 reinterpret_cast<typename 
VecPrimitiveTypeTraits<PrimitiveType>::CppType*>(value));
+                 reinterpret_cast<typename 
PrimitiveTypeTraits<PrimitiveType>::CppType*>(value));
         }
     } else {
         static_assert(always_false_v<PrimitiveType>);
@@ -1103,7 +1103,7 @@ Status 
ScanLocalState::_normalize_match_predicate(vectorized::VExpr* expr,
         if (temp_pdt != vectorized::VScanNode::PushDownType::UNACCEPTABLE) {
             DCHECK(slot_ref_child >= 0);
             if (value.data != nullptr) {
-                using CppType = typename VecPrimitiveTypeTraits<T>::CppType;
+                using CppType = typename PrimitiveTypeTraits<T>::CppType;
                 if constexpr (T == TYPE_CHAR || T == TYPE_VARCHAR || T == 
TYPE_STRING ||
                               T == TYPE_HLL) {
                     auto val = StringRef(value.data, value.size);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org