[doris] 31/33: [zhongjin](2.0.1) change to 2.0.1

[morningman]

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

morningman pushed a commit to branch doris-for-zhongjin
in repository https://gitbox.apache.org/repos/asf/doris.git

commit a8cadcfb9bac49d256691d2bd599b62441966f73
Author: morningman <morning...@163.com>
AuthorDate: Sun Apr 9 13:08:21 2023 +0800

    [zhongjin](2.0.1) change to 2.0.1
    
    1. Fix show load profile
    2. Fix ES Mapping
    3. Fix file split
    4. Fix libz O3
    5. Fix delete unused rowset
    6. Fix netty http
---
 fe/fe-core/src/main/java/org/apache/doris/catalog/S3Resource.java   | 2 --
 .../main/java/org/apache/doris/planner/external/HiveSplitter.java   | 4 ++--
 gensrc/script/gen_build_version.sh                                  | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/S3Resource.java 
b/fe/fe-core/src/main/java/org/apache/doris/catalog/S3Resource.java
index e315fa814d..f48e5094f3 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/S3Resource.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/S3Resource.java
@@ -29,8 +29,6 @@ import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.annotations.SerializedName;
-import org.apache.hadoop.fs.s3a.Constants;
-import org.apache.hadoop.fs.s3a.S3AFileSystem;
 import org.apache.hadoop.fs.s3a.SimpleAWSCredentialsProvider;
 import org.apache.hadoop.fs.s3a.TemporaryAWSCredentialsProvider;
 import org.apache.hadoop.fs.s3a.auth.IAMInstanceCredentialsProvider;
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/planner/external/HiveSplitter.java 
b/fe/fe-core/src/main/java/org/apache/doris/planner/external/HiveSplitter.java
index 86dd4fab1d..e07a3fcab8 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/planner/external/HiveSplitter.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/planner/external/HiveSplitter.java
@@ -162,8 +162,8 @@ public class HiveSplitter implements Splitter {
         if (splitSize <= 0) {
             splitSize = status.getBlockSize();
         }
-        splitSize = splitSize > Config.min_file_split_size_mb * 1024L * 1204L ?
-                splitSize : Config.min_file_split_size_mb * 1024L * 1024L;
+        splitSize = splitSize > Config.min_file_split_size_mb * 1024L * 1204L
+                ? splitSize : Config.min_file_split_size_mb * 1024L * 1024L;
         BlockLocation[] blockLocations = status.getBlockLocations();
         long length = status.getLength();
         long bytesRemaining;
diff --git a/gensrc/script/gen_build_version.sh 
b/gensrc/script/gen_build_version.sh
index c2fc94fcf7..de749bfb97 100755
--- a/gensrc/script/gen_build_version.sh
+++ b/gensrc/script/gen_build_version.sh
@@ -28,10 +28,10 @@
 set -eo pipefail
 
 build_version_prefix="doris"
-build_version_major=0
+build_version_major=2
 build_version_minor=0
-build_version_patch=0
-build_version_rc_version="trunk"
+build_version_patch=1
+build_version_rc_version="cicc"
 
 
build_version="${build_version_prefix}-${build_version_major}.${build_version_minor}.${build_version_patch}-${build_version_rc_version}"
 


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