You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by bo...@apache.org on 2022/09/02 11:06:16 UTC
[impala] 05/05: IMPALA-11525: Rename Exec libraries to avoid conflicts with external libraries
This is an automated email from the ASF dual-hosted git repository.
boroknagyz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
commit d74d6994cc25ed2090886d6b406cf477a6ccf6b4
Author: Peter Rozsa <pr...@cloudera.com>
AuthorDate: Thu Aug 25 18:51:32 2022 +0200
IMPALA-11525: Rename Exec libraries to avoid conflicts with external libraries
This patch renames the Exec libraries to distinguish them from
external libraries like avro, kudu_client and orc
Due to IMPALA-11257, the cmake_minimum_required calls are
also removed from the new libraries
Change-Id: I042478e371049a7aed74f43c2bbfcb7900a53dd0
Reviewed-on: http://gerrit.cloudera.org:8080/18910
Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
be/CMakeLists.txt | 36 ++++++++++++++++++------------------
be/src/codegen/CMakeLists.txt | 4 ++--
be/src/exec/avro/CMakeLists.txt | 10 ++++------
be/src/exec/hbase/CMakeLists.txt | 6 ++----
be/src/exec/kudu/CMakeLists.txt | 6 ++----
be/src/exec/orc/CMakeLists.txt | 6 ++----
be/src/exec/parquet/CMakeLists.txt | 8 ++++----
be/src/exec/rcfile/CMakeLists.txt | 6 ++----
be/src/exec/sequence/CMakeLists.txt | 6 ++----
be/src/exec/text/CMakeLists.txt | 6 ++----
10 files changed, 40 insertions(+), 54 deletions(-)
diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt
index 4ed427037..fa8341feb 100644
--- a/be/CMakeLists.txt
+++ b/be/CMakeLists.txt
@@ -438,15 +438,15 @@ set (IMPALA_LIBS
Catalog
CodeGen
Common
- Avro
- HBase
- Kudu
- Orc
- Parquet
- Rcfile
- Sequence
- Text
Exec
+ ExecAvro
+ ExecHBase
+ ExecKudu
+ ExecOrc
+ ExecParquet
+ ExecRcfile
+ ExecSequence
+ ExecText
Exprs
GlobalFlags
histogram_proto
@@ -499,11 +499,11 @@ set (UNIFIED_TEST_LIBS
CodeGenTests
CommonTests
ExecTests
- AvroTests
+ ExecAvroTests
+ ExecParquetTests
ExprsTests
GUtilTests
IoTests
- ParquetTests
RpcTests
RuntimeTests
SchedulingTests
@@ -528,15 +528,15 @@ if (BUILD_SHARED_LIBS)
BufferPool
Io
Runtime
- Avro
- HBase
- Kudu
- Orc
- Parquet
- Rcfile
- Sequence
- Text
Exec
+ ExecAvro
+ ExecHBase
+ ExecKudu
+ ExecOrc
+ ExecParquet
+ ExecRcfile
+ ExecSequence
+ ExecText
CodeGen
Exprs
Rpc
diff --git a/be/src/codegen/CMakeLists.txt b/be/src/codegen/CMakeLists.txt
index 700b4eaa9..92999b91a 100644
--- a/be/src/codegen/CMakeLists.txt
+++ b/be/src/codegen/CMakeLists.txt
@@ -85,7 +85,7 @@ add_custom_command(
${CLANG_INCLUDE_FLAGS} ${IR_INPUT_FILES} -o ${IR_TMP_OUTPUT_FILE}
COMMAND ${LLVM_OPT_EXECUTABLE} ${LLVM_OPT_IR_FLAGS} < ${IR_TMP_OUTPUT_FILE} > ${IR_OUTPUT_FILE}
COMMAND rm ${IR_TMP_OUTPUT_FILE}
- DEPENDS Exec Exprs Runtime Udf Util ${IR_INPUT_FILES}
+ DEPENDS Exec ExecAvro ExecKudu Exprs Runtime Udf Util ${IR_INPUT_FILES}
)
add_custom_command(
@@ -95,7 +95,7 @@ add_custom_command(
COMMAND ${LLVM_OPT_EXECUTABLE} ${LLVM_OPT_IR_FLAGS} < ${LEGACY_AVX_IR_TMP_OUTPUT_FILE}
> ${LEGACY_AVX_IR_OUTPUT_FILE}
COMMAND rm ${LEGACY_AVX_IR_TMP_OUTPUT_FILE}
- DEPENDS Exec Exprs Runtime Udf Util ${IR_INPUT_FILES}
+ DEPENDS Exec ExecAvro ExecKudu Exprs Runtime Udf Util ${IR_INPUT_FILES}
)
add_custom_target(compile_to_ir DEPENDS ${IR_OUTPUT_FILE})
diff --git a/be/src/exec/avro/CMakeLists.txt b/be/src/exec/avro/CMakeLists.txt
index 02e253a24..1f4bfd233 100644
--- a/be/src/exec/avro/CMakeLists.txt
+++ b/be/src/exec/avro/CMakeLists.txt
@@ -15,24 +15,22 @@
# specific language governing permissions and limitations
# under the License.
-cmake_minimum_required(VERSION 2.6)
-
# where to put generated libraries
set(LIBRARY_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/exec/avro")
# where to put generated binaries
set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/exec/avro")
-add_library(Avro
+add_library(ExecAvro
hdfs-avro-scanner.cc
hdfs-avro-scanner-ir.cc
)
-add_dependencies(Avro gen-deps)
+add_dependencies(ExecAvro gen-deps)
-add_library(AvroTests STATIC
+add_library(ExecAvroTests STATIC
hdfs-avro-scanner-test.cc
)
-add_dependencies(AvroTests gen-deps)
+add_dependencies(ExecAvroTests gen-deps)
ADD_UNIFIED_BE_LSAN_TEST(hdfs-avro-scanner-test HdfsAvroScannerTest.*)
\ No newline at end of file
diff --git a/be/src/exec/hbase/CMakeLists.txt b/be/src/exec/hbase/CMakeLists.txt
index c2e8dc939..2dc73d3df 100644
--- a/be/src/exec/hbase/CMakeLists.txt
+++ b/be/src/exec/hbase/CMakeLists.txt
@@ -15,19 +15,17 @@
# specific language governing permissions and limitations
# under the License.
-cmake_minimum_required(VERSION 2.6)
-
# where to put generated libraries
set(LIBRARY_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/exec/hbase")
# where to put generated binaries
set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/exec/hbase")
-add_library(HBase
+add_library(ExecHBase
hbase-scan-node.cc
hbase-table-scanner.cc
hbase-table-sink.cc
hbase-table-writer.cc
)
-add_dependencies(HBase gen-deps)
\ No newline at end of file
+add_dependencies(ExecHBase gen-deps)
\ No newline at end of file
diff --git a/be/src/exec/kudu/CMakeLists.txt b/be/src/exec/kudu/CMakeLists.txt
index 728922c71..befc7a738 100644
--- a/be/src/exec/kudu/CMakeLists.txt
+++ b/be/src/exec/kudu/CMakeLists.txt
@@ -15,15 +15,13 @@
# specific language governing permissions and limitations
# under the License.
-cmake_minimum_required(VERSION 2.6)
-
# where to put generated libraries
set(LIBRARY_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/exec/kudu")
# where to put generated binaries
set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/exec/kudu")
-add_library(Kudu
+add_library(ExecKudu
kudu-scanner.cc
kudu-scan-node.cc
kudu-scan-node-base.cc
@@ -33,4 +31,4 @@ add_library(Kudu
kudu-util-ir.cc
)
-add_dependencies(Kudu gen-deps)
\ No newline at end of file
+add_dependencies(ExecKudu gen-deps)
\ No newline at end of file
diff --git a/be/src/exec/orc/CMakeLists.txt b/be/src/exec/orc/CMakeLists.txt
index 5a3a4580d..4d06f0609 100644
--- a/be/src/exec/orc/CMakeLists.txt
+++ b/be/src/exec/orc/CMakeLists.txt
@@ -15,18 +15,16 @@
# specific language governing permissions and limitations
# under the License.
-cmake_minimum_required(VERSION 2.6)
-
# where to put generated libraries
set(LIBRARY_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/exec/orc")
# where to put generated binaries
set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/exec/orc")
-add_library(Orc
+add_library(ExecOrc
orc-column-readers.cc
orc-metadata-utils.cc
hdfs-orc-scanner.cc
)
-add_dependencies(Orc gen-deps)
\ No newline at end of file
+add_dependencies(ExecOrc gen-deps)
\ No newline at end of file
diff --git a/be/src/exec/parquet/CMakeLists.txt b/be/src/exec/parquet/CMakeLists.txt
index f2c5b55f0..ba85b405a 100644
--- a/be/src/exec/parquet/CMakeLists.txt
+++ b/be/src/exec/parquet/CMakeLists.txt
@@ -21,7 +21,7 @@ set(LIBRARY_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/exec/parquet")
# where to put generated binaries
set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/exec/parquet")
-add_library(Parquet
+add_library(ExecParquet
hdfs-parquet-scanner.cc
hdfs-parquet-table-writer.cc
parquet-bloom-filter-util.cc
@@ -39,9 +39,9 @@ add_library(Parquet
parquet-struct-column-reader.cc
)
-add_dependencies(Parquet gen-deps)
+add_dependencies(ExecParquet gen-deps)
-add_library(ParquetTests STATIC
+add_library(ExecParquetTests STATIC
hdfs-parquet-scanner-test.cc
parquet-bool-decoder-test.cc
parquet-common-test.cc
@@ -50,7 +50,7 @@ add_library(ParquetTests STATIC
parquet-version-test.cc
serialize-single-value-test.cc
)
-add_dependencies(ParquetTests gen-deps)
+add_dependencies(ExecParquetTests gen-deps)
ADD_UNIFIED_BE_LSAN_TEST(parquet-bool-decoder-test ParquetBoolDecoder.*)
ADD_UNIFIED_BE_LSAN_TEST(parquet-common-test ParquetCommon.*)
diff --git a/be/src/exec/rcfile/CMakeLists.txt b/be/src/exec/rcfile/CMakeLists.txt
index b64c5c39a..3d11bf25e 100644
--- a/be/src/exec/rcfile/CMakeLists.txt
+++ b/be/src/exec/rcfile/CMakeLists.txt
@@ -15,16 +15,14 @@
# specific language governing permissions and limitations
# under the License.
-cmake_minimum_required(VERSION 2.6)
-
# where to put generated libraries
set(LIBRARY_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/exec/rcfile")
# where to put generated binaries
set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/exec/rcfile")
-add_library(Rcfile
+add_library(ExecRcfile
hdfs-rcfile-scanner.cc
)
-add_dependencies(Rcfile gen-deps)
\ No newline at end of file
+add_dependencies(ExecRcfile gen-deps)
\ No newline at end of file
diff --git a/be/src/exec/sequence/CMakeLists.txt b/be/src/exec/sequence/CMakeLists.txt
index f6f528ab2..e6f0b73a3 100644
--- a/be/src/exec/sequence/CMakeLists.txt
+++ b/be/src/exec/sequence/CMakeLists.txt
@@ -15,16 +15,14 @@
# specific language governing permissions and limitations
# under the License.
-cmake_minimum_required(VERSION 2.6)
-
# where to put generated libraries
set(LIBRARY_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/exec/sequence")
# where to put generated binaries
set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/exec/sequence")
-add_library(Sequence
+add_library(ExecSequence
hdfs-sequence-scanner.cc
)
-add_dependencies(Sequence gen-deps)
\ No newline at end of file
+add_dependencies(ExecSequence gen-deps)
\ No newline at end of file
diff --git a/be/src/exec/text/CMakeLists.txt b/be/src/exec/text/CMakeLists.txt
index 76ed4fd74..61e7ceaaf 100644
--- a/be/src/exec/text/CMakeLists.txt
+++ b/be/src/exec/text/CMakeLists.txt
@@ -15,17 +15,15 @@
# specific language governing permissions and limitations
# under the License.
-cmake_minimum_required(VERSION 2.6)
-
# where to put generated libraries
set(LIBRARY_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/exec/text")
# where to put generated binaries
set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/exec/text")
-add_library(Text
+add_library(ExecText
hdfs-text-scanner.cc
hdfs-plugin-text-scanner.cc
)
-add_dependencies(Text gen-deps)
\ No newline at end of file
+add_dependencies(ExecText gen-deps)
\ No newline at end of file