Merge branch 'master' into handle-empty-block-size

Author: freemandealer

.asf.yaml

@@ -140,7 +140,6 @@ github:
         strict: false
         contexts:
           - License Check
-          - Clang Formatter
           - CheckStyle
           - Build Broker
           - Build Third Party Libraries (Linux)

.gitignore

@@ -137,6 +137,9 @@ lru_cache_test
 docker/thirdparties/docker-compose/*/data
 docker/thirdparties/docker-compose/*/logs
 docker/thirdparties/docker-compose/*/*.yaml
+docker/thirdparties/docker-compose/*/*.env
+docker/thirdparties/docker-compose/*/cache/
+docker/thirdparties/docker-compose/*/scripts/SUCCESS
 docker/runtime/be/resource/apache-doris/
 
 # other

.licenserc.yaml

@@ -44,6 +44,7 @@ header:
     - "**/*.parquet"
     - "docs/.markdownlintignore"
     - "fe/fe-core/src/test/resources/data/net_snmp_normal"
+    - "fe/fe-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkDefaultClientBuilder.java"
     - "fe/fe-core/src/main/antlr4/org/apache/doris/nereids/JavaLexer.g4"
     - "fe/fe-core/src/main/antlr4/org/apache/doris/nereids/JavaParser.g4"
     - "be/dict/ik/*"

LICENSE.txt

@@ -202,6 +202,13 @@
 
 --------------------------------------------------------------------------------
 
+The following components are provided under the Apache License. See project link for details.
+The text of each license is the standard Apache 2.0 license.
+
+software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder from AWS SDK v2 (sdk-core 2.29.52)
+
+--------------------------------------------------------------------------------
+
 be/src/common/status.* : BSD-style license
 
   Copyright (c) 2011 The LevelDB Authors. All rights reserved.

NOTICE.txt

@@ -52,3 +52,33 @@ its NOTICE file:
     This product includes cryptographic software written by Eric Young
     ([email protected]).  This product includes software written by Tim
     Hudson ([email protected]).
