IMPALA-4856: Rename thrift-deps to gen-deps As a preparation to start generating Protobuf files for IMPALA-4856, this change introduces a new build target "gen-deps" which serves as an umbrella for all build targets of generated code. For now, it only includes thrift-deps and protobuf targets will be added in the future.
Change-Id: I360c63773efdeab4c26ca96b915e0c8d0ce2b9c9 Reviewed-on: http://gerrit.cloudera.org:8080/7851 Reviewed-by: Lars Volker <[email protected]> Reviewed-by: Tim Armstrong <[email protected]> Tested-by: Impala Public Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/35f5c7bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/35f5c7bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/35f5c7bd Branch: refs/heads/master Commit: 35f5c7bd37e7151f7f71d3136e9a16da6e85d582 Parents: caefd86 Author: Michael Ho <[email protected]> Authored: Fri Aug 25 20:24:36 2017 -0700 Committer: Impala Public Jenkins <[email protected]> Committed: Wed Aug 30 00:26:52 2017 +0000 ---------------------------------------------------------------------- CMakeLists.txt | 7 +++++-- be/src/catalog/CMakeLists.txt | 2 +- be/src/codegen/CMakeLists.txt | 2 +- be/src/common/CMakeLists.txt | 4 ++-- be/src/exec/CMakeLists.txt | 2 +- be/src/experiments/CMakeLists.txt | 2 +- be/src/exprs/CMakeLists.txt | 4 ++-- be/src/rpc/CMakeLists.txt | 2 +- be/src/runtime/CMakeLists.txt | 2 +- be/src/runtime/bufferpool/CMakeLists.txt | 2 +- be/src/scheduling/CMakeLists.txt | 2 +- be/src/service/CMakeLists.txt | 4 ++-- be/src/statestore/CMakeLists.txt | 2 +- be/src/testutil/CMakeLists.txt | 8 ++++---- be/src/transport/CMakeLists.txt | 2 +- be/src/udf/CMakeLists.txt | 4 ++-- be/src/udf_samples/CMakeLists.txt | 8 ++++---- be/src/util/CMakeLists.txt | 2 +- ext-data-source/CMakeLists.txt | 2 +- 19 files changed, 33 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index 954193e..e5c2fdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -349,9 +349,12 @@ add_subdirectory(be) add_subdirectory(fe) add_subdirectory(ext-data-source) +# Build target for all generated files which most backend code depends on +add_custom_target(gen-deps ALL DEPENDS thrift-deps) + add_custom_target(tarballs ALL DEPENDS shell_tarball) -add_custom_target(shell_tarball DEPENDS thrift-deps +add_custom_target(shell_tarball DEPENDS gen-deps COMMAND "${CMAKE_SOURCE_DIR}/shell/make_shell_tarball.sh" ) @@ -360,7 +363,7 @@ add_custom_target(cscope ALL ) if (DEFINED ENV{IMPALA_LZO} AND EXISTS $ENV{IMPALA_LZO}) - add_custom_target(impala-lzo ALL DEPENDS thrift-deps + add_custom_target(impala-lzo ALL DEPENDS gen-deps COMMAND $ENV{IMPALA_LZO}/build.sh ${CMAKE_BUILD_TYPE} ${CMAKE_SOURCE_DIR} $ENV{IMPALA_TOOLCHAIN} ) http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/catalog/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/catalog/CMakeLists.txt b/be/src/catalog/CMakeLists.txt index ece6c58..7debb91 100644 --- a/be/src/catalog/CMakeLists.txt +++ b/be/src/catalog/CMakeLists.txt @@ -24,4 +24,4 @@ add_library(Catalog catalog-util.cc catalogd-main.cc ) -add_dependencies(Catalog thrift-deps) +add_dependencies(Catalog gen-deps) http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/codegen/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/codegen/CMakeLists.txt b/be/src/codegen/CMakeLists.txt index edd78a0..e640009 100644 --- a/be/src/codegen/CMakeLists.txt +++ b/be/src/codegen/CMakeLists.txt @@ -35,7 +35,7 @@ add_library(CodeGen ${IR_SSE_C_FILE} ${IR_NO_SSE_C_FILE} ) -add_dependencies(CodeGen thrift-deps gen_ir_descriptions) +add_dependencies(CodeGen gen-deps gen_ir_descriptions) # output cross compile to ir metadata set(IR_DESC_GEN_OUTPUT http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/common/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/common/CMakeLists.txt b/be/src/common/CMakeLists.txt index dd1e441..8ba8ca9 100644 --- a/be/src/common/CMakeLists.txt +++ b/be/src/common/CMakeLists.txt @@ -41,12 +41,12 @@ add_custom_command( COMMENT "Generating the version.cc file" VERBATIM ) -add_dependencies(Common thrift-deps) +add_dependencies(Common gen-deps) add_library(GlobalFlags global-flags.cc ) -add_dependencies(GlobalFlags thrift-deps) +add_dependencies(GlobalFlags gen-deps) ADD_BE_TEST(atomic-test) http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/exec/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/exec/CMakeLists.txt b/be/src/exec/CMakeLists.txt index a94a38d..b5f7d3e 100644 --- a/be/src/exec/CMakeLists.txt +++ b/be/src/exec/CMakeLists.txt @@ -96,7 +96,7 @@ add_library(Exec unnest-node.cc ) -add_dependencies(Exec thrift-deps) +add_dependencies(Exec gen-deps) ADD_BE_TEST(zigzag-test) ADD_BE_TEST(hash-table-test) http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/experiments/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/experiments/CMakeLists.txt b/be/src/experiments/CMakeLists.txt index e4d4895..b4f0c49 100644 --- a/be/src/experiments/CMakeLists.txt +++ b/be/src/experiments/CMakeLists.txt @@ -24,7 +24,7 @@ set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/experiments") add_library(Experiments data-provider.cc ) -add_dependencies(Experiments thrift-deps) +add_dependencies(Experiments gen-deps) add_executable(data-provider-test data-provider-test.cc) add_executable(tuple-splitter-test tuple-splitter-test.cc) http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/exprs/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/exprs/CMakeLists.txt b/be/src/exprs/CMakeLists.txt index 1fe3bcb..cff391c 100644 --- a/be/src/exprs/CMakeLists.txt +++ b/be/src/exprs/CMakeLists.txt @@ -64,13 +64,13 @@ add_library(Exprs utility-functions.cc utility-functions-ir.cc ) -add_dependencies(Exprs thrift-deps gen_ir_descriptions) +add_dependencies(Exprs gen-deps gen_ir_descriptions) ADD_BE_TEST(expr-test) ADD_BE_TEST(expr-codegen-test) # expr-codegen-test includes test IR functions COMPILE_TO_IR(expr-codegen-test.cc) -add_dependencies(expr-codegen-test-ir thrift-deps) +add_dependencies(expr-codegen-test-ir gen-deps) ADD_UDF_TEST(aggregate-functions-test) http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/rpc/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/rpc/CMakeLists.txt b/be/src/rpc/CMakeLists.txt index 2386a85..d837f6c 100644 --- a/be/src/rpc/CMakeLists.txt +++ b/be/src/rpc/CMakeLists.txt @@ -30,7 +30,7 @@ add_library(Rpc thrift-server.cc thrift-thread.cc ) -add_dependencies(Rpc thrift-deps) +add_dependencies(Rpc gen-deps) ADD_BE_TEST(thrift-util-test) ADD_BE_TEST(thrift-server-test) http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/runtime/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/runtime/CMakeLists.txt b/be/src/runtime/CMakeLists.txt index c9aacc9..ad9f074 100644 --- a/be/src/runtime/CMakeLists.txt +++ b/be/src/runtime/CMakeLists.txt @@ -72,7 +72,7 @@ add_library(Runtime tuple-row.cc tmp-file-mgr.cc ) -add_dependencies(Runtime thrift-deps) +add_dependencies(Runtime gen-deps) # This test runs forever so should not be part of 'make test' add_executable(disk-io-mgr-stress-test disk-io-mgr-stress-test.cc) http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/runtime/bufferpool/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/runtime/bufferpool/CMakeLists.txt b/be/src/runtime/bufferpool/CMakeLists.txt index 4b1778b..ce68b07 100644 --- a/be/src/runtime/bufferpool/CMakeLists.txt +++ b/be/src/runtime/bufferpool/CMakeLists.txt @@ -29,7 +29,7 @@ add_library(BufferPool suballocator.cc system-allocator.cc ) -add_dependencies(BufferPool thrift-deps) +add_dependencies(BufferPool gen-deps) ADD_BE_TEST(buffer-allocator-test) ADD_BE_TEST(buffer-pool-test) http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/scheduling/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/scheduling/CMakeLists.txt b/be/src/scheduling/CMakeLists.txt index e80ea2b..024e6e1 100644 --- a/be/src/scheduling/CMakeLists.txt +++ b/be/src/scheduling/CMakeLists.txt @@ -31,7 +31,7 @@ add_library(Scheduling STATIC scheduler-test-util.cc scheduler.cc ) -add_dependencies(Scheduling thrift-deps) +add_dependencies(Scheduling gen-deps) ADD_BE_TEST(scheduler-test) ADD_BE_TEST(backend-config-test) http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/service/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/service/CMakeLists.txt b/be/src/service/CMakeLists.txt index cfb0bf3..ab51740 100644 --- a/be/src/service/CMakeLists.txt +++ b/be/src/service/CMakeLists.txt @@ -36,13 +36,13 @@ add_library(Service child-query.cc impalad-main.cc ) -add_dependencies(Service thrift-deps) +add_dependencies(Service gen-deps) # this shared library provides Impala executor functionality to FE test. add_library(fesupport SHARED fe-support.cc ) -add_dependencies(fesupport thrift-deps) +add_dependencies(fesupport gen-deps) target_link_libraries(fesupport ${IMPALA_LINK_LIBS_DYNAMIC_TARGETS}) http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/statestore/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/statestore/CMakeLists.txt b/be/src/statestore/CMakeLists.txt index 50e3703..313b2ec 100644 --- a/be/src/statestore/CMakeLists.txt +++ b/be/src/statestore/CMakeLists.txt @@ -28,6 +28,6 @@ add_library(Statestore statestore-subscriber.cc statestored-main.cc ) -add_dependencies(Statestore thrift-deps) +add_dependencies(Statestore gen-deps) ADD_BE_TEST(statestore-test) http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/testutil/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/testutil/CMakeLists.txt b/be/src/testutil/CMakeLists.txt index f6d2bcd..310ab37 100644 --- a/be/src/testutil/CMakeLists.txt +++ b/be/src/testutil/CMakeLists.txt @@ -32,13 +32,13 @@ add_library(TestUtil test-udas.cc test-udfs.cc ) -add_dependencies(TestUtil thrift-deps) +add_dependencies(TestUtil gen-deps) add_library(TestUdfs SHARED test-udfs.cc) -add_dependencies(TestUdfs thrift-deps) +add_dependencies(TestUdfs gen-deps) COMPILE_TO_IR(test-udfs.cc) -add_dependencies(test-udfs-ir thrift-deps) +add_dependencies(test-udfs-ir gen-deps) add_library(TestUdas SHARED test-udas.cc) -add_dependencies(TestUdas thrift-deps) +add_dependencies(TestUdas gen-deps) http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/transport/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/transport/CMakeLists.txt b/be/src/transport/CMakeLists.txt index bc1a40c..8a9eda8 100644 --- a/be/src/transport/CMakeLists.txt +++ b/be/src/transport/CMakeLists.txt @@ -30,4 +30,4 @@ add_library(ThriftSaslTransport TSaslTransport.cpp undef.cpp ) -add_dependencies(ThriftSaslTransport thrift-deps) \ No newline at end of file +add_dependencies(ThriftSaslTransport gen-deps) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/udf/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/udf/CMakeLists.txt b/be/src/udf/CMakeLists.txt index 46100e5..0470716 100644 --- a/be/src/udf/CMakeLists.txt +++ b/be/src/udf/CMakeLists.txt @@ -26,10 +26,10 @@ set(EXECUTABLE_OUTPUT_PATH "${BUILD_OUTPUT_ROOT_DIRECTORY}/udf") # can have dependencies on our other libs. The second version is shipped as part # of the UDF sdk, which can't use other libs. add_library(Udf udf.cc udf-ir.cc udf-test-harness.cc) -add_dependencies(Udf thrift-deps) +add_dependencies(Udf gen-deps) add_library(ImpalaUdf udf.cc udf-ir.cc udf-test-harness.cc) -add_dependencies(ImpalaUdf thrift-deps) +add_dependencies(ImpalaUdf gen-deps) set_target_properties(ImpalaUdf PROPERTIES COMPILE_FLAGS "-DIMPALA_UDF_SDK_BUILD") ADD_UDF_TEST(udf-test) http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/udf_samples/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/udf_samples/CMakeLists.txt b/be/src/udf_samples/CMakeLists.txt index f9a34fd..b07b9d7 100644 --- a/be/src/udf_samples/CMakeLists.txt +++ b/be/src/udf_samples/CMakeLists.txt @@ -37,15 +37,15 @@ endfunction(COMPILE_TO_IR) # Build the UDA/UDFs into a shared library. add_library(udfsample SHARED udf-sample.cc) -add_dependencies(udfsample thrift-deps) +add_dependencies(udfsample gen-deps) add_library(udasample SHARED uda-sample.cc hyperloglog-uda.cc) -add_dependencies(udasample thrift-deps) +add_dependencies(udasample gen-deps) # Custom targest to cross compile UDA/UDF to ir COMPILE_TO_IR(udf-sample.cc ) -add_dependencies(udf-sample-ir thrift-deps) +add_dependencies(udf-sample-ir gen-deps) COMPILE_TO_IR(uda-sample.cc ) -add_dependencies(uda-sample-ir thrift-deps) +add_dependencies(uda-sample-ir gen-deps) # This is an example of how to use the test harness to help develop UDF and UDAs. add_executable(udf-sample-test udf-sample-test.cc) http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/be/src/util/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/src/util/CMakeLists.txt b/be/src/util/CMakeLists.txt index 3d92da7..3f18094 100644 --- a/be/src/util/CMakeLists.txt +++ b/be/src/util/CMakeLists.txt @@ -84,7 +84,7 @@ add_library(Util webserver.cc ${MUSTACHE_SRC_DIR}/mustache.cc ) -add_dependencies(Util thrift-deps gen_ir_descriptions) +add_dependencies(Util gen-deps gen_ir_descriptions) # Squeasel requires C99 compatibility to build. SET_SOURCE_FILES_PROPERTIES(${SQUEASEL_SRC_DIR}/squeasel.c http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/35f5c7bd/ext-data-source/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/ext-data-source/CMakeLists.txt b/ext-data-source/CMakeLists.txt index 1a53278..d318493 100644 --- a/ext-data-source/CMakeLists.txt +++ b/ext-data-source/CMakeLists.txt @@ -15,6 +15,6 @@ # specific language governing permissions and limitations # under the License. -add_custom_target(ext-data-source ALL DEPENDS thrift-deps +add_custom_target(ext-data-source ALL DEPENDS gen-deps COMMAND $ENV{IMPALA_HOME}/bin/mvn-quiet.sh install -DskipTests )
