From c9755a026e130de45d3d6eec9b2a84f0b95000ed Mon Sep 17 00:00:00 2001 From: amorynan Date: Wed, 15 Nov 2023 15:10:15 +0800 Subject: [PATCH 1/2] fix map get type --- build.sh | 2 +- fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 1ff1a3284c9f0d..5af36ce91b7217 100755 --- a/build.sh +++ b/build.sh @@ -483,7 +483,7 @@ FE_MODULES="$( # Clean and build Backend if [[ "${BUILD_BE}" -eq 1 ]]; then update_submodule "be/src/apache-orc" "apache-orc" "https://github.com/apache/doris-thirdparty/archive/refs/heads/orc.tar.gz" - update_submodule "be/src/clucene" "clucene" "https://github.com/apache/doris-thirdparty/archive/refs/heads/clucene.tar.gz" +# update_submodule "be/src/clucene" "clucene" "https://github.com/apache/doris-thirdparty/archive/refs/heads/clucene.tar.gz" if [[ -e "${DORIS_HOME}/gensrc/build/gen_cpp/version.h" ]]; then rm -f "${DORIS_HOME}/gensrc/build/gen_cpp/version.h" fi diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java index 09848e3d186d1a..26f75d460a16f0 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java @@ -2559,7 +2559,7 @@ protected Type[] getActualArgTypes(Type[] originType) { } private MapType getActualMapType(MapType originMapType) { - return new MapType(getActualType(originMapType.getKeyType()), getActualType(originMapType.getValueType())); + return new MapType(originMapType.getKeyType(), originMapType.getValueType()); } private ArrayType getActualArrayType(ArrayType originArrayType) { From f8d216771e52380eeff679245cfbd19c3a99aa89 Mon Sep 17 00:00:00 2001 From: amorynan Date: Wed, 15 Nov 2023 15:13:18 +0800 Subject: [PATCH 2/2] delete --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 5af36ce91b7217..1ff1a3284c9f0d 100755 --- a/build.sh +++ b/build.sh @@ -483,7 +483,7 @@ FE_MODULES="$( # Clean and build Backend if [[ "${BUILD_BE}" -eq 1 ]]; then update_submodule "be/src/apache-orc" "apache-orc" "https://github.com/apache/doris-thirdparty/archive/refs/heads/orc.tar.gz" -# update_submodule "be/src/clucene" "clucene" "https://github.com/apache/doris-thirdparty/archive/refs/heads/clucene.tar.gz" + update_submodule "be/src/clucene" "clucene" "https://github.com/apache/doris-thirdparty/archive/refs/heads/clucene.tar.gz" if [[ -e "${DORIS_HOME}/gensrc/build/gen_cpp/version.h" ]]; then rm -f "${DORIS_HOME}/gensrc/build/gen_cpp/version.h" fi