[Chore](build) update ldb_toolchain to v0.18 (apache#20802)

* update ldb_toolchain to v0.18 * update
CalvinKris · Jun 14, 2023 · 3727483 · 3727483
1 parent 0ecc98d
commit 3727483
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/be-ut-clang.yml b/.github/workflows/be-ut-clang.yml
@@ -77,7 +77,7 @@ jobs:
           export DEFAULT_DIR='/opt/doris'
 
           mkdir "${DEFAULT_DIR}"
-          wget https://github.com/amosbird/ldb_toolchain_gen/releases/download/v0.17/ldb_toolchain_gen.sh \
+          wget https://github.com/amosbird/ldb_toolchain_gen/releases/download/v0.18/ldb_toolchain_gen.sh \
             -q -O /tmp/ldb_toolchain_gen.sh
           bash /tmp/ldb_toolchain_gen.sh "${DEFAULT_DIR}/ldb-toolchain"
           rm /tmp/ldb_toolchain_gen.sh

diff --git a/.github/workflows/build-thirdparty.yml b/.github/workflows/build-thirdparty.yml
@@ -95,7 +95,7 @@ jobs:
           sudo DEBIAN_FRONTEND=noninteractive apt install --yes "${packages[@]}"
 
           mkdir -p "${DEFAULT_DIR}"
-          wget https://github.com/amosbird/ldb_toolchain_gen/releases/download/v0.17/ldb_toolchain_gen.sh \
+          wget https://github.com/amosbird/ldb_toolchain_gen/releases/download/v0.18/ldb_toolchain_gen.sh \
             -q -O /tmp/ldb_toolchain_gen.sh
           bash /tmp/ldb_toolchain_gen.sh "${DEFAULT_DIR}/ldb-toolchain"
 

diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml
@@ -78,7 +78,7 @@ jobs:
           export DEFAULT_DIR='/opt/doris'
 
           mkdir "${DEFAULT_DIR}"
-          wget https://github.com/amosbird/ldb_toolchain_gen/releases/download/v0.17/ldb_toolchain_gen.sh \
+          wget https://github.com/amosbird/ldb_toolchain_gen/releases/download/v0.18/ldb_toolchain_gen.sh \
             -q -O /tmp/ldb_toolchain_gen.sh
           bash /tmp/ldb_toolchain_gen.sh "${DEFAULT_DIR}/ldb-toolchain"
 

diff --git a/be/src/exec/es/es_scan_reader.cpp b/be/src/exec/es/es_scan_reader.cpp
@@ -39,7 +39,6 @@ const std::string SOURCE_SCROLL_SEARCH_FILTER_PATH =
 const std::string DOCVALUE_SCROLL_SEARCH_FILTER_PATH =
         "filter_path=_scroll_id,hits.total,hits.hits._score,hits.hits.fields";
 
-const std::string REQUEST_SCROLL_PATH = "_scroll";
 const std::string REQUEST_PREFERENCE_PREFIX = "&preference=_shards:";
 const std::string REQUEST_SEARCH_SCROLL_PATH = "/_search/scroll";
 const std::string REQUEST_SEPARATOR = "/";

diff --git a/docs/en/community/developer-guide/cpp-format-code.md b/docs/en/community/developer-guide/cpp-format-code.md
@@ -61,7 +61,7 @@ Mac: `brew install clang-format@16`
 LDB toolchain:
 
 If you are using [LDB toolchain](/docs/install/source-install/compilation-with-ldb-toolchain),
-the latest version (>= v0.17) of [LDB toolchain](https://github.com/amosbird/ldb_toolchain_gen/releases) has already included clang-format with 16.0.0 version.
+the latest version (>= v0.18) of [LDB toolchain](https://github.com/amosbird/ldb_toolchain_gen/releases) has already included clang-format with 16.0.0 version.
 
 ### clang-format plugin
 

diff --git a/docs/en/docs/install/source-install/compilation-win.md b/docs/en/docs/install/source-install/compilation-win.md
@@ -73,7 +73,7 @@ This topic is about how to compile Doris from source with Windows.
     - [Java8](https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/jdk-8u131-linux-x64.tar.gz)
     - [Apache Maven 3.6.3](https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/apache-maven-3.6.3-bin.tar.gz)
     - [Node v12.13.0](https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/node-v12.13.0-linux-x64.tar.gz)
-    - [LDB_TOOLCHAIN](https://github.com/amosbird/ldb_toolchain_gen/releases/download/v0.17/ldb_toolchain_gen.sh)
+    - [LDB_TOOLCHAIN](https://github.com/amosbird/ldb_toolchain_gen/releases/download/v0.18/ldb_toolchain_gen.sh)
 
 5. Configure environment variables
 

diff --git a/docs/zh-CN/community/developer-guide/cpp-format-code.md b/docs/zh-CN/community/developer-guide/cpp-format-code.md
@@ -60,7 +60,7 @@ Mac: `brew install clang-format@16`
 LDB toolchain:
 
 如何使用 [LDB toolchain](/docs/install/source-install/compilation-with-ldb-toolchain)，
-最新版本的 [LDB toolchain](https://github.com/amosbird/ldb_toolchain_gen/releases)（>= v0.17）已经包含了预编译的clang-format
+最新版本的 [LDB toolchain](https://github.com/amosbird/ldb_toolchain_gen/releases)（>= v0.18）已经包含了预编译的clang-format
 16.0.0的二进制文件。
 
 ### clang-format插件

diff --git a/docs/zh-CN/docs/install/source-install/compilation-win.md b/docs/zh-CN/docs/install/source-install/compilation-win.md
@@ -73,7 +73,7 @@ under the License.
     - [Java8](https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/jdk-8u131-linux-x64.tar.gz)
     - [Apache Maven 3.6.3](https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/apache-maven-3.6.3-bin.tar.gz)
     - [Node v12.13.0](https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/node-v12.13.0-linux-x64.tar.gz)
-    - [LDB_TOOLCHAIN](https://github.com/amosbird/ldb_toolchain_gen/releases/download/v0.17/ldb_toolchain_gen.sh)
+    - [LDB_TOOLCHAIN](https://github.com/amosbird/ldb_toolchain_gen/releases/download/v0.18/ldb_toolchain_gen.sh)
 
 5. 配置环境变量