+
+--------------------------------------------------------------------------------    
+This product includes code from AWS SDK, which includes the following in
+its NOTICE file:
+ 
+AWS SDK for Java 2.0
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+This product includes software developed by
+Amazon Technologies, Inc (http://www.amazon.com/).
+
+**********************
+THIRD PARTY COMPONENTS
+**********************
+This software includes third party software subject to the following copyrights:
+- XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty.
+- PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
+- Apache Commons Lang - https://github.com/apache/commons-lang
+- Netty Reactive Streams - https://github.com/playframework/netty-reactive-streams
+- Jackson-core - https://github.com/FasterXML/jackson-core
+- Jackson-dataformat-cbor - https://github.com/FasterXML/jackson-dataformats-binary
+
+The licenses for these third party components are included in LICENSE.txt
+
+- For Apache Commons Lang see also this required NOTICE:
+  Apache Commons Lang
+  Copyright 2001-2020 The Apache Software Foundation
+  
+  This product includes software developed at
+  The Apache Software Foundation (https://www.apache.org/).    

be/src/common/exception.cpp

@@ -48,6 +48,14 @@ Exception::Exception(int code, const std::string_view& msg, bool from_status) {
     // std::cout << "Exception: " << code << ", " << msg << ", " << get_stack_trace(0, "DISABLED")
     //           << std::endl;
 #endif
+
+    fmt::memory_buffer buf;
+    fmt::format_to(buf, "[E{}] {}", _code, _err_msg->_msg);
+    if (!_err_msg->_stack.empty()) {
+        fmt::format_to(buf, "\n{}", _err_msg->_stack);
+    }
+    _cache_string = fmt::to_string(buf);
+
     if (config::exit_on_exception) {
         LOG(FATAL) << "[ExitOnException] error code: " << code << ", message: " << msg;
     }

be/src/common/exception.h

@@ -46,9 +46,9 @@ class Exception : public std::exception {
     int code() const { return _code; }
     std::string message() const { return _err_msg ? _err_msg->_msg : ""; }
 
-    const std::string& to_string() const;
+    const std::string& to_string() const { return _cache_string; }
 
-    const char* what() const noexcept override { return to_string().c_str(); }
+    const char* what() const noexcept override { return _cache_string.c_str(); }
 
     Status to_status() const { return {code(), _err_msg->_msg, _err_msg->_stack}; }
 
@@ -61,22 +61,8 @@ class Exception : public std::exception {
         std::string _stack;
     };
     std::unique_ptr<ErrMsg> _err_msg;
-    mutable std::string _cache_string;
+    std::string _cache_string {};
 };
-
-inline const std::string& Exception::to_string() const {
-    if (!_cache_string.empty()) {
-        return _cache_string;
-    }
-    fmt::memory_buffer buf;
-    fmt::format_to(buf, "[E{}] {}", _code, _err_msg ? _err_msg->_msg : "");
-    if (_err_msg && !_err_msg->_stack.empty()) {
-        fmt::format_to(buf, "\n{}", _err_msg->_stack);
-    }
-    _cache_string = fmt::to_string(buf);
-    return _cache_string;
-}
-
 } // namespace doris
 
 #define RETURN_IF_CATCH_EXCEPTION(stmt)                                                          \

be/src/exec/olap_utils.h

@@ -104,23 +104,23 @@ inline SQLFilterOp to_olap_filter_type(TExprOpcode::type type, bool opposite) {
     return FILTER_IN;
 }
 
-inline SQLFilterOp to_olap_filter_type(const std::string& function_name, bool opposite) {
+inline SQLFilterOp to_olap_filter_type(const std::string& function_name) {
     if (function_name == "lt") {
-        return opposite ? FILTER_LARGER : FILTER_LESS;
+        return FILTER_LESS;
     } else if (function_name == "gt") {
-        return opposite ? FILTER_LESS : FILTER_LARGER;
+        return FILTER_LARGER;
     } else if (function_name == "le") {
-        return opposite ? FILTER_LARGER_OR_EQUAL : FILTER_LESS_OR_EQUAL;
+        return FILTER_LESS_OR_EQUAL;
     } else if (function_name == "ge") {
-        return opposite ? FILTER_LESS_OR_EQUAL : FILTER_LARGER_OR_EQUAL;
+        return FILTER_LARGER_OR_EQUAL;
     } else if (function_name == "eq") {
-        return opposite ? FILTER_NOT_IN : FILTER_IN;
+        return FILTER_IN;
     } else if (function_name == "ne") {
-        return opposite ? FILTER_IN : FILTER_NOT_IN;
+        return FILTER_NOT_IN;
     } else if (function_name == "in") {
-        return opposite ? FILTER_NOT_IN : FILTER_IN;
+        return FILTER_IN;
     } else if (function_name == "not_in") {
-        return opposite ? FILTER_IN : FILTER_NOT_IN;
+        return FILTER_NOT_IN;
     } else {
         DCHECK(false) << "Function Name: " << function_name;
         return FILTER_IN;

be/src/exec/schema_scanner/schema_routine_load_job_scanner.cpp

@@ -56,6 +56,7 @@ std::vector<SchemaScanner::ColumnDesc> SchemaRoutineLoadJobScanner::_s_tbls_colu
         {"USER_NAME", TYPE_STRING, sizeof(StringRef), true},
         {"CURRENT_ABORT_TASK_NUM", TYPE_INT, sizeof(int32_t), true},
         {"IS_ABNORMAL_PAUSE", TYPE_BOOLEAN, sizeof(int8_t), true},
+        {"COMPUTE_GROUP", TYPE_STRING, sizeof(StringRef), true},
 };
 
 SchemaRoutineLoadJobScanner::SchemaRoutineLoadJobScanner()
@@ -173,6 +174,9 @@ Status SchemaRoutineLoadJobScanner::_fill_block_impl(vectorized::Block* block) {
                 case 17: // USER_NAME
                     column_value = job_info.__isset.user_name ? job_info.user_name : "";
                     break;
+                case 20: // COMPUTE_GROUP
+                    column_value = job_info.__isset.compute_group ? job_info.compute_group : "";
+                    break;
                 }
 
                 str_refs[row_idx] =

be/src/exprs/create_predicate_function.h

@@ -268,11 +268,13 @@ std::shared_ptr<ColumnPredicate> create_olap_column_predicate(
         const TabletColumn* column, bool) {
     // currently only support like predicate
     if constexpr (PT == TYPE_CHAR) {
-        return LikeColumnPredicate<TYPE_CHAR>::create_shared(
-                filter->_opposite, column_id, filter->_fn_ctx, filter->_string_param);
+        return LikeColumnPredicate<TYPE_CHAR>::create_shared(filter->_opposite, column_id,
+                                                             column->name(), filter->_fn_ctx,
+                                                             filter->_string_param);
     } else if constexpr (PT == TYPE_VARCHAR || PT == TYPE_STRING) {
-        return LikeColumnPredicate<TYPE_STRING>::create_shared(
-                filter->_opposite, column_id, filter->_fn_ctx, filter->_string_param);
+        return LikeColumnPredicate<TYPE_STRING>::create_shared(filter->_opposite, column_id,
+                                                               column->name(), filter->_fn_ctx,
+                                                               filter->_string_param);
     }
     throw Exception(ErrorCode::INTERNAL_ERROR, "function filter do not support type {}", PT);
 }