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 44c58ba9ea9 [fix](tools) Fix non-standard code in tpch/tpcds dbgen
tools leading to compilation failure (#31124)
44c58ba9ea9 is described below
commit 44c58ba9ea907a9263fc9aa85406a673d783ca8f
Author: zclllyybb <zhaochan...@selectdb.com>
AuthorDate: Tue Feb 20 15:15:14 2024 +0800
[fix](tools) Fix non-standard code in tpch/tpcds dbgen tools leading to
compilation failure (#31124)
Fix non-standard code in tpch/tpcds dbgen tools leading to compilation
failure
---
tools/tpcds-tools/README.md | 3 ++-
tools/tpcds-tools/bin/build-tpcds-tools.sh | 10 +++++-----
tools/tpch-tools/README.md | 2 ++
tools/tpch-tools/bin/build-tpch-dbgen.sh | 8 ++++----
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/tools/tpcds-tools/README.md b/tools/tpcds-tools/README.md
index e4cf768d3c6..d9b6aa7e738 100644
--- a/tools/tpcds-tools/README.md
+++ b/tools/tpcds-tools/README.md
@@ -24,9 +24,10 @@ follow the steps below:
### 1. build tpc-ds dsdgen dsqgen tool.
- export PATH=/usr/bin/:$PATH
./bin/build-tpcds-tools.sh
+ If the build failed in dbgen tools' compilation, update your GCC version
or change all "TPC-DS_Tools_v3.2.0new.zip" in build-tpcds-dbgen.sh to
"TPC-DS_Tools_v3.2.0.zip"
+
### 2. generate tpc-ds data. use -h for more infomations.
./bin/gen-tpcds-data.sh -s 1
diff --git a/tools/tpcds-tools/bin/build-tpcds-tools.sh
b/tools/tpcds-tools/bin/build-tpcds-tools.sh
index fd6a486f4c3..f765b0a4aa0 100755
--- a/tools/tpcds-tools/bin/build-tpcds-tools.sh
+++ b/tools/tpcds-tools/bin/build-tpcds-tools.sh
@@ -47,12 +47,12 @@ check_prerequest "unzip -h" "unzip"
# download tpcds tools package first
if [[ -d "${CURDIR}/DSGen-software-code-3.2.0rc1" ]]; then
- echo "If you want to rebuild TPC-DS_Tools_v3.2.0 again, please delete
${CURDIR}/DSGen-software-code-3.2.0rc1 first." && exit 1
-elif [[ -f "${CURDIR}/TPC-DS_Tools_v3.2.0.zip" ]]; then
- unzip TPC-DS_Tools_v3.2.0.zip -d "${CURDIR}/"
+ echo "If you want to rebuild TPC-DS_Tools_v3.2.0 again, please delete
${CURDIR}/DSGen-software-code-3.2.0rc1 first."
+elif [[ -f "${CURDIR}/TPC-DS_Tools_v3.2.0new.zip" ]]; then
+ unzip TPC-DS_Tools_v3.2.0new.zip -d "${CURDIR}/"
else
- wget
"https://doris-build-1308700295.cos.ap-beijing.myqcloud.com/tools/TPC-DS_Tools_v3.2.0.zip";
- unzip TPC-DS_Tools_v3.2.0.zip -d "${CURDIR}/"
+ wget
"https://doris-build-1308700295.cos.ap-beijing.myqcloud.com/tools/TPC-DS_Tools_v3.2.0new.zip";
+ unzip TPC-DS_Tools_v3.2.0new.zip -d "${CURDIR}/"
fi
# compile tpcds-dsdgen
diff --git a/tools/tpch-tools/README.md b/tools/tpch-tools/README.md
index d1b592bc673..a7deac387ba 100644
--- a/tools/tpch-tools/README.md
+++ b/tools/tpch-tools/README.md
@@ -26,6 +26,8 @@ follow the steps below:
./bin/build-tpch-dbgen.sh
+ If the build failed in dbgen tools' compilation, update your GCC version
or change download link used by wget in build-tpch-dbgen.sh from
".../TPC-H_Tools_v3.0.0new.zip" to ".../TPC-H_Tools_v3.0.0.zip"
+
### 2. generate tpc-h data. use -h for more infomations.
./bin/gen-tpch-data.sh -s 1
diff --git a/tools/tpch-tools/bin/build-tpch-dbgen.sh
b/tools/tpch-tools/bin/build-tpch-dbgen.sh
index eab1b7d591e..9499ae5d74e 100755
--- a/tools/tpch-tools/bin/build-tpch-dbgen.sh
+++ b/tools/tpch-tools/bin/build-tpch-dbgen.sh
@@ -38,7 +38,7 @@ check_prerequest() {
local CMD=$1
local NAME=$2
if ! ${CMD}; then
- echo "${NAME} is missing. This script depends on unzip to extract
files from TPC-H_Tools_v3.0.0.zip"
+ echo "${NAME} is missing. This script depends on unzip to extract
files from TPC-H_Tools_v3.0.0new.zip"
exit 1
fi
}
@@ -48,10 +48,10 @@ check_prerequest "unzip -h" "unzip"
# download tpch tools pacage first
if [[ -d ${TPCH_DBGEN_DIR} ]]; then
echo "Dir ${TPCH_DBGEN_DIR} already exists. No need to download."
- echo "If you want to download TPC-H_Tools_v3.0.0 again, please delete this
dir first."
+ echo "If you want to download TPC-H_Tools_v3.0.0new again, please delete
this dir first."
else
- wget
"https://doris-build-1308700295.cos.ap-beijing.myqcloud.com/tools/TPC-H_Tools_v3.0.0.zip";
- unzip TPC-H_Tools_v3.0.0.zip -d "${CURDIR}/"
+ wget
"https://doris-build-1308700295.cos.ap-beijing.myqcloud.com/tools/TPC-H_Tools_v3.0.0new.zip";
+ unzip TPC-H_Tools_v3.0.0new.zip -d "${CURDIR}/"
fi
# modify tpcd.h
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
