apache · adonis0147 · Feb 9, 2022 · Feb 9, 2022 · Feb 9, 2022 · Feb 9, 2022
diff --git a/.asf.yaml b/.asf.yaml
@@ -35,4 +35,10 @@ github:
         dismiss_stale_reviews: true
         required_approving_review_count: 1
   notifications:
-    pullrequests_status:  dev@doris.apache.org
+    pullrequests_status:  commits@doris.apache.org
+  collaborators:
+    - jackwener
+    - qidaye
+    - tinkerrrr
+    - luzhijing
+    - spaces-X
diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml
@@ -55,27 +55,6 @@ jobs:
       run: |
         cd fs_brokers/apache_hdfs_broker/ && /bin/bash build.sh
 
-    - name: Build spark connector v2
-      run: |
-        thrift --version
-        cd extension/spark-doris-connector/ && /bin/bash build.sh 2.3.4 2.11
-
-    - name: Build spark connector v3
-      run: |
-        cd extension/spark-doris-connector/ && /bin/bash build.sh 3.1.2 2.12
-
-    - name: Build flink connector 1.11
-      run: |
-        cd extension/flink-doris-connector/ && /bin/bash build.sh 1.11.6 2.12
-
-    - name: Build flink connector 1.12
-      run: |
-        cd extension/flink-doris-connector/ && /bin/bash build.sh 1.12.7 2.12
-
-    - name: Build flink connector 1.13
-      run: |
-        cd extension/flink-doris-connector/ && /bin/bash build.sh 1.13.5 2.12
-
     - name: Build docs
       run: |
         cd docs && npm install && npm run build

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -25,16 +25,15 @@ Your suggestions, comments and comments on Doris can be made directly through Gi
 
 There are many ways to participate in and contribute to Doris projects: code implementation, test writing, process tool improvement, document improvement, and so on. Any contribution will be welcomed and you will be added to the list of contributors. Further, with sufficient contributions, you will have the opportunity to become a Commiter of Apache with Apache mailbox and be included in the list of [Apache Commiters] (http://people.apache.org/committer-index.html).
 
-Any questions, you can contact us to get timely answers, including Wechat, Gitter (GitHub instant messaging tool), e-mail and so on.
+Any questions, you can contact us to get timely answers, including dev mail list or Slack.
 
 ## Initial contact
 
 For the first time in Doris community, you can:
 
 * Follow [Doris Github](https://github.com/apache/incubator-doris)
 * Subscribe to our [mailing list] (./subscribe-mail-list.md);
-* Join Doris Wechat Group (add micro-signal: morningman-cmy, note: join Doris Group) and ask questions at any time.
-* Enter Doris's [Gitter] (./gitter.md) chat room;
+* Join Doris [Slack](https://join.slack.com/t/apachedoriscommunity/shared_invite/zt-11jb8gesh-7IukzSrdea6mqoG0HB4gZg)
 
 Learn the development trends of Doris project in time and give your opinions on the topics you are concerned about.
 

diff --git a/CONTRIBUTING_CN.md b/CONTRIBUTING_CN.md
@@ -25,16 +25,15 @@ under the License.
 
 参与 Doris 项目并为其作出贡献的方法有很多：代码实现、测试编写、流程工具改进、文档完善等等。任何贡献我们都会非常欢迎，并将您加入贡献者列表，进一步，有了足够的贡献后，您还可以有机会成为 Apache 的 Commiter，拥有 Apache 邮箱，并被收录到 [Apache Commiter 列表中](http://people.apache.org/committer-index.html)。
 
-任何问题，您都可以联系我们得到及时解答，联系方式包括微信、Gitter（GitHub提供的即时聊天工具）、邮件等等。
+任何问题，您都可以联系我们得到及时解答，联系方式包括 dev 邮件组，Slack 等。
 
 ## 初次接触
 
 初次来到 Doris 社区，您可以：
 
 * 关注 Doris [Github 代码库](https://github.com/apache/incubator-doris)
 * 订阅我们的 [邮件列表](./subscribe-mail-list.md)；
-* 加入 Doris 微信群(加微信号：morningman-cmy, 备注：加入Doris群) 随时提问；
-* 进入 Doris 的 [Gitter](./gitter.md) 聊天室；
+* 加入 Doris 的 [Slack](https://join.slack.com/t/apachedoriscommunity/shared_invite/zt-11jb8gesh-7IukzSrdea6mqoG0HB4gZg)
 
 通过以上方式及时了解 Doris 项目的开发动态并为您关注的话题发表意见。
 

diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt
@@ -586,7 +586,6 @@ set(DORIS_LINK_LIBS
     Webserver
     Geo
     Vec
-    Plugin
     ${WL_END_GROUP}
 )
 if (${MAKE_TEST} STREQUAL "ON")
@@ -674,7 +673,6 @@ else()
         ${DORIS_DEPENDENCIES}
         ${WL_START_GROUP}
         ${X86_DEPENDENCIES}
-        ${WL_END_GROUP}
     )
 endif()
 
@@ -690,6 +688,8 @@ if (WITH_MYSQL)
         )
 endif()
 
+set(DORIS_DEPENDENCIES ${DORIS_DEPENDENCIES} ${WL_END_GROUP})
+
 message(STATUS "DORIS_DEPENDENCIES is ${DORIS_DEPENDENCIES}")
 
 # Add all external dependencies. They should come after the palo libs.
@@ -774,7 +774,6 @@ if (BUILD_META_TOOL AND BUILD_META_TOOL STREQUAL "ON")
 endif()
 
 add_subdirectory(${SRC_DIR}/util)
-add_subdirectory(${SRC_DIR}/plugin)
 add_subdirectory(${SRC_DIR}/vec)
 
 # Utility CMake function to make specifying tests and benchmarks less verbose
@@ -796,24 +795,6 @@ FUNCTION(ADD_BE_TEST TEST_NAME)
     ADD_TEST(${TEST_FILE_NAME} "${BUILD_OUTPUT_ROOT_DIRECTORY}/${TEST_NAME}")
 ENDFUNCTION()
 
-FUNCTION(ADD_BE_PLUGIN PLUGIN_NAME)
-    set(BUILD_OUTPUT_ROOT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/")
-
-    get_filename_component(DIR_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-    get_filename_component(PLUGIN_DIR_NAME ${PLUGIN_NAME} PATH)
-    get_filename_component(PLUGIN_FILE_NAME ${PLUGIN_NAME} NAME)
-
-    ADD_LIBRARY(${PLUGIN_FILE_NAME} SHARED ${PLUGIN_NAME}.cpp)
-
-    TARGET_LINK_LIBRARIES(${PLUGIN_FILE_NAME} ${DORIS_LINK_LIBS})
-    SET_TARGET_PROPERTIES(${PLUGIN_FILE_NAME} PROPERTIES COMPILE_FLAGS "-fno-access-control")
-
-    if (NOT "${PLUGIN_DIR_NAME}" STREQUAL "")
-        SET_TARGET_PROPERTIES(${PLUGIN_FILE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${BUILD_OUTPUT_ROOT_DIRECTORY}/${PLUGIN_DIR_NAME}")
-    endif ()
-
-ENDFUNCTION()
-
 if (${MAKE_TEST} STREQUAL "ON")
     add_subdirectory(${TEST_DIR}/test_util)
     add_subdirectory(${TEST_DIR}/agent)
@@ -834,8 +815,6 @@ if (${MAKE_TEST} STREQUAL "ON")
     add_subdirectory(${TEST_DIR}/vec/function)
     add_subdirectory(${TEST_DIR}/vec/runtime)
     add_subdirectory(${TEST_DIR}/vec/aggregate_functions)
-    add_subdirectory(${TEST_DIR}/plugin)
-    add_subdirectory(${TEST_DIR}/plugin/example)
     add_subdirectory(${TEST_DIR}/tools)
 endif ()
 

diff --git a/be/src/agent/task_worker_pool.cpp b/be/src/agent/task_worker_pool.cpp
@@ -383,7 +383,8 @@ void TaskWorkerPool::_create_tablet_worker_thread_callback() {
             tablet_info.tablet_id = tablet->table_id();
             tablet_info.schema_hash = tablet->schema_hash();
             tablet_info.version = create_tablet_req.version;
-            tablet_info.version_hash = create_tablet_req.version_hash;
+            // Useless but it is a required field in TTabletInfo
+            tablet_info.version_hash = 0;
             tablet_info.row_count = 0;
             tablet_info.data_size = 0;
             tablet_info.__set_path_hash(tablet->data_dir()->path_hash());
@@ -662,7 +663,6 @@ void TaskWorkerPool::_push_worker_thread_callback() {
         finish_task_request.__set_signature(agent_task_req.signature);
         if (push_req.push_type == TPushType::DELETE) {
             finish_task_request.__set_request_version(push_req.version);
-            finish_task_request.__set_request_version_hash(push_req.version_hash);
         }
 
         if (status == DORIS_SUCCESS) {
@@ -1074,7 +1074,7 @@ void TaskWorkerPool::_check_consistency_worker_thread_callback() {
         uint32_t checksum = 0;
         EngineChecksumTask engine_task(
                 check_consistency_req.tablet_id, check_consistency_req.schema_hash,
-                check_consistency_req.version, check_consistency_req.version_hash, &checksum);
+                check_consistency_req.version, &checksum);
         OLAPStatus res = _env->storage_engine()->execute_task(&engine_task);
         if (res != OLAP_SUCCESS) {
             LOG(WARNING) << "check consistency failed. status: " << res
@@ -1095,7 +1095,6 @@ void TaskWorkerPool::_check_consistency_worker_thread_callback() {
         finish_task_request.__set_task_status(task_status);
         finish_task_request.__set_tablet_checksum(static_cast<int64_t>(checksum));
         finish_task_request.__set_request_version(check_consistency_req.version);
-        finish_task_request.__set_request_version_hash(check_consistency_req.version_hash);
 
         _finish_task(finish_task_request);
         _remove_task_info(agent_task_req.task_type, agent_task_req.signature);
@@ -1404,15 +1403,13 @@ void TaskWorkerPool::_make_snapshot_thread_callback() {
             LOG(WARNING) << "make_snapshot failed. tablet_id:" << snapshot_request.tablet_id
                          << ", schema_hash:" << snapshot_request.schema_hash
                          << ", version:" << snapshot_request.version
-                         << ", version_hash:" << snapshot_request.version_hash
                          << ", status: " << make_snapshot_status;
             error_msgs.push_back("make_snapshot failed. status: " +
                                  boost::lexical_cast<string>(make_snapshot_status));
         } else {
             LOG(INFO) << "make_snapshot success. tablet_id:" << snapshot_request.tablet_id
                       << ", schema_hash:" << snapshot_request.schema_hash
                       << ", version:" << snapshot_request.version
-                      << ", version_hash:" << snapshot_request.version_hash
                       << ", snapshot_path:" << snapshot_path;
             if (snapshot_request.__isset.list_files) {
                 // list and save all snapshot files
@@ -1427,7 +1424,6 @@ void TaskWorkerPool::_make_snapshot_thread_callback() {
                     LOG(WARNING) << "make_snapshot failed. tablet_id:" << snapshot_request.tablet_id
                                  << ", schema_hash:" << snapshot_request.schema_hash
                                  << ", version:" << snapshot_request.version
-                                 << ", version_hash:" << snapshot_request.version_hash
                                  << ",list file failed: " << st.get_error_msg();
                     error_msgs.push_back("make_snapshot failed. list file failed: " +
                                          st.get_error_msg());

diff --git a/be/src/codegen/doris_ir.h b/be/src/codegen/doris_ir.h
diff --git a/be/src/common/config.h b/be/src/common/config.h
@@ -204,7 +204,8 @@ CONF_mInt32(tablet_rowset_stale_sweep_time_sec, "1800");
 CONF_Int32(max_garbage_sweep_interval, "3600");
 CONF_Int32(min_garbage_sweep_interval, "180");
 CONF_mInt32(snapshot_expire_time_sec, "172800");
-// 仅仅是建议值，当磁盘空间不足时，trash下的文件保存期可不遵守这个参数
+// It is only a recommended value. When the disk space is insufficient, 
+// the file storage period under trash dose not have to comply with this parameter.
 CONF_mInt32(trash_file_expire_time_sec, "259200");
 // check row nums for BE/CE and schema change. true is open, false is closed.
 CONF_mBool(row_nums_check, "true");
@@ -543,8 +544,6 @@ CONF_mInt64(max_runnings_transactions_per_txn_map, "100");
 // this is a an enhancement for better performance to manage tablet
 CONF_Int32(tablet_map_shard_size, "1");
 
-CONF_String(plugin_path, "${DORIS_HOME}/plugin");
-
 // txn_map_lock shard size, the value is 2^n, n=0,1,2,3,4
 // this is a an enhancement for better performance to manage txn
 CONF_Int32(txn_map_shard_size, "128");

diff --git a/be/src/common/hdfs.h b/be/src/common/hdfs.h
diff --git a/be/src/common/logconfig.cpp b/be/src/common/logconfig.cpp
@@ -54,6 +54,10 @@ bool init_glog(const char* basename, bool install_signal_handler) {
         return true;
     }
 
+    if (getenv("DORIS_LOG_TO_STDERR") != nullptr) {
+        FLAGS_alsologtostderr = true;
+    }
+
     if (install_signal_handler) {
         google::InstallFailureSignalHandler();
     }

diff --git a/be/src/common/logging.h b/be/src/common/logging.h
@@ -15,34 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#ifndef IMPALA_COMMON_LOGGING_H
-#define IMPALA_COMMON_LOGGING_H
+#pragma once
 
-// This is a wrapper around the glog header.  When we are compiling to IR,
-// we don't want to pull in the glog headers.  Pulling them in causes linking
-// issues when we try to dynamically link the codegen'd functions.
-#ifdef IR_COMPILE
-#include <iostream>
-#define DCHECK(condition) \
-    while (false) std::cout
-#define DCHECK_EQ(a, b) \
-    while (false) std::cout
-#define DCHECK_NE(a, b) \
-    while (false) std::cout
-#define DCHECK_GT(a, b) \
-    while (false) std::cout
-#define DCHECK_LT(a, b) \
-    while (false) std::cout
-#define DCHECK_GE(a, b) \
-    while (false) std::cout
-#define DCHECK_LE(a, b) \
-    while (false) std::cout
-// Similar to how glog defines DCHECK for release.
-#define LOG(level) \
-    while (false) std::cout
-#define VLOG(level) \
-    while (false) std::cout
-#else
 // GLOG defines this based on the system but doesn't check if it's already
 // been defined.  undef it first to avoid warnings.
 // glog MUST be included before gflags.  Instead of including them,
@@ -52,7 +26,6 @@
 // function to get the stack trace.
 #include <glog/logging.h>
 #undef MutexLock
-#endif
 
 // Define VLOG levels.  We want display per-row info less than per-file which
 // is less than per-query.  For now per-connection is the same as per-query.
@@ -67,7 +40,6 @@
 #define VLOG_NOTICE VLOG(3)
 #define VLOG_CRITICAL VLOG(1)
 
-
 #define VLOG_CONNECTION_IS_ON VLOG_IS_ON(1)
 #define VLOG_RPC_IS_ON VLOG_IS_ON(8)
 #define VLOG_QUERY_IS_ON VLOG_IS_ON(1)
@@ -78,12 +50,10 @@
 #define VLOG_NOTICE_IS_ON VLOG_IS_ON(3)
 #define VLOG_CRITICAL_IS_ON VLOG_IS_ON(1)
 
-
 /// Define a wrapper around DCHECK for strongly typed enums that print a useful error
 /// message on failure.
 #define DCHECK_ENUM_EQ(a, b)                                                 \
     DCHECK(a == b) << "[ " #a " = " << static_cast<int>(a) << " , " #b " = " \
                    << static_cast<int>(b) << " ]"
 
 #include <fmt/format.h>
-#endif
diff --git a/be/src/exec/CMakeLists.txt b/be/src/exec/CMakeLists.txt
@@ -23,7 +23,6 @@ set(EXECUTABLE_OUTPUT_PATH "${BUILD_DIR}/src/exec")
 
 set(EXEC_FILES
     aggregation_node.cpp
-    aggregation_node_ir.cpp
     analytic_eval_node.cpp
     blocking_join_node.cpp
     broker_scan_node.cpp
@@ -40,7 +39,6 @@ set(EXEC_FILES
     exec_node.cpp
     exchange_node.cpp
     hash_join_node.cpp
-    hash_join_node_ir.cpp
     hash_table.cpp
     local_file_reader.cpp
     merge_node.cpp
@@ -70,7 +68,6 @@ set(EXEC_FILES
     es/es_query_builder.cpp
     spill_sort_node.cc
     union_node.cpp
-    union_node_ir.cpp
     set_operation_node.cpp
     intersect_node.cpp
     except_node.cpp
@@ -94,9 +91,7 @@ set(EXEC_FILES
     schema_scanner/schema_partitions_scanner.cpp
 
     partitioned_hash_table.cc
-    partitioned_hash_table_ir.cc
     partitioned_aggregation_node.cc
-    partitioned_aggregation_node_ir.cc
     odbc_scan_node.cpp
     local_file_writer.cpp
     broker_writer.cpp