diff --git a/.github/workflows/check_bazel_tests.yml b/.github/workflows/check_bazel_tests.yml index a53cec9f6..cfd3a1d05 100644 --- a/.github/workflows/check_bazel_tests.yml +++ b/.github/workflows/check_bazel_tests.yml @@ -32,52 +32,52 @@ jobs: fail-fast: false matrix: include: - - test: "//base/javacontainer/test:ExaStackTraceCleanerTest" + - test: "//javacontainer/test:ExaStackTraceCleanerTest" name: "ExaStackTraceCleanerTest" java_version: "openjdk-11-jdk" - - test: "//base/javacontainer/test:ExaStackTraceCleanerTest" + - test: "//javacontainer/test:ExaStackTraceCleanerTest" name: "ExaStackTraceCleanerTest" java_version: "openjdk-17-jdk" - - test: "//base/javacontainer/test:javacontainer-test-extractor-legacy" + - test: "//javacontainer/test:javacontainer-test-extractor-legacy" name: "javacontainer-test-extractor-legacy" java_version: "openjdk-11-jdk" - - test: "//base/javacontainer/test:javacontainer-test-extractor-v2" + - test: "//javacontainer/test:javacontainer-test-extractor-v2" name: "javacontainer-test-extractor-v2" java_version: "openjdk-11-jdk" - - test: "//base/javacontainer/script_options/..." + - test: "//javacontainer/script_options/..." name: "javacontainer-script_options" java_version: "" - - test: "//base/exaudflib/test/..." + - test: "//exaudflib/test/..." name: "exaudflib" java_version: "" - - test: "//base/script_options_parser/ctpg/..." + - test: "//script_options_parser/ctpg/..." name: "script_options_parser_ctpg" java_version: "" - - test: "//base/script_options_parser/legacy/..." + - test: "//script_options_parser/legacy/..." name: "script_options_parser_legacy" java_version: "" - - test: "--run_under='valgrind --leak-check=yes' --config=valgrind //base/javacontainer/test:javacontainer-test-extractor-legacy" + - test: "--run_under='valgrind --leak-check=yes' --config=valgrind //javacontainer/test:javacontainer-test-extractor-legacy" name: "javacontainer-test-extractor-legacy-with-valgrind" java_version: "openjdk-11-jdk" - - test: "--run_under='valgrind --leak-check=yes' --config=valgrind //base/javacontainer/test:javacontainer-test-extractor-v2" + - test: "--run_under='valgrind --leak-check=yes' --config=valgrind //javacontainer/test:javacontainer-test-extractor-v2" name: "javacontainer-test-extractor-v2-with-valgrind" java_version: "openjdk-11-jdk" - - test: "--run_under='valgrind --leak-check=yes' --config=valgrind //base/script_options_parser/ctpg/..." + - test: "--run_under='valgrind --leak-check=yes' --config=valgrind //script_options_parser/ctpg/..." name: "script_options_parser_ctpg_with_valgrind" java_version: "" - - test: "--run_under='valgrind --leak-check=yes' --config=valgrind //base/script_options_parser/legacy/..." + - test: "--run_under='valgrind --leak-check=yes' --config=valgrind //script_options_parser/legacy/..." name: "script_options_parser_legacy_with_valgrind" java_version: "" - - test: "--config=asan //base/javacontainer/test:javacontainer-test-extractor-legacy" + - test: "--config=asan //javacontainer/test:javacontainer-test-extractor-legacy" name: "javacontainer-test-extractor-legacy-with-asan" java_version: "openjdk-11-jdk" - - test: "--config=asan //base/javacontainer/test:javacontainer-test-extractor-v2" + - test: "--config=asan //javacontainer/test:javacontainer-test-extractor-v2" name: "javacontainer-test-extractor-v2-with-asan" java_version: "openjdk-11-jdk" - - test: "--config=asan //base/script_options_parser/ctpg/..." + - test: "--config=asan //script_options_parser/ctpg/..." name: "script_options_parser_ctpg_with_asan" java_version: "" - - test: "--config=asan //base/script_options_parser/legacy/..." + - test: "--config=asan //script_options_parser/legacy/..." name: "script_options_parser_legacy_with_asan" java_version: "" steps: @@ -98,7 +98,7 @@ jobs: - name: Run tests run: | bazel test ${{ matrix.additional_args }} ${{ matrix.test }} - working-directory: ./exaudfclient/ + working-directory: ./exaudfclient/base env: OPENSSL_LIBRARY_PREFIX: "/usr/lib/x86_64-linux-gnu" OPENSSL_INCLUDE_PREFIX: "/usr/include/openssl" diff --git a/exaudfclient/.bazelrc b/exaudfclient/.bazelrc index b8844b688..5ca3b6978 100644 --- a/exaudfclient/.bazelrc +++ b/exaudfclient/.bazelrc @@ -3,7 +3,7 @@ build --lockfile_mode=off --copt='-std=c++17' --force_pic --action_env=PROTOBUF_ build:benchmark --define benchmark=true build:java --define java=true --action_env=JAVA_PREFIX build:python --define python=true --action_env=NUMPY_PREFIX --action_env=PYTHON3_SYSPATH --action_env=PYTHON3_PREFIX --action_env=PYTHON3_VERSION -build:fast-binary --copt='-DCUSTOM_LIBEXAUDFLIB_PATH="/exaudf/base/libexaudflib_complete.so"' --define binary_type=fast_binary //:exaudfclient +build:fast-binary --define binary_type=fast_binary //:exaudfclient build:slow-wrapper --define binary_type=slow_wrapper //:exaudfclient build:static-binary //:exaudfclient_static build:test-binaries --config=static-binary --config=slow-wrapper diff --git a/exaudfclient/BUILD b/exaudfclient/BUILD index 1c609375c..8f48b919e 100644 --- a/exaudfclient/BUILD +++ b/exaudfclient/BUILD @@ -1,86 +1,42 @@ load("//:variables.bzl", "VM_ENABLED_DEFINES") -config_setting( - name = "benchmark", - define_values = {"benchmark": "true"}, -) - -config_setting( - name = "python", - define_values = {"python": "true"}, -) - -config_setting( - name = "java", - define_values = {"java": "true"}, -) - -config_setting( - name = "bash", - define_values = {"bash": "true"}, -) - -config_setting( - name = "fast_binary", - define_values = { - "binary_type": "fast_binary", - }, -) - -config_setting( - name = "slow_wrapper", - define_values = { - "binary_type": "slow_wrapper", - }, -) - -config_setting( - name = "valgrind_wrapper", - define_values = { - "wrapper_type": "valgrind_wrapper", - }, -) - -config_setting( - name = "valgrind_massif_wrapper", - define_values = { - "wrapper_type": "valgrind_massif_wrapper", - }, -) - -config_setting( - name = "stdout_to_bucketfs", - define_values = { - "wrapper_type": "stdout_to_bucketfs", - }, -) VM_ENABLED_DEPS=select({ - "//:benchmark": ["//base/benchmark_container:benchmark_container"], + "@exaudfclient_base//:benchmark": ["@exaudfclient_base//benchmark_container:benchmark_container"], "//conditions:default": [] }) + select({ - "//:java": ["//base/javacontainer:javacontainer"], + "@exaudfclient_base//:java": ["@exaudfclient_base//javacontainer:javacontainer"], "//conditions:default": [] }) + select({ - "//:bash": ["//base/streaming_container:streamingcontainer"], + "@exaudfclient_base//:bash": ["@exaudfclient_base//streaming_container:streamingcontainer"], "//conditions:default": [] }) VM_PYTHON3_DEPS=select({ - "//:python": ["//base/python/python3:pythoncontainer"], + "@exaudfclient_base//:python": ["@exaudfclient_base//python/python3:pythoncontainer"], "//conditions:default": [] }) + +genrule( + name = "exaudflib_output_path_header", + srcs = ["@exaudfclient_base//:libexaudflib_complete.so"], + outs = ["exaudf_lib_output_path.h"], + cmd = ''' + echo "#define CUSTOM_LIBEXAUDFLIB_PATH \\"/exaudf/external/$(rlocationpath @exaudfclient_base//:libexaudflib_complete.so)\\"" > $@ + ''', +) + cc_binary( name = "exaudfclient_bin", - srcs = ["exaudfclient.cc", "//base:load_dynamic"], + srcs = ["exaudfclient.cc", "@exaudfclient_base//:load_dynamic", "//:exaudflib_output_path_header"], linkopts = ["-ldl"], # needed for dynamicly loading libexaudflib_complete.so into another linker namespace - deps = ["//base/exaudflib:header", "//base/utils:utils"]+VM_ENABLED_DEPS+VM_PYTHON3_DEPS+ - ["//base/exaudflib:exaudflib-deps"], + deps = ["@exaudfclient_base//exaudflib:header", "@exaudfclient_base//utils:utils"]+VM_ENABLED_DEPS+VM_PYTHON3_DEPS+ + ["@exaudfclient_base//exaudflib:exaudflib-deps"], defines = VM_ENABLED_DEFINES, - data = ["//base:libexaudflib_complete.so"] + data = ["@exaudfclient_base//:libexaudflib_complete.so"] ) ## The purpose of the static binaries is to verify if the linker namespace test work correctly. @@ -92,19 +48,19 @@ cc_binary( ## Besides this the test under test/python3/all/linker_namespace.py checks the normal build, which expects ## not to find any occurence of the dependencies (protobuf/zmq) in the primary linker namespace. ## -## We need to explicitly declare the dependency of protobuf/zmq here, as the exaudflib is a static lib (//base/exaudflib:exaudflib) +## We need to explicitly declare the dependency of protobuf/zmq here, as the exaudflib is a static lib (//exaudflib:exaudflib) ## and hence does not contain dependency information. We cannot declare the shared lib (:exaudflib_complete.so) ## as dependency as it is a binary for bazel. cc_binary( name = "exaudfclient_static_bin", - srcs = ["exaudfclient.cc", "//base:load_dynamic"], + srcs = ["exaudfclient.cc", "@exaudfclient_base//:load_dynamic", "//:exaudflib_output_path_header"], linkopts = ["-ldl"], # needed for dynamicly loading libexaudflib_complete.so into another linker namespace - deps = ["//base/exaudflib:header", "//base/utils:utils"]+VM_ENABLED_DEPS+VM_PYTHON3_DEPS+ - ["//base/exaudflib:exaudflib-deps"] + + deps = ["@exaudfclient_base//exaudflib:header", "@exaudfclient_base//utils:utils"]+VM_ENABLED_DEPS+VM_PYTHON3_DEPS+ + ["@exaudfclient_base//exaudflib:exaudflib-deps"] + [ "@zmq//:zmq", "@protobuf//:protobuf"], defines = VM_ENABLED_DEFINES, - data = ["//base:libexaudflib_complete.so"], + data = ["@exaudfclient_base//:libexaudflib_complete.so"], ) # Workarround for the hardcoded paths in exaudfclient for libexaudflib_complete.so and python_ext_dataframe.cc @@ -118,33 +74,33 @@ cc_binary( sh_library( name = "wrapper_generator_bin", srcs=select({ - "//:valgrind_wrapper": ["//base:create_binary_wrapper_valgrind.sh"], - "//:valgrind_massif_wrapper": ["//base:create_binary_wrapper_valgrind_massif.sh"], - "//:stdout_to_bucketfs": ["//base:create_binary_wrapper_stdout_to_bucketfs.sh"], + "@exaudfclient_base//:valgrind_wrapper": ["@exaudfclient_base//:create_binary_wrapper_valgrind.sh"], + "@exaudfclient_base//:valgrind_massif_wrapper": ["@exaudfclient_base//:create_binary_wrapper_valgrind_massif.sh"], + "@exaudfclient_base//:stdout_to_bucketfs": ["@exaudfclient_base//:create_binary_wrapper_stdout_to_bucketfs.sh"], "//conditions:default": ["//base:create_binary_wrapper.sh"] }) ) -SLOW_WRAPPER_BINARY="""$(location //:wrapper_generator_bin) "$(location exaudfclient_bin)" "$(location exaudfclient)" "$(location //base:exaudfclient.template.sh)" """ +SLOW_WRAPPER_BINARY="""$(location //:wrapper_generator_bin) "$(location exaudfclient_bin)" "$(location exaudfclient)" "$(location @exaudfclient_base//:exaudfclient.template.sh)" """ FAST_BINARY="""cp "$(location exaudfclient_bin)" "$(location exaudfclient)" """ CREATE_BINARY_SCRIPT=select({ - "//:fast_binary": FAST_BINARY, - "//:slow_wrapper": SLOW_WRAPPER_BINARY, + "@exaudfclient_base//:fast_binary": FAST_BINARY, + "@exaudfclient_base//:slow_wrapper": SLOW_WRAPPER_BINARY, "//conditions:default": FAST_BINARY }) genrule( name = "exaudfclient", cmd = CREATE_BINARY_SCRIPT, outs = ["exaudfclient"], - srcs = [":exaudfclient_bin", "//base:libexaudflib_complete.so", "//base:exaudfclient.template.sh", "//:wrapper_generator_bin"], + srcs = [":exaudfclient_bin", "@exaudfclient_base//:libexaudflib_complete.so", "@exaudfclient_base//:exaudfclient.template.sh", "//:wrapper_generator_bin"], output_to_bindir = True ) -SLOW_WRAPPER_STATIC_BINARY="""$(location //:wrapper_generator_bin) "$(location exaudfclient_static_bin)" "$(location exaudfclient_static)" "$(location //base:exaudfclient.template.sh)" """ +SLOW_WRAPPER_STATIC_BINARY="""$(location //:wrapper_generator_bin) "$(location exaudfclient_static_bin)" "$(location exaudfclient_static)" "$(location @exaudfclient_base//:exaudfclient.template.sh)" """ FAST_BINARY_STATIC="""cp "$(location exaudfclient_static_bin)" "$(location exaudfclient_static)" """ CREATE_STATIC_BINARY_SCRIPT=select({ - "//:fast_binary": FAST_BINARY_STATIC, - "//:slow_wrapper": SLOW_WRAPPER_STATIC_BINARY, + "@exaudfclient_base//:fast_binary": FAST_BINARY_STATIC, + "@exaudfclient_base//:slow_wrapper": SLOW_WRAPPER_STATIC_BINARY, "//conditions:default": FAST_BINARY_STATIC }) @@ -152,6 +108,6 @@ genrule( name = "exaudfclient_static", cmd = CREATE_STATIC_BINARY_SCRIPT, outs = ["exaudfclient_static"], - srcs = [":exaudfclient_static_bin", "//base:libexaudflib_complete.so", "//base:exaudfclient.template.sh", "//:wrapper_generator_bin"], + srcs = [":exaudfclient_static_bin", "@exaudfclient_base//:libexaudflib_complete.so", "@exaudfclient_base//:exaudfclient.template.sh", "//:wrapper_generator_bin"], output_to_bindir = True ) diff --git a/exaudfclient/MODULE.bazel b/exaudfclient/MODULE.bazel index 3c7561918..bd42ab8f3 100644 --- a/exaudfclient/MODULE.bazel +++ b/exaudfclient/MODULE.bazel @@ -1,3 +1,32 @@ module(name="exaudfclient", version = "1.0") -include("//base:base.MODULE.bazel") \ No newline at end of file +bazel_dep(name = "exaudfclient_base", version = "1.0.0") +local_path_override(module_name="exaudfclient_base", path="base") +bazel_dep(name = "rules_jvm_external", version = "6.2") + +numpy_local_repository = use_repo_rule("@exaudfclient_base//:python_repository.bzl", "numpy_local_repository") +numpy_local_repository(name = "numpy") + +python_local_repository = use_repo_rule("@exaudfclient_base//:python_repository.bzl", "python_local_repository") +python_local_repository(name = "python3", python_version="python3") + +zmq_local_repository = use_repo_rule("@exaudfclient_base//:zmq_repository.bzl", "zmq_local_repository") +zmq_local_repository(name = "zmq") + +protobuf_local_repository = use_repo_rule("@exaudfclient_base//:protobuf_repository.bzl", "protobuf_local_repository") +protobuf_local_repository(name = "protobuf") + +java_local_repository = use_repo_rule("@exaudfclient_base//:java_repository.bzl", "java_local_repository") +java_local_repository(name = "java") + + +maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") +maven.install( + artifacts = [ + "com.exasol:udf-api-java:1.0.5", + ], + repositories = [ + "https://repo1.maven.org/maven2", + ], +) +use_repo(maven, "maven") diff --git a/exaudfclient/base/.bazelrc b/exaudfclient/base/.bazelrc new file mode 100644 index 000000000..4a15be77f --- /dev/null +++ b/exaudfclient/base/.bazelrc @@ -0,0 +1,19 @@ +build --lockfile_mode=off --copt='-std=c++17' --force_pic --action_env=PROTOBUF_BIN --action_env=PROTOBUF_LIBRARY_PREFIX --action_env=PROTOBUF_INCLUDE_PREFIX +build:benchmark --define benchmark=true +build:java --define java=true --action_env=JAVA_PREFIX +build:python --define python=true --action_env=NUMPY_PREFIX --action_env=PYTHON3_SYSPATH --action_env=PYTHON3_PREFIX --action_env=PYTHON3_VERSION +build:debug-build --sandbox_debug --config=verbose +build:no-symlinks --symlink_prefix=/ +build:asan --strip=never +build:asan --copt -fsanitize=address +build:asan --copt -DADDRESS_SANITIZER +build:asan --copt -O1 +build:asan --copt -g +build:asan --copt -fno-omit-frame-pointer +build:asan --linkopt -fsanitize=address +build:asan -c dbg +build:valgrind --copt -O1 +build:valgrind -c dbg +build:valgrind --copt -g +build:valgrind --strip=never +build:valgrind --copt -DVALGRIND_ACTIVE diff --git a/exaudfclient/base/BUILD b/exaudfclient/base/BUILD index 9d6728354..fc0887ff7 100644 --- a/exaudfclient/base/BUILD +++ b/exaudfclient/base/BUILD @@ -7,21 +7,76 @@ exports_files(["filter_swig_code.py", "build_integrated.py", load("//:variables.bzl", "VM_ENABLED_DEFINES") +config_setting( + name = "benchmark", + define_values = {"benchmark": "true"}, +) + +config_setting( + name = "python", + define_values = {"python": "true"}, +) + +config_setting( + name = "java", + define_values = {"java": "true"}, +) + +config_setting( + name = "bash", + define_values = {"bash": "true"}, +) + +config_setting( + name = "fast_binary", + define_values = { + "binary_type": "fast_binary", + }, +) + +config_setting( + name = "slow_wrapper", + define_values = { + "binary_type": "slow_wrapper", + }, +) + +config_setting( + name = "valgrind_wrapper", + define_values = { + "wrapper_type": "valgrind_wrapper", + }, +) + +config_setting( + name = "valgrind_massif_wrapper", + define_values = { + "wrapper_type": "valgrind_massif_wrapper", + }, +) + +config_setting( + name = "stdout_to_bucketfs", + define_values = { + "wrapper_type": "stdout_to_bucketfs", + }, +) + cc_library( name = "load_dynamic", srcs = [ "load_dynamic.cc" ], - deps = ["//base/exaudflib:header", "//base/utils:utils", "//base/exaudflib:exaudflib-deps"], + deps = ["//exaudflib:header", "//utils:utils", "//exaudflib:exaudflib-deps"], defines = VM_ENABLED_DEFINES, ) # Using cc_binary to build a shared library as output target is a workaround, because # Bazel's cc_library are only intermediate stages and can't be used as output target. -# It is necessary to include //base/exaudflib:exaudflib into deps and srcs, because -# otherwise dlmopen won't find the symbols of exaudflib and its dependencies. The target //base/exaudflib:exaudflib-deps +# It is necessary to include //exaudflib:exaudflib into deps and srcs, because +# otherwise dlmopen won't find the symbols of exaudflib and its dependencies. The target //exaudflib:exaudflib-deps # won't work either, because it only contains the libraries as dependencies. # Bazel builts a static library (.a) and a dynamic library (.so) out of exaudflib:exaudflib. # In the libexaudflib_complete.so-2.params, we saw that Bazel uses both libraries to built libexaudflib_complete.so. @@ -29,7 +84,7 @@ cc_library( cc_binary( name = "libexaudflib_complete.so", linkshared = 1, - srcs = ["//base/exaudflib:exaudflib"], - deps = ["//base/exaudflib:exaudflib"], + srcs = ["//exaudflib:exaudflib"], + deps = ["//exaudflib:exaudflib"], defines = VM_ENABLED_DEFINES, ) diff --git a/exaudfclient/base/MODULE.bazel b/exaudfclient/base/MODULE.bazel new file mode 100644 index 000000000..603111176 --- /dev/null +++ b/exaudfclient/base/MODULE.bazel @@ -0,0 +1,42 @@ +module(name="exaudfclient_base", version = "1.0") + +bazel_dep(name = "bazel_skylib", version = "1.7.1") +bazel_dep(name = "googletest", version = "1.15.0") +bazel_dep(name = "rules_jvm_external", version = "6.2") + +# The following is necessary to build the UDF client for Java +# Since Bazel >8 the Python hermetic build rules must not run as root +# However, since the UDF client is built as root in a docker container +# we must disable this behavior. The only way is to configure the Python hermetic toolchain +bazel_dep(name = "rules_python", version = "1.7.0") + +python = use_extension("@rules_python//python/extensions:python.bzl", "python") +python.defaults(python_version = "3.11") +python.toolchain(python_version = "3.11", ignore_root_user_error = True,) + + +numpy_local_repository = use_repo_rule("@exaudfclient_base//:python_repository.bzl", "numpy_local_repository") +numpy_local_repository(name = "numpy") + +python_local_repository = use_repo_rule("@exaudfclient_base//:python_repository.bzl", "python_local_repository") +python_local_repository(name = "python3", python_version="python3") + +zmq_local_repository = use_repo_rule("@exaudfclient_base//:zmq_repository.bzl", "zmq_local_repository") +zmq_local_repository(name = "zmq") + +protobuf_local_repository = use_repo_rule("@exaudfclient_base//:protobuf_repository.bzl", "protobuf_local_repository") +protobuf_local_repository(name = "protobuf") + +java_local_repository = use_repo_rule("@exaudfclient_base//:java_repository.bzl", "java_local_repository") +java_local_repository(name = "java") + +maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") +maven.install( + artifacts = [ + "com.exasol:udf-api-java:1.0.5", + ], + repositories = [ + "https://repo1.maven.org/maven2", + ], +) +use_repo(maven, "maven") diff --git a/exaudfclient/base/base.MODULE.bazel b/exaudfclient/base/base.MODULE.bazel deleted file mode 100644 index 45efb45fc..000000000 --- a/exaudfclient/base/base.MODULE.bazel +++ /dev/null @@ -1,31 +0,0 @@ -bazel_dep(name = "bazel_skylib", version = "1.7.1") -bazel_dep(name = "googletest", version = "1.15.0") -bazel_dep(name = "rules_java", version = "7.6.1") -bazel_dep(name = "rules_jvm_external", version = "6.2") - -python_local_repository = use_repo_rule("//base:python_repository.bzl", "python_local_repository") -python_local_repository(name = "python3", python_version="python3") - -numpy_local_repository = use_repo_rule("//base:python_repository.bzl", "numpy_local_repository") - -numpy_local_repository(name = "numpy") - -zmq_local_repository = use_repo_rule("//base:zmq_repository.bzl", "zmq_local_repository") -zmq_local_repository(name = "zmq") - -protobuf_local_repository = use_repo_rule("//base:protobuf_repository.bzl", "protobuf_local_repository") -protobuf_local_repository(name = "protobuf") - -java_local_repository = use_repo_rule("//base:java_repository.bzl", "java_local_repository") -java_local_repository(name = "java") - -maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") -maven.install( - artifacts = [ - "com.exasol:udf-api-java:1.0.5", - ], - repositories = [ - "https://repo1.maven.org/maven2", - ], -) -use_repo(maven, "maven") diff --git a/exaudfclient/base/benchmark_container/BUILD b/exaudfclient/base/benchmark_container/BUILD index 9c7c0ba83..2c8d028cc 100644 --- a/exaudfclient/base/benchmark_container/BUILD +++ b/exaudfclient/base/benchmark_container/BUILD @@ -4,5 +4,5 @@ cc_library( name = "benchmark_container", srcs = ["benchmark_container.cc","benchmark_container.h"], hdrs = ["benchmark_container.h"], - deps = ["//base/exaudflib:exaudflib-deps","//base/exaudflib:header", "//base/utils:utils"]+["//base/script_options_parser:scriptoptionlines"] + deps = ["//exaudflib:exaudflib-deps","//exaudflib:header", "//utils:utils"]+["//script_options_parser:scriptoptionlines"] ) \ No newline at end of file diff --git a/exaudfclient/base/benchmark_container/benchmark_container.cc b/exaudfclient/base/benchmark_container/benchmark_container.cc index 057bc3755..92de436a8 100644 --- a/exaudfclient/base/benchmark_container/benchmark_container.cc +++ b/exaudfclient/base/benchmark_container/benchmark_container.cc @@ -2,7 +2,7 @@ #define ENABLE_BENCHMARK_VM #endif -#include "base/utils/debug_message.h" +#include "utils/debug_message.h" #include "benchmark_container.h" #include #include diff --git a/exaudfclient/base/benchmark_container/benchmark_container.h b/exaudfclient/base/benchmark_container/benchmark_container.h index eacf1f153..e107f4b34 100644 --- a/exaudfclient/base/benchmark_container/benchmark_container.h +++ b/exaudfclient/base/benchmark_container/benchmark_container.h @@ -1,7 +1,7 @@ -#include "base/exaudflib/vm/swig_vm.h" -#include "base/exaudflib/swig/swig_meta_data.h" -#include "base/exaudflib/swig/swig_result_handler.h" -#include "base/exaudflib/swig/swig_table_iterator.h" +#include "exaudflib/vm/swig_vm.h" +#include "exaudflib/swig/swig_meta_data.h" +#include "exaudflib/swig/swig_result_handler.h" +#include "exaudflib/swig/swig_table_iterator.h" using namespace SWIGVMContainers; using namespace std; diff --git a/exaudfclient/base/exaudfclient.template.sh b/exaudfclient/base/exaudfclient.template.sh index efef969a0..ca8d30dbd 100644 --- a/exaudfclient/base/exaudfclient.template.sh +++ b/exaudfclient/base/exaudfclient.template.sh @@ -3,6 +3,5 @@ SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" echo "Changing to script directory $SCRIPT_DIR" cd "$SCRIPT_DIR" || return 1 -export LIBEXAUDFLIB_PATH="$SCRIPT_DIR/base/libexaudflib_complete.so" -export LIBPYEXADATAFRAME_DIR="$SCRIPT_DIR/base/python/python3" +export LIBPYEXADATAFRAME_DIR="$SCRIPT_DIR/external/exaudfclient_base+/python/python3" export LD_LIBRARY_PATH="/opt/conda/cuda-compat/:$LD_LIBRARY_PATH" #Temporary hack for the Cuda ML flavor(s) diff --git a/exaudfclient/base/exaudflib/BUILD b/exaudfclient/base/exaudflib/BUILD index 4cc20aacb..329bbb6eb 100644 --- a/exaudfclient/base/exaudflib/BUILD +++ b/exaudfclient/base/exaudflib/BUILD @@ -73,8 +73,8 @@ cc_library( # The only target which must depend on it is //:libexaudflib-complete.so. # If you depend on this target you will load protobuf into your linker namespace # which might cause problems with tensorflow. If you need -# "//base/exaudflib:script_data_transfer_objects" or -# "//base/exaudflib:script_data_transfer_objects_wrapper" in the language container +# "//exaudflib:script_data_transfer_objects" or +# "//exaudflib:script_data_transfer_objects_wrapper" in the language container # depend directly on them or depend on exaudflib-deps cc_library( name = "exaudflib", @@ -94,5 +94,5 @@ cc_library( "impl/swig/swig_general_iterator.h", "impl/swig/swig_general_iterator.cc"], defines = VM_ENABLED_DEFINES, linkstatic = False, # Needs to be false, because otherwise we might get missing symbols when loading exaudflib_complete.so - deps = [":exaudflib-deps", ":zmqcontainer", "@zmq//:zmq", ":header", "//base/utils:utils"], + deps = [":exaudflib-deps", ":zmqcontainer", "@zmq//:zmq", ":header", "//utils:utils"], ) diff --git a/exaudfclient/base/exaudflib/exascript.i b/exaudfclient/base/exaudflib/exascript.i index 9838e88a5..bc6abf9bd 100644 --- a/exaudfclient/base/exaudflib/exascript.i +++ b/exaudfclient/base/exaudflib/exascript.i @@ -3,11 +3,11 @@ %} %{ -#include "base/exaudflib/swig/swig_result_handler.h" -#include "base/exaudflib/swig/swig_meta_data.h" +#include "exaudflib/swig/swig_result_handler.h" +#include "exaudflib/swig/swig_meta_data.h" using namespace SWIGVMContainers; -#include "base/exaudflib/swig/script_data_transfer_objects_wrapper.h" +#include "exaudflib/swig/script_data_transfer_objects_wrapper.h" %} %ignore ExecutionGraph::ConnectionInformationWrapper::ConnectionInformationWrapper; diff --git a/exaudfclient/base/exaudflib/impl/check.cc b/exaudfclient/base/exaudflib/impl/check.cc index b39e85108..14029d7df 100644 --- a/exaudfclient/base/exaudflib/impl/check.cc +++ b/exaudfclient/base/exaudflib/impl/check.cc @@ -1,12 +1,12 @@ -#include "base/exaudflib/impl/check.h" -#include "base/exaudflib/impl/socket_info.h" +#include "exaudflib/impl/check.h" +#include "exaudflib/impl/socket_info.h" #include #include #include #include -#include "base/utils/debug_message.h" +#include "utils/debug_message.h" namespace exaudflib { namespace check { diff --git a/exaudfclient/base/exaudflib/impl/exaudflib_main.cc b/exaudfclient/base/exaudflib/impl/exaudflib_main.cc index 2e0943a4e..9e4fa4f83 100644 --- a/exaudfclient/base/exaudflib/impl/exaudflib_main.cc +++ b/exaudfclient/base/exaudflib/impl/exaudflib_main.cc @@ -10,20 +10,20 @@ #include #include -#include "base/utils/debug_message.h" +#include "utils/debug_message.h" // swig lib #include -#include "base/exaudflib/impl/check.h" -#include "base/exaudflib/impl/socket_info.h" -#include "base/exaudflib/impl/socket_low_level.h" -#include "base/exaudflib/impl/msg_conversion.h" -#include "base/exaudflib/impl/global.h" -#include "base/exaudflib/impl/socket_high_level.h" +#include "exaudflib/impl/check.h" +#include "exaudflib/impl/socket_info.h" +#include "exaudflib/impl/socket_low_level.h" +#include "exaudflib/impl/msg_conversion.h" +#include "exaudflib/impl/global.h" +#include "exaudflib/impl/socket_high_level.h" -#include "base/exaudflib/vm/swig_vm.h" +#include "exaudflib/vm/swig_vm.h" #ifndef NDEBUG diff --git a/exaudfclient/base/exaudflib/impl/global.cc b/exaudfclient/base/exaudflib/impl/global.cc index d29100bef..d5f570b1f 100644 --- a/exaudfclient/base/exaudflib/impl/global.cc +++ b/exaudfclient/base/exaudflib/impl/global.cc @@ -1,4 +1,4 @@ -#include "base/exaudflib/impl/global.h" +#include "exaudflib/impl/global.h" #include namespace exaudflib { diff --git a/exaudfclient/base/exaudflib/impl/global.h b/exaudfclient/base/exaudflib/impl/global.h index 09402eb1b..61e0b8ccf 100644 --- a/exaudfclient/base/exaudflib/impl/global.h +++ b/exaudfclient/base/exaudflib/impl/global.h @@ -1,9 +1,9 @@ #ifndef EXAUDFCLIENT_EXUDFLIB_GLOBAL_H #define EXAUDFCLIENT_EXUDFLIB_GLOBAL_H -#include "base/exaudflib/swig/script_data_transfer_objects.h" -#include "base/exaudflib/zmqcontainer.pb.h" -#include "base/exaudflib/swig/swig_common.h" +#include "exaudflib/swig/script_data_transfer_objects.h" +#include "exaudflib/zmqcontainer.pb.h" +#include "exaudflib/swig/swig_common.h" #include namespace exaudflib { diff --git a/exaudfclient/base/exaudflib/impl/msg_conversion.cc b/exaudfclient/base/exaudflib/impl/msg_conversion.cc index 654ac0f50..c09ee024d 100644 --- a/exaudfclient/base/exaudflib/impl/msg_conversion.cc +++ b/exaudfclient/base/exaudflib/impl/msg_conversion.cc @@ -1,4 +1,4 @@ -#include "base/exaudflib/impl/msg_conversion.h" +#include "exaudflib/impl/msg_conversion.h" std::string exaudflib::msg_conversion::convert_message_type_to_string(int message_type){ switch (message_type) diff --git a/exaudfclient/base/exaudflib/impl/socket_high_level.cc b/exaudfclient/base/exaudflib/impl/socket_high_level.cc index 3a4d4d8d5..13048b640 100644 --- a/exaudfclient/base/exaudflib/impl/socket_high_level.cc +++ b/exaudfclient/base/exaudflib/impl/socket_high_level.cc @@ -1,13 +1,13 @@ -#include "base/exaudflib/impl/socket_high_level.h" +#include "exaudflib/impl/socket_high_level.h" -#include "base/exaudflib/impl/socket_low_level.h" -#include "base/exaudflib/zmqcontainer.pb.h" -#include "base/exaudflib/impl/msg_conversion.h" -#include "base/exaudflib/impl/global.h" -#include "base/exaudflib/swig/swig_common.h" -#include "base/exaudflib/vm/swig_vm.h" +#include "exaudflib/impl/socket_low_level.h" +#include "exaudflib/zmqcontainer.pb.h" +#include "exaudflib/impl/msg_conversion.h" +#include "exaudflib/impl/global.h" +#include "exaudflib/swig/swig_common.h" +#include "exaudflib/vm/swig_vm.h" #include -#include "base/utils/debug_message.h" +#include "utils/debug_message.h" namespace exaudflib { namespace socket_high_level { diff --git a/exaudfclient/base/exaudflib/impl/socket_info.cc b/exaudfclient/base/exaudflib/impl/socket_info.cc index 1c94ff637..9df03c255 100644 --- a/exaudfclient/base/exaudflib/impl/socket_info.cc +++ b/exaudfclient/base/exaudflib/impl/socket_info.cc @@ -1,4 +1,4 @@ -#include "base/exaudflib/impl/socket_info.h" +#include "exaudflib/impl/socket_info.h" namespace exaudflib { diff --git a/exaudfclient/base/exaudflib/impl/socket_low_level.cc b/exaudfclient/base/exaudflib/impl/socket_low_level.cc index 74e2de8b1..9a324d002 100644 --- a/exaudfclient/base/exaudflib/impl/socket_low_level.cc +++ b/exaudfclient/base/exaudflib/impl/socket_low_level.cc @@ -1,6 +1,6 @@ -#include "base/exaudflib/impl/socket_low_level.h" -#include "base/exaudflib/impl/check.h" -#include "base/utils/debug_message.h" +#include "exaudflib/impl/socket_low_level.h" +#include "exaudflib/impl/check.h" +#include "utils/debug_message.h" #include #include #include diff --git a/exaudfclient/base/exaudflib/impl/swig/swig_factory.cc b/exaudfclient/base/exaudflib/impl/swig/swig_factory.cc index 067b91b7f..9de840146 100644 --- a/exaudfclient/base/exaudflib/impl/swig/swig_factory.cc +++ b/exaudfclient/base/exaudflib/impl/swig/swig_factory.cc @@ -1,6 +1,6 @@ -#include "base/exaudflib/impl/swig/swig_meta_data.h" -#include "base/exaudflib/impl/swig/swig_table_iterator.h" -#include "base/exaudflib/impl/swig/swig_result_handler.h" +#include "exaudflib/impl/swig/swig_meta_data.h" +#include "exaudflib/impl/swig/swig_table_iterator.h" +#include "exaudflib/impl/swig/swig_result_handler.h" extern "C" { diff --git a/exaudfclient/base/exaudflib/impl/swig/swig_general_iterator.cc b/exaudfclient/base/exaudflib/impl/swig/swig_general_iterator.cc index d5e51689e..ec1ffcf3b 100644 --- a/exaudfclient/base/exaudflib/impl/swig/swig_general_iterator.cc +++ b/exaudfclient/base/exaudflib/impl/swig/swig_general_iterator.cc @@ -1,3 +1,3 @@ //Check that swig_generial_iterator.h is self-contained -#include "base/exaudflib/impl/swig/swig_general_iterator.h" +#include "exaudflib/impl/swig/swig_general_iterator.h" diff --git a/exaudfclient/base/exaudflib/impl/swig/swig_general_iterator.h b/exaudfclient/base/exaudflib/impl/swig/swig_general_iterator.h index 7521955f9..781274c6f 100644 --- a/exaudfclient/base/exaudflib/impl/swig/swig_general_iterator.h +++ b/exaudfclient/base/exaudflib/impl/swig/swig_general_iterator.h @@ -1,8 +1,8 @@ #ifndef EXAUDFCLIENT_SWIGGENERALITERATOR_H #define EXAUDFCLIENT_SWIGGENERALITERATOR_H -#include "base/exaudflib/swig/swig_common.h" -#include "base/exaudflib/impl/global.h" +#include "exaudflib/swig/swig_common.h" +#include "exaudflib/impl/global.h" namespace SWIGVMContainers { diff --git a/exaudfclient/base/exaudflib/impl/swig/swig_meta_data.cc b/exaudfclient/base/exaudflib/impl/swig/swig_meta_data.cc index 016dbca7e..0a100b72d 100644 --- a/exaudfclient/base/exaudflib/impl/swig/swig_meta_data.cc +++ b/exaudfclient/base/exaudflib/impl/swig/swig_meta_data.cc @@ -1,3 +1,3 @@ //Check that swig_meta_data.h is self-contained -#include "base/exaudflib/impl/swig/swig_meta_data.h" +#include "exaudflib/impl/swig/swig_meta_data.h" diff --git a/exaudfclient/base/exaudflib/impl/swig/swig_meta_data.h b/exaudfclient/base/exaudflib/impl/swig/swig_meta_data.h index d666b74e0..bb0f821de 100644 --- a/exaudfclient/base/exaudflib/impl/swig/swig_meta_data.h +++ b/exaudfclient/base/exaudflib/impl/swig/swig_meta_data.h @@ -1,12 +1,12 @@ #ifndef EXAUDFCLIENT_SWIGMETADATA_H #define EXAUDFCLIENT_SWIGMETADATA_H -#include "base/exaudflib/swig/swig_common.h" -#include "base/exaudflib/swig/swig_meta_data.h" -#include "base/exaudflib/zmqcontainer.pb.h" -#include "base/exaudflib/impl/socket_low_level.h" -#include "base/exaudflib/impl/msg_conversion.h" -#include "base/exaudflib/impl/global.h" +#include "exaudflib/swig/swig_common.h" +#include "exaudflib/swig/swig_meta_data.h" +#include "exaudflib/zmqcontainer.pb.h" +#include "exaudflib/impl/socket_low_level.h" +#include "exaudflib/impl/msg_conversion.h" +#include "exaudflib/impl/global.h" #include #include #include diff --git a/exaudfclient/base/exaudflib/impl/swig/swig_result_handler.cc b/exaudfclient/base/exaudflib/impl/swig/swig_result_handler.cc index 8a16c0221..987b5e3ec 100644 --- a/exaudfclient/base/exaudflib/impl/swig/swig_result_handler.cc +++ b/exaudfclient/base/exaudflib/impl/swig/swig_result_handler.cc @@ -1,3 +1,3 @@ //Check that swig_result_handler.h is self-contained -#include "base/exaudflib/impl/swig/swig_result_handler.h" +#include "exaudflib/impl/swig/swig_result_handler.h" diff --git a/exaudfclient/base/exaudflib/impl/swig/swig_result_handler.h b/exaudfclient/base/exaudflib/impl/swig/swig_result_handler.h index 9fd2c2c85..cb143db9f 100644 --- a/exaudfclient/base/exaudflib/impl/swig/swig_result_handler.h +++ b/exaudfclient/base/exaudflib/impl/swig/swig_result_handler.h @@ -1,13 +1,13 @@ #ifndef EXAUDFCLIENT_SWIGRESULTHANDLER_H #define EXAUDFCLIENT_SWIGRESULTHANDLER_H -#include "base/exaudflib/swig/swig_common.h" -#include "base/exaudflib/swig/swig_result_handler.h" -#include "base/exaudflib/impl/swig/swig_general_iterator.h" -#include "base/exaudflib/impl/global.h" -#include "base/exaudflib/impl/msg_conversion.h" -#include "base/exaudflib/impl/socket_low_level.h" -#include "base/exaudflib/zmqcontainer.pb.h" +#include "exaudflib/swig/swig_common.h" +#include "exaudflib/swig/swig_result_handler.h" +#include "exaudflib/impl/swig/swig_general_iterator.h" +#include "exaudflib/impl/global.h" +#include "exaudflib/impl/msg_conversion.h" +#include "exaudflib/impl/socket_low_level.h" +#include "exaudflib/zmqcontainer.pb.h" namespace SWIGVMContainers { diff --git a/exaudfclient/base/exaudflib/impl/swig/swig_table_iterator.cc b/exaudfclient/base/exaudflib/impl/swig/swig_table_iterator.cc index d45ee4711..853e79e82 100644 --- a/exaudfclient/base/exaudflib/impl/swig/swig_table_iterator.cc +++ b/exaudfclient/base/exaudflib/impl/swig/swig_table_iterator.cc @@ -1,3 +1,3 @@ //Check that swig_table_iterator.h is self-contained -#include "base/exaudflib/impl/swig/swig_table_iterator.h" +#include "exaudflib/impl/swig/swig_table_iterator.h" diff --git a/exaudfclient/base/exaudflib/impl/swig/swig_table_iterator.h b/exaudfclient/base/exaudflib/impl/swig/swig_table_iterator.h index 3ebddecc9..bf5f014ba 100644 --- a/exaudfclient/base/exaudflib/impl/swig/swig_table_iterator.h +++ b/exaudfclient/base/exaudflib/impl/swig/swig_table_iterator.h @@ -1,12 +1,12 @@ #ifndef EXAUDFCLIENT_SWIGTABLEITERATOR_H #define EXAUDFCLIENT_SWIGTABLEITERATOR_H -#include "base/exaudflib/swig/swig_common.h" -#include "base/exaudflib/swig/swig_table_iterator.h" -#include "base/exaudflib/impl/swig/swig_general_iterator.h" -#include "base/exaudflib/impl/global.h" -#include "base/exaudflib/impl/socket_low_level.h" -#include "base/exaudflib/impl/msg_conversion.h" +#include "exaudflib/swig/swig_common.h" +#include "exaudflib/swig/swig_table_iterator.h" +#include "exaudflib/impl/swig/swig_general_iterator.h" +#include "exaudflib/impl/global.h" +#include "exaudflib/impl/socket_low_level.h" +#include "exaudflib/impl/msg_conversion.h" namespace SWIGVMContainers { diff --git a/exaudfclient/base/exaudflib/swig/swig_common.cc b/exaudfclient/base/exaudflib/swig/swig_common.cc index c65009b8f..ac2f69f2b 100644 --- a/exaudfclient/base/exaudflib/swig/swig_common.cc +++ b/exaudfclient/base/exaudflib/swig/swig_common.cc @@ -1,2 +1,2 @@ //Check that swig_common.h is self-contained -#include "base/exaudflib/swig/swig_common.h" \ No newline at end of file +#include "exaudflib/swig/swig_common.h" \ No newline at end of file diff --git a/exaudfclient/base/exaudflib/swig/swig_meta_data.cc b/exaudfclient/base/exaudflib/swig/swig_meta_data.cc index a85ea9ff9..1b1c6c76f 100644 --- a/exaudfclient/base/exaudflib/swig/swig_meta_data.cc +++ b/exaudfclient/base/exaudflib/swig/swig_meta_data.cc @@ -1,2 +1,2 @@ //Check that swig_meta_data.h is self-contained -#include "base/exaudflib/swig/swig_meta_data.h" \ No newline at end of file +#include "exaudflib/swig/swig_meta_data.h" \ No newline at end of file diff --git a/exaudfclient/base/exaudflib/swig/swig_meta_data.h b/exaudfclient/base/exaudflib/swig/swig_meta_data.h index f8774ae6e..2eab8f8cc 100644 --- a/exaudfclient/base/exaudflib/swig/swig_meta_data.h +++ b/exaudfclient/base/exaudflib/swig/swig_meta_data.h @@ -1,9 +1,9 @@ #ifndef SWIG_META_DATA_H #define SWIG_META_DATA_H -#include "base/exaudflib/load_dynamic.h" -#include "base/exaudflib/swig/swig_common.h" -#include "base/exaudflib/swig/script_data_transfer_objects_wrapper.h" +#include "exaudflib/load_dynamic.h" +#include "exaudflib/swig/swig_common.h" +#include "exaudflib/swig/script_data_transfer_objects_wrapper.h" namespace SWIGVMContainers { diff --git a/exaudfclient/base/exaudflib/swig/swig_result_handler.cc b/exaudfclient/base/exaudflib/swig/swig_result_handler.cc index 952b32557..72365f498 100644 --- a/exaudfclient/base/exaudflib/swig/swig_result_handler.cc +++ b/exaudfclient/base/exaudflib/swig/swig_result_handler.cc @@ -1,2 +1,2 @@ //Check that swig_result_handler.h is self-contained -#include "base/exaudflib/swig/swig_result_handler.h" \ No newline at end of file +#include "exaudflib/swig/swig_result_handler.h" \ No newline at end of file diff --git a/exaudfclient/base/exaudflib/swig/swig_result_handler.h b/exaudfclient/base/exaudflib/swig/swig_result_handler.h index 7140a59a6..546bfb25f 100644 --- a/exaudfclient/base/exaudflib/swig/swig_result_handler.h +++ b/exaudfclient/base/exaudflib/swig/swig_result_handler.h @@ -4,8 +4,8 @@ #include #include #include -#include "base/exaudflib/load_dynamic.h" -#include "base/exaudflib/swig/swig_table_iterator.h" +#include "exaudflib/load_dynamic.h" +#include "exaudflib/swig/swig_table_iterator.h" #define SWIG_MAX_VAR_DATASIZE 4000000 diff --git a/exaudfclient/base/exaudflib/swig/swig_table_iterator.cc b/exaudfclient/base/exaudflib/swig/swig_table_iterator.cc index 9bb159ca7..2e30676c0 100644 --- a/exaudfclient/base/exaudflib/swig/swig_table_iterator.cc +++ b/exaudfclient/base/exaudflib/swig/swig_table_iterator.cc @@ -1,2 +1,2 @@ //Check that swig_table_iterator.h is self-contained -#include "base/exaudflib/swig/swig_table_iterator.h" \ No newline at end of file +#include "exaudflib/swig/swig_table_iterator.h" \ No newline at end of file diff --git a/exaudfclient/base/exaudflib/swig/swig_table_iterator.h b/exaudfclient/base/exaudflib/swig/swig_table_iterator.h index 95a31cbac..89f854296 100644 --- a/exaudfclient/base/exaudflib/swig/swig_table_iterator.h +++ b/exaudfclient/base/exaudflib/swig/swig_table_iterator.h @@ -4,7 +4,7 @@ #include #include #include -#include "base/exaudflib/load_dynamic.h" +#include "exaudflib/load_dynamic.h" namespace SWIGVMContainers { diff --git a/exaudfclient/base/exaudflib/test/BUILD b/exaudfclient/base/exaudflib/test/BUILD index 51f6e75a4..1026d2564 100644 --- a/exaudfclient/base/exaudflib/test/BUILD +++ b/exaudfclient/base/exaudflib/test/BUILD @@ -2,7 +2,7 @@ cc_test( name = "exaudflib-test", srcs = ["script_data_transfer_objects_test.cpp"], deps = [ - "//base/exaudflib:script_data_transfer_objects", + "//exaudflib:script_data_transfer_objects", "@googletest//:gtest_main", ], ) \ No newline at end of file diff --git a/exaudfclient/base/exaudflib/test/script_data_transfer_objects_test.cpp b/exaudfclient/base/exaudflib/test/script_data_transfer_objects_test.cpp index 8ef9b96a4..6e146c3eb 100644 --- a/exaudfclient/base/exaudflib/test/script_data_transfer_objects_test.cpp +++ b/exaudfclient/base/exaudflib/test/script_data_transfer_objects_test.cpp @@ -1,4 +1,4 @@ -#include "base/exaudflib/swig/script_data_transfer_objects.h" +#include "exaudflib/swig/script_data_transfer_objects.h" #include using namespace ExecutionGraph; diff --git a/exaudfclient/base/exaudflib/vm/swig_vm.cc b/exaudfclient/base/exaudflib/vm/swig_vm.cc index c21533ee6..3e2d98f5a 100644 --- a/exaudfclient/base/exaudflib/vm/swig_vm.cc +++ b/exaudfclient/base/exaudflib/vm/swig_vm.cc @@ -1,2 +1,2 @@ //Check that swig_vm.h is self-contained -#include "base/exaudflib/vm/swig_vm.h" \ No newline at end of file +#include "exaudflib/vm/swig_vm.h" \ No newline at end of file diff --git a/exaudfclient/base/exaudflib/vm/swig_vm.h b/exaudfclient/base/exaudflib/vm/swig_vm.h index fcac97312..3f88c7a77 100644 --- a/exaudfclient/base/exaudflib/vm/swig_vm.h +++ b/exaudfclient/base/exaudflib/vm/swig_vm.h @@ -5,8 +5,8 @@ #include #include #include -#include "base/exaudflib/swig/swig_common.h" -#include "base/exaudflib/swig/script_data_transfer_objects_wrapper.h" +#include "exaudflib/swig/swig_common.h" +#include "exaudflib/swig/script_data_transfer_objects_wrapper.h" namespace SWIGVMContainers { diff --git a/exaudfclient/base/javacontainer/BUILD b/exaudfclient/base/javacontainer/BUILD index d63bbf5bb..b4df43976 100644 --- a/exaudfclient/base/javacontainer/BUILD +++ b/exaudfclient/base/javacontainer/BUILD @@ -5,7 +5,7 @@ genrule( cmd = """ mkdir -p java_src/com/exasol/swig mkdir -p build_exascript_java_tmp_cc/exaudflib - cp "$(location //base/exaudflib:swig/script_data_transfer_objects_wrapper.h)" "$(location //base/exaudflib:exascript.i)" build_exascript_java_tmp_cc/exaudflib + cp "$(location //exaudflib:swig/script_data_transfer_objects_wrapper.h)" "$(location //exaudflib:exascript.i)" build_exascript_java_tmp_cc/exaudflib cd build_exascript_java_tmp_cc swig -v -O -DEXTERNAL_PROCESS -Wall -c++ -java -addextern -module exascript_java -package com.exasol.swig -outdir "../java_src/com/exasol/swig" -o "../exascript_java_tmp.cc" exaudflib/exascript.i cd .. @@ -37,29 +37,29 @@ genrule( "raw/TableIterator.java", "exascript_java_tmp.cc" ], - srcs = ["//base/exaudflib:exascript.i","//base/exaudflib:swig/script_data_transfer_objects_wrapper.h"] + srcs = ["//exaudflib:exascript.i","//exaudflib:swig/script_data_transfer_objects_wrapper.h"] ) genrule( name = "exascript_java_tmp_h", cmd = """ mkdir build_exascript_java_tmp_h - cp "$(location //base/exaudflib:swig/script_data_transfer_objects_wrapper.h)" "$(location //base/exaudflib:exascript.i)" build_exascript_java_tmp_h + cp "$(location //exaudflib:swig/script_data_transfer_objects_wrapper.h)" "$(location //exaudflib:exascript.i)" build_exascript_java_tmp_h cp -r "$(location exascript_java_tmp.cc)" build_exascript_java_tmp_h cd build_exascript_java_tmp_h swig -v -DEXTERNAL_PROCESS -c++ -java -external-runtime "../$(location exascript_java_tmp.h)" """, outs = ["exascript_java_tmp.h"], - srcs = ["//base/exaudflib:exascript.i","//base/exaudflib:swig/script_data_transfer_objects_wrapper.h", ":exascript_java_tmp.cc"] + srcs = ["//exaudflib:exascript.i","//exaudflib:swig/script_data_transfer_objects_wrapper.h", ":exascript_java_tmp.cc"] ) genrule( name = "filter_swig_code_exascript_java_h", - cmd = 'python3 $(location //base:filter_swig_code.py) "$@" "$<"', + cmd = 'python3 $(location //:filter_swig_code.py) "$@" "$<"', outs = ["exascript_java.h"], srcs = [":exascript_java_tmp_h"], - tools = ["//base:filter_swig_code.py"] + tools = ["//:filter_swig_code.py"] ) genrule( @@ -71,7 +71,7 @@ genrule( cp $(location :raw/ResultHandler.java) "$$TMPDIR"/java_src/com/exasol/swig/ cp $(location :raw/exascript_javaJNI.java) "$$TMPDIR"/java_src/com/exasol/swig/ find "$$TMPDIR"/java_src/com/exasol/swig/ -name *.java -type f -exec chmod 644 {} \\; - cp -r -L $(location //base:filter_swig_code.py) $(location :exascript_java_tmp.cc) "$$TMPDIR" + cp -r -L $(location //:filter_swig_code.py) $(location :exascript_java_tmp.cc) "$$TMPDIR" (cd "$$TMPDIR" python3 filter_swig_code.py "exascript_java.cc" "exascript_java_tmp.cc") cp "$$TMPDIR"/exascript_java.cc $(location :exascript_java.cc) @@ -88,13 +88,13 @@ genrule( ], srcs = [":exascript_java_tmp.cc", ":raw/TableIterator.java", ":raw/ResultHandler.java", ":raw/exascript_javaJNI.java"], - tools = ["//base:filter_swig_code.py"] + tools = ["//:filter_swig_code.py"] ) cc_library( name = "exascript_java", srcs = [":exascript_java.cc",], - deps = ["@java//:java","//base/exaudflib:exaudflib-deps","//base/exaudflib:header"], + deps = ["@java//:java","//exaudflib:exaudflib-deps","//exaudflib:header"], copts= ["-O0","-fno-lto"], # We limit this target to -O0 (no optimization) and -fno-lto. because otherwise we get compiler warnings of the sort # note: "code may be misoptimized unless -fno-strict-aliasing is used." @@ -109,9 +109,9 @@ cc_library( srcs = [":javacontainer.cc", ":javacontainer.h", ":javacontainer_impl.cc", ":javacontainer_impl.h", ":javacontainer_builder.h", ":javacontainer_builder.cc", ":dummy"], hdrs = [":filter_swig_code_exascript_java_h", "exascript_java_jni_decl.h"], - deps = ["@java//:java", ":exascript_java", "//base/exaudflib:header", - "//base/utils:utils","//base/javacontainer/script_options:java_script_option_lines", - "//base/swig_factory:swig_factory"], + deps = ["@java//:java", ":exascript_java", "//exaudflib:header", + "//utils:utils","//javacontainer/script_options:java_script_option_lines", + "//swig_factory:swig_factory"], # copts= ["-O0","-fno-lto"], alwayslink=True, ) diff --git a/exaudfclient/base/javacontainer/javacontainer.cc b/exaudfclient/base/javacontainer/javacontainer.cc index 71795bcd1..d0e855698 100644 --- a/exaudfclient/base/javacontainer/javacontainer.cc +++ b/exaudfclient/base/javacontainer/javacontainer.cc @@ -1,6 +1,6 @@ -#include "base/javacontainer/javacontainer.h" -#include "base/javacontainer/javacontainer_impl.h" -#include "base/javacontainer/script_options/extractor.h" +#include "javacontainer/javacontainer.h" +#include "javacontainer/javacontainer_impl.h" +#include "javacontainer/script_options/extractor.h" using namespace SWIGVMContainers; using namespace std; diff --git a/exaudfclient/base/javacontainer/javacontainer.h b/exaudfclient/base/javacontainer/javacontainer.h index 60bf69ebf..fca3d3382 100644 --- a/exaudfclient/base/javacontainer/javacontainer.h +++ b/exaudfclient/base/javacontainer/javacontainer.h @@ -2,7 +2,7 @@ #define JAVACONTAINER_H -#include "base/exaudflib/vm/swig_vm.h" +#include "exaudflib/vm/swig_vm.h" #include #include diff --git a/exaudfclient/base/javacontainer/javacontainer_builder.cc b/exaudfclient/base/javacontainer/javacontainer_builder.cc index a08d787b2..f44b9ef6a 100644 --- a/exaudfclient/base/javacontainer/javacontainer_builder.cc +++ b/exaudfclient/base/javacontainer/javacontainer_builder.cc @@ -1,6 +1,6 @@ -#include "base/javacontainer/javacontainer_builder.h" -#include "base/javacontainer/script_options/extractor_impl.h" -#include "base/swig_factory/swig_factory_impl.h" +#include "javacontainer/javacontainer_builder.h" +#include "javacontainer/script_options/extractor_impl.h" +#include "swig_factory/swig_factory_impl.h" #ifdef ENABLE_JAVA_VM diff --git a/exaudfclient/base/javacontainer/javacontainer_builder.h b/exaudfclient/base/javacontainer/javacontainer_builder.h index 2e427671c..9a7113d46 100644 --- a/exaudfclient/base/javacontainer/javacontainer_builder.h +++ b/exaudfclient/base/javacontainer/javacontainer_builder.h @@ -2,7 +2,7 @@ #define JAVACONTAINER_BUILDER_H #include -#include "base/javacontainer/javacontainer.h" +#include "javacontainer/javacontainer.h" #ifdef ENABLE_JAVA_VM diff --git a/exaudfclient/base/javacontainer/javacontainer_impl.cc b/exaudfclient/base/javacontainer/javacontainer_impl.cc index 9405ddb7d..e9e922707 100644 --- a/exaudfclient/base/javacontainer/javacontainer_impl.cc +++ b/exaudfclient/base/javacontainer/javacontainer_impl.cc @@ -8,10 +8,10 @@ #include "exascript_java_jni_decl.h" -#include "base/utils/debug_message.h" -#include "base/javacontainer/javacontainer.h" -#include "base/javacontainer/javacontainer_impl.h" -#include "base/javacontainer/script_options/extractor.h" +#include "utils/debug_message.h" +#include "javacontainer/javacontainer.h" +#include "javacontainer/javacontainer_impl.h" +#include "javacontainer/script_options/extractor.h" using namespace SWIGVMContainers; @@ -29,7 +29,7 @@ JavaVMImpl::JavaVMImpl(bool checkOnly, bool noJNI, { stringstream ss; - m_exaJavaPath = "/exaudf/base/javacontainer"; // TODO hardcoded path + m_exaJavaPath = "/exaudf/external/exaudfclient_base+/javacontainer"; // TODO hardcoded path parseScriptOptions(std::move(extractor)); diff --git a/exaudfclient/base/javacontainer/javacontainer_impl.h b/exaudfclient/base/javacontainer/javacontainer_impl.h index bf060eebf..0423b2142 100644 --- a/exaudfclient/base/javacontainer/javacontainer_impl.h +++ b/exaudfclient/base/javacontainer/javacontainer_impl.h @@ -6,7 +6,7 @@ #include #include -#include "base/exaudflib/vm/swig_vm.h" +#include "exaudflib/vm/swig_vm.h" #include #ifdef ENABLE_JAVA_VM diff --git a/exaudfclient/base/javacontainer/script_options/BUILD b/exaudfclient/base/javacontainer/script_options/BUILD index 0499abc2f..01b8b728e 100644 --- a/exaudfclient/base/javacontainer/script_options/BUILD +++ b/exaudfclient/base/javacontainer/script_options/BUILD @@ -11,8 +11,8 @@ cc_library( ":keywords.h", ":keywords.cc", ":distinct_script_set.h", ":distinct_script_set.cc", ":parser_ctpg.cc", ":parser_ctpg_script_importer.cc", ":parser_ctpg_script_importer.h", ":parser_ctpg_jvm_options_parser.cc", ":parser_ctpg_jvm_options_parser.h", ":string_ops.h", ":string_ops.cc"], - deps = ["//base/script_options_parser/legacy:script_option_lines_parser_legacy", - "//base/script_options_parser/ctpg:script_option_lines_parser_ctpg", "//base/utils:utils", - "//base/exaudflib:header", "//base/exaudflib:exaudflib-deps", "//base/swig_factory:swig_factory_if", - "//base/script_options_parser:exception"], + deps = ["//script_options_parser/legacy:script_option_lines_parser_legacy", + "//script_options_parser/ctpg:script_option_lines_parser_ctpg", "//utils:utils", + "//exaudflib:header", "//exaudflib:exaudflib-deps", "//swig_factory:swig_factory_if", + "//script_options_parser:exception"], ) diff --git a/exaudfclient/base/javacontainer/script_options/converter.cc b/exaudfclient/base/javacontainer/script_options/converter.cc index 8bc84ec6b..d2f7103f6 100644 --- a/exaudfclient/base/javacontainer/script_options/converter.cc +++ b/exaudfclient/base/javacontainer/script_options/converter.cc @@ -1,4 +1,4 @@ -#include "base/javacontainer/script_options/converter.h" +#include "javacontainer/script_options/converter.h" #include diff --git a/exaudfclient/base/javacontainer/script_options/converter_legacy.cc b/exaudfclient/base/javacontainer/script_options/converter_legacy.cc index 4a613287e..ddf42765e 100644 --- a/exaudfclient/base/javacontainer/script_options/converter_legacy.cc +++ b/exaudfclient/base/javacontainer/script_options/converter_legacy.cc @@ -1,5 +1,5 @@ -#include "base/javacontainer/script_options/converter_legacy.h" -#include "base/javacontainer/script_options/string_ops.h" +#include "javacontainer/script_options/converter_legacy.h" +#include "javacontainer/script_options/string_ops.h" #include #include #include diff --git a/exaudfclient/base/javacontainer/script_options/converter_legacy.h b/exaudfclient/base/javacontainer/script_options/converter_legacy.h index f2e594c32..6fb8abd73 100644 --- a/exaudfclient/base/javacontainer/script_options/converter_legacy.h +++ b/exaudfclient/base/javacontainer/script_options/converter_legacy.h @@ -6,7 +6,7 @@ #include #include -#include "base/javacontainer/script_options/converter.h" +#include "javacontainer/script_options/converter.h" diff --git a/exaudfclient/base/javacontainer/script_options/converter_v2.cc b/exaudfclient/base/javacontainer/script_options/converter_v2.cc index 57ffb1fe9..9f279f489 100644 --- a/exaudfclient/base/javacontainer/script_options/converter_v2.cc +++ b/exaudfclient/base/javacontainer/script_options/converter_v2.cc @@ -1,6 +1,6 @@ -#include "base/javacontainer/script_options/converter_v2.h" -#include "base/javacontainer/script_options/string_ops.h" -#include "base/javacontainer/script_options/parser_ctpg_jvm_options_parser.h" +#include "javacontainer/script_options/converter_v2.h" +#include "javacontainer/script_options/string_ops.h" +#include "javacontainer/script_options/parser_ctpg_jvm_options_parser.h" #include #include #include diff --git a/exaudfclient/base/javacontainer/script_options/converter_v2.h b/exaudfclient/base/javacontainer/script_options/converter_v2.h index 921e37837..8807d904a 100644 --- a/exaudfclient/base/javacontainer/script_options/converter_v2.h +++ b/exaudfclient/base/javacontainer/script_options/converter_v2.h @@ -5,7 +5,7 @@ #include #include -#include "base/javacontainer/script_options/converter.h" +#include "javacontainer/script_options/converter.h" diff --git a/exaudfclient/base/javacontainer/script_options/distinct_script_set.cc b/exaudfclient/base/javacontainer/script_options/distinct_script_set.cc index c78b6f749..34898ecba 100644 --- a/exaudfclient/base/javacontainer/script_options/distinct_script_set.cc +++ b/exaudfclient/base/javacontainer/script_options/distinct_script_set.cc @@ -1,4 +1,4 @@ -#include "base/javacontainer/script_options/distinct_script_set.h" +#include "javacontainer/script_options/distinct_script_set.h" #include namespace SWIGVMContainers { diff --git a/exaudfclient/base/javacontainer/script_options/extractor_impl.cc b/exaudfclient/base/javacontainer/script_options/extractor_impl.cc index d5273aa69..b156d446c 100644 --- a/exaudfclient/base/javacontainer/script_options/extractor_impl.cc +++ b/exaudfclient/base/javacontainer/script_options/extractor_impl.cc @@ -1,7 +1,7 @@ -#include "base/javacontainer/script_options/extractor_impl.h" -#include "base/javacontainer/script_options/parser.h" +#include "javacontainer/script_options/extractor_impl.h" +#include "javacontainer/script_options/parser.h" -#include "base/utils/debug_message.h" +#include "utils/debug_message.h" #include #define EXTR_DBG_FUNC_CALL(f) DBG_FUNC_CALL(std::cerr, f) diff --git a/exaudfclient/base/javacontainer/script_options/extractor_impl.h b/exaudfclient/base/javacontainer/script_options/extractor_impl.h index ef7520c3e..e65fe5a35 100644 --- a/exaudfclient/base/javacontainer/script_options/extractor_impl.h +++ b/exaudfclient/base/javacontainer/script_options/extractor_impl.h @@ -6,12 +6,12 @@ #include -#include "base/javacontainer/script_options/extractor.h" -#include "base/javacontainer/script_options/converter_legacy.h" -#include "base/javacontainer/script_options/converter_v2.h" -#include "base/javacontainer/script_options/parser_ctpg.h" -#include "base/javacontainer/script_options/parser_legacy.h" -#include "base/swig_factory/swig_factory.h" +#include "javacontainer/script_options/extractor.h" +#include "javacontainer/script_options/converter_legacy.h" +#include "javacontainer/script_options/converter_v2.h" +#include "javacontainer/script_options/parser_ctpg.h" +#include "javacontainer/script_options/parser_legacy.h" +#include "swig_factory/swig_factory.h" namespace SWIGVMContainers { diff --git a/exaudfclient/base/javacontainer/script_options/keywords.cc b/exaudfclient/base/javacontainer/script_options/keywords.cc index 9d89bf384..4ac2affd2 100644 --- a/exaudfclient/base/javacontainer/script_options/keywords.cc +++ b/exaudfclient/base/javacontainer/script_options/keywords.cc @@ -1,4 +1,4 @@ -#include "base/javacontainer/script_options/keywords.h" +#include "javacontainer/script_options/keywords.h" #include namespace SWIGVMContainers { diff --git a/exaudfclient/base/javacontainer/script_options/parser_ctpg.cc b/exaudfclient/base/javacontainer/script_options/parser_ctpg.cc index e77ac8ebf..6209a78d2 100644 --- a/exaudfclient/base/javacontainer/script_options/parser_ctpg.cc +++ b/exaudfclient/base/javacontainer/script_options/parser_ctpg.cc @@ -1,9 +1,9 @@ -#include "base/javacontainer/script_options/parser_ctpg.h" -#include "base/javacontainer/script_options/parser_ctpg_script_importer.h" -#include "base/utils/exceptions.h" -#include "base/script_options_parser/exception.h" -#include "base/swig_factory/swig_factory.h" -#include "base/javacontainer/script_options/string_ops.h" +#include "javacontainer/script_options/parser_ctpg.h" +#include "javacontainer/script_options/parser_ctpg_script_importer.h" +#include "utils/exceptions.h" +#include "script_options_parser/exception.h" +#include "swig_factory/swig_factory.h" +#include "javacontainer/script_options/string_ops.h" #include #include diff --git a/exaudfclient/base/javacontainer/script_options/parser_ctpg.h b/exaudfclient/base/javacontainer/script_options/parser_ctpg.h index 0f76663a9..1f7bad8dd 100644 --- a/exaudfclient/base/javacontainer/script_options/parser_ctpg.h +++ b/exaudfclient/base/javacontainer/script_options/parser_ctpg.h @@ -1,9 +1,9 @@ #ifndef SCRIPTOPTIONLINEPARSERCTPGY_H #define SCRIPTOPTIONLINEPARSERCTPGY_H 1 -#include "base/javacontainer/script_options/parser.h" -#include "base/javacontainer/script_options/keywords.h" -#include "base/script_options_parser/ctpg/script_option_lines_ctpg.h" +#include "javacontainer/script_options/parser.h" +#include "javacontainer/script_options/keywords.h" +#include "script_options_parser/ctpg/script_option_lines_ctpg.h" #include namespace SWIGVMContainers { diff --git a/exaudfclient/base/javacontainer/script_options/parser_ctpg_jvm_options_parser.cc b/exaudfclient/base/javacontainer/script_options/parser_ctpg_jvm_options_parser.cc index d4bdc3957..826af385a 100644 --- a/exaudfclient/base/javacontainer/script_options/parser_ctpg_jvm_options_parser.cc +++ b/exaudfclient/base/javacontainer/script_options/parser_ctpg_jvm_options_parser.cc @@ -1,5 +1,5 @@ -#include "base/javacontainer/script_options/parser_ctpg_jvm_options_parser.h" -#include "base/script_options_parser/ctpg/ctpg.hpp" +#include "javacontainer/script_options/parser_ctpg_jvm_options_parser.h" +#include "script_options_parser/ctpg/ctpg.hpp" #include using namespace exaudf_ctpg; diff --git a/exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.cc b/exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.cc index 223cf6b84..d5daeba2f 100644 --- a/exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.cc +++ b/exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.cc @@ -1,9 +1,9 @@ -#include "base/javacontainer/script_options/parser_ctpg_script_importer.h" -#include "base/swig_factory/swig_factory.h" -#include "base/utils/debug_message.h" -#include "base/utils/exceptions.h" -#include "base/script_options_parser/exception.h" -#include "base/javacontainer/script_options/string_ops.h" +#include "javacontainer/script_options/parser_ctpg_script_importer.h" +#include "swig_factory/swig_factory.h" +#include "utils/debug_message.h" +#include "utils/exceptions.h" +#include "script_options_parser/exception.h" +#include "javacontainer/script_options/string_ops.h" #include #include diff --git a/exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.h b/exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.h index 0813ca181..284a40646 100644 --- a/exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.h +++ b/exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.h @@ -1,10 +1,10 @@ #ifndef SCRIPTOPTIONLINEPARSERCTPGSCRIPTIMPORTER_H #define SCRIPTOPTIONLINEPARSERCTPGSCRIPTIMPORTER_H 1 -#include "base/javacontainer/script_options/distinct_script_set.h" -#include "base/javacontainer/script_options/keywords.h" -#include "base/exaudflib/swig/swig_meta_data.h" -#include "base/script_options_parser/ctpg/script_option_lines_ctpg.h" +#include "javacontainer/script_options/distinct_script_set.h" +#include "javacontainer/script_options/keywords.h" +#include "exaudflib/swig/swig_meta_data.h" +#include "script_options_parser/ctpg/script_option_lines_ctpg.h" #include diff --git a/exaudfclient/base/javacontainer/script_options/parser_legacy.cc b/exaudfclient/base/javacontainer/script_options/parser_legacy.cc index 85451ef20..3da5b93e9 100644 --- a/exaudfclient/base/javacontainer/script_options/parser_legacy.cc +++ b/exaudfclient/base/javacontainer/script_options/parser_legacy.cc @@ -1,10 +1,10 @@ -#include "base/javacontainer/script_options/parser_legacy.h" -#include "base/javacontainer/script_options/distinct_script_set.h" -#include "base/script_options_parser/legacy/script_option_lines.h" -#include "base/exaudflib/swig/swig_meta_data.h" -#include "base/swig_factory/swig_factory.h" -#include "base/utils/exceptions.h" -#include "base/script_options_parser/exception.h" +#include "javacontainer/script_options/parser_legacy.h" +#include "javacontainer/script_options/distinct_script_set.h" +#include "script_options_parser/legacy/script_option_lines.h" +#include "exaudflib/swig/swig_meta_data.h" +#include "swig_factory/swig_factory.h" +#include "utils/exceptions.h" +#include "script_options_parser/exception.h" #include diff --git a/exaudfclient/base/javacontainer/script_options/parser_legacy.h b/exaudfclient/base/javacontainer/script_options/parser_legacy.h index 447ca394d..6159cffa3 100644 --- a/exaudfclient/base/javacontainer/script_options/parser_legacy.h +++ b/exaudfclient/base/javacontainer/script_options/parser_legacy.h @@ -2,8 +2,8 @@ #define SCRIPTOPTIONLINEPARSERLEGACY_H 1 -#include "base/javacontainer/script_options/parser.h" -#include "base/javacontainer/script_options/keywords.h" +#include "javacontainer/script_options/parser.h" +#include "javacontainer/script_options/keywords.h" #include diff --git a/exaudfclient/base/javacontainer/script_options/string_ops.cc b/exaudfclient/base/javacontainer/script_options/string_ops.cc index 4f7f7f301..d6d6d89d0 100644 --- a/exaudfclient/base/javacontainer/script_options/string_ops.cc +++ b/exaudfclient/base/javacontainer/script_options/string_ops.cc @@ -1,4 +1,4 @@ -#include "base/javacontainer/script_options/string_ops.h" +#include "javacontainer/script_options/string_ops.h" #include #include #include diff --git a/exaudfclient/base/javacontainer/script_options/test/BUILD b/exaudfclient/base/javacontainer/script_options/test/BUILD index 92a6bf0df..76f9bf69a 100644 --- a/exaudfclient/base/javacontainer/script_options/test/BUILD +++ b/exaudfclient/base/javacontainer/script_options/test/BUILD @@ -4,7 +4,7 @@ cc_test( srcs = ["ctpg_script_importer_test.cc", "swig_factory_test.cc", "swig_factory_test.h", "string_ops_tests.cc", "converter_test.cc"], deps = [ - "//base/javacontainer/script_options:java_script_option_lines", + "//javacontainer/script_options:java_script_option_lines", "@googletest//:gtest_main", ], ) diff --git a/exaudfclient/base/javacontainer/script_options/test/converter_test.cc b/exaudfclient/base/javacontainer/script_options/test/converter_test.cc index bc0879f1b..ba640e7f1 100644 --- a/exaudfclient/base/javacontainer/script_options/test/converter_test.cc +++ b/exaudfclient/base/javacontainer/script_options/test/converter_test.cc @@ -1,8 +1,8 @@ #include "include/gtest/gtest.h" #include "gmock/gmock.h" -#include "base/javacontainer/script_options/converter_legacy.h" -#include "base/javacontainer/script_options/converter_v2.h" +#include "javacontainer/script_options/converter_legacy.h" +#include "javacontainer/script_options/converter_v2.h" using namespace SWIGVMContainers::JavaScriptOptions; diff --git a/exaudfclient/base/javacontainer/script_options/test/ctpg_script_importer_test.cc b/exaudfclient/base/javacontainer/script_options/test/ctpg_script_importer_test.cc index eb34a9615..1efbadc9c 100644 --- a/exaudfclient/base/javacontainer/script_options/test/ctpg_script_importer_test.cc +++ b/exaudfclient/base/javacontainer/script_options/test/ctpg_script_importer_test.cc @@ -1,9 +1,9 @@ #include "include/gtest/gtest.h" #include "gmock/gmock.h" -#include "base/javacontainer/script_options/parser_ctpg.h" +#include "javacontainer/script_options/parser_ctpg.h" -#include "base/javacontainer/script_options/test/swig_factory_test.h" +#include "javacontainer/script_options/test/swig_factory_test.h" #include using namespace SWIGVMContainers::JavaScriptOptions; diff --git a/exaudfclient/base/javacontainer/script_options/test/string_ops_tests.cc b/exaudfclient/base/javacontainer/script_options/test/string_ops_tests.cc index dd6475698..9615212ef 100644 --- a/exaudfclient/base/javacontainer/script_options/test/string_ops_tests.cc +++ b/exaudfclient/base/javacontainer/script_options/test/string_ops_tests.cc @@ -1,7 +1,7 @@ #include "include/gtest/gtest.h" #include "gmock/gmock.h" -#include "base/javacontainer/script_options/string_ops.h" +#include "javacontainer/script_options/string_ops.h" using namespace SWIGVMContainers::JavaScriptOptions; diff --git a/exaudfclient/base/javacontainer/script_options/test/swig_factory_test.cc b/exaudfclient/base/javacontainer/script_options/test/swig_factory_test.cc index 8744d4217..adca66553 100644 --- a/exaudfclient/base/javacontainer/script_options/test/swig_factory_test.cc +++ b/exaudfclient/base/javacontainer/script_options/test/swig_factory_test.cc @@ -1,5 +1,5 @@ -#include "base/javacontainer/script_options/test/swig_factory_test.h" -#include "base/exaudflib/swig/swig_meta_data.h" +#include "javacontainer/script_options/test/swig_factory_test.h" +#include "exaudflib/swig/swig_meta_data.h" #include diff --git a/exaudfclient/base/javacontainer/script_options/test/swig_factory_test.h b/exaudfclient/base/javacontainer/script_options/test/swig_factory_test.h index f5fa95555..b98f14473 100644 --- a/exaudfclient/base/javacontainer/script_options/test/swig_factory_test.h +++ b/exaudfclient/base/javacontainer/script_options/test/swig_factory_test.h @@ -3,7 +3,7 @@ #include #include -#include "base/swig_factory/swig_factory.h" +#include "swig_factory/swig_factory.h" #include struct SwigFactoryTestImpl : public SWIGVMContainers::SwigFactory { diff --git a/exaudfclient/base/javacontainer/test/BUILD b/exaudfclient/base/javacontainer/test/BUILD index a3ff25cc7..69ff84f08 100644 --- a/exaudfclient/base/javacontainer/test/BUILD +++ b/exaudfclient/base/javacontainer/test/BUILD @@ -1,6 +1,6 @@ java_library( name = "ExaStackTraceCleaner", - srcs = ["//base/javacontainer:ExaStackTraceCleaner.java"] + srcs = ["//javacontainer:ExaStackTraceCleaner.java"] ) java_test( @@ -20,7 +20,7 @@ cc_test( name = "javacontainer-test-extractor-legacy", srcs = JAVACONTAINER_TEST_SRCS, deps = [ - "//base/javacontainer:javacontainer", + "//javacontainer:javacontainer", "@googletest//:gtest_main", ], data = ["test.jar", "other_test.jar"] @@ -30,7 +30,7 @@ cc_test( name = "javacontainer-test-extractor-v2", srcs = JAVACONTAINER_TEST_SRCS + ["cpp/javacontainer_extractor_v2_test.cc"], deps = [ - "//base/javacontainer:javacontainer", + "//javacontainer:javacontainer", "@googletest//:gtest_main", ], defines = ["USE_EXTRACTOR_V2"], @@ -42,7 +42,7 @@ cc_test( name = "javacontainer-perf-test-legacy-parser", srcs = JAVACONTAINER_PERF_TEST_SRCS, deps = [ - "//base/javacontainer:javacontainer", + "//javacontainer:javacontainer", "@googletest//:gtest_main", ], data = ["test.jar", "other_test.jar"] @@ -52,7 +52,7 @@ cc_test( name = "javacontainer-perf-test-ctpg-parser", srcs = JAVACONTAINER_PERF_TEST_SRCS, deps = [ - "//base/javacontainer:javacontainer", + "//javacontainer:javacontainer", "@googletest//:gtest_main", ], defines = ["USE_EXTRACTOR_V2"], diff --git a/exaudfclient/base/javacontainer/test/cpp/exaudf_wrapper.cc b/exaudfclient/base/javacontainer/test/cpp/exaudf_wrapper.cc index 7222716bc..274c19b7b 100644 --- a/exaudfclient/base/javacontainer/test/cpp/exaudf_wrapper.cc +++ b/exaudfclient/base/javacontainer/test/cpp/exaudf_wrapper.cc @@ -1,4 +1,4 @@ -#include "base/exaudflib/swig/swig_common.h" +#include "exaudflib/swig/swig_common.h" //Dummy implementation to calm down the linker void* load_dynamic(const char* name) { diff --git a/exaudfclient/base/javacontainer/test/cpp/javacontainer_extractor_v2_test.cc b/exaudfclient/base/javacontainer/test/cpp/javacontainer_extractor_v2_test.cc index aad3fbc67..3f5308ec9 100644 --- a/exaudfclient/base/javacontainer/test/cpp/javacontainer_extractor_v2_test.cc +++ b/exaudfclient/base/javacontainer/test/cpp/javacontainer_extractor_v2_test.cc @@ -1,9 +1,9 @@ #include "include/gtest/gtest.h" #include "gmock/gmock.h" -#include "base/javacontainer/test/cpp/javavm_test.h" -#include "base/javacontainer/test/cpp/swig_factory_test.h" -#include "base/javacontainer/javacontainer.h" +#include "javacontainer/test/cpp/javavm_test.h" +#include "javacontainer/test/cpp/swig_factory_test.h" +#include "javacontainer/javacontainer.h" #include #include @@ -21,7 +21,7 @@ const std::pair option_value = GetParam(); " }\n" "}\n"; JavaVMTest vm(script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/base/javacontainer"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp"); const std::string expected_script_code = "package com.exasol;\r\n\n\n" @@ -30,13 +30,13 @@ const std::pair option_value = GetParam(); "\tctx.emit(\"Success!\");\n" " }\n}\n"; EXPECT_EQ(expected_script_code, vm.getJavaVMInternalStatus().m_scriptCode); - EXPECT_EQ("/exaudf/base/javacontainer/exaudf_deploy.jar", vm.getJavaVMInternalStatus().m_exaJarPath); - EXPECT_EQ("/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar", vm.getJavaVMInternalStatus().m_classpath); + EXPECT_EQ("/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar", vm.getJavaVMInternalStatus().m_exaJarPath); + EXPECT_EQ("/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar", vm.getJavaVMInternalStatus().m_classpath); EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation); const std::vector expectedJVMOptions = { option_value.second, "-Xms128m", "-Xmx128m", "-Xss512k", "-XX:ErrorFile=/tmp/hs_err_pid%p.log", - "-Djava.class.path=/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar", + "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar", "-XX:+UseSerialGC" }; EXPECT_EQ(expectedJVMOptions, vm.getJavaVMInternalStatus().m_jvmOptions); } @@ -75,7 +75,7 @@ TEST(JavaContainer, import_script_with_escaped_options) { "%import other_script;\n\n" "%jvmoption -Dsomeoption=\"ABC\";\n\n" "%scriptclass com.exasol.udf_profiling.UdfProfiler;\n" - "%jar base/javacontainer/test/test.jar;" + "%jar javacontainer/test/test.jar;" "class JVMOPTION_TEST {\n" "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n" " ctx.emit(\"Success!\");\n" @@ -85,14 +85,14 @@ TEST(JavaContainer, import_script_with_escaped_options) { const std::string other_script_code = "%jvmoption -Dsomeotheroption=\"DE\\nF\";\n\n" - "%jar base/javacontainer/test/other_test.jar;" + "%jar javacontainer/test/other_test.jar;" "class OtherClass {\n" "static void doSomething() {\n\n" " }\n" "}\n"; swigFactory->addModule("other_script", other_script_code); JavaVMTest vm(script_code, std::move(swigFactory)); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/base/javacontainer"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp"); const std::string expected_script_code = "package com.exasol;\r\n\n\n" @@ -105,20 +105,20 @@ TEST(JavaContainer, import_script_with_escaped_options) { "\tctx.emit(\"Success!\");\n" " }\n}\n"; EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/base/javacontainer/exaudf_deploy.jar"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar:base/javacontainer/test/other_test.jar:base/javacontainer/test/test.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/other_test.jar:javacontainer/test/test.jar"); EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation); const std::vector expectedJVMOptions = { "-Dexasol.scriptclass=com.exasol.udf_profiling.UdfProfiler", "-Dsomeotheroption=\"DE\nF\"", "-Dsomeoption=\"ABC\"", "-Xms128m", "-Xmx128m", "-Xss512k", "-XX:ErrorFile=/tmp/hs_err_pid%p.log", - "-Djava.class.path=/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar:base/javacontainer/test/other_test.jar:base/javacontainer/test/test.jar", + "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/other_test.jar:javacontainer/test/test.jar", "-XX:+UseSerialGC" }; EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions); } TEST(JavaContainer, basic_jar_with_trailing_escape) { const std::string script_code = "%scriptclass com.exasol.udf_profiling.UdfProfiler;\n" - "%jar base/javacontainer/test/test.jar\\t\t;"; + "%jar javacontainer/test/test.jar\\t\t;"; EXPECT_THROW({ try { @@ -126,7 +126,7 @@ TEST(JavaContainer, basic_jar_with_trailing_escape) { } catch( const SWIGVMContainers::JavaVMach::exception& e ) { - EXPECT_THAT( e.what(), MatchesRegex("^.*Java VM cannot find 'base/javacontainer/test/test\\.jar\t': No such file or directory$")); + EXPECT_THAT( e.what(), MatchesRegex("^.*Java VM cannot find 'javacontainer/test/test\\.jar\t': No such file or directory$")); throw; } }, SWIGVMContainers::JavaVMach::exception ); diff --git a/exaudfclient/base/javacontainer/test/cpp/javacontainer_perf_test.cc b/exaudfclient/base/javacontainer/test/cpp/javacontainer_perf_test.cc index bdc5f418d..b11624158 100644 --- a/exaudfclient/base/javacontainer/test/cpp/javacontainer_perf_test.cc +++ b/exaudfclient/base/javacontainer/test/cpp/javacontainer_perf_test.cc @@ -1,7 +1,7 @@ #include "include/gtest/gtest.h" #include "gmock/gmock.h" -#include "base/javacontainer/test/cpp/javavm_test.h" -#include "base/javacontainer/test/cpp/swig_factory_test.h" +#include "javacontainer/test/cpp/javavm_test.h" +#include "javacontainer/test/cpp/swig_factory_test.h" #include const uint32_t NumInlineJavaLines = 500000; diff --git a/exaudfclient/base/javacontainer/test/cpp/javacontainer_test.cc b/exaudfclient/base/javacontainer/test/cpp/javacontainer_test.cc index ed916c8f3..aad470e47 100644 --- a/exaudfclient/base/javacontainer/test/cpp/javacontainer_test.cc +++ b/exaudfclient/base/javacontainer/test/cpp/javacontainer_test.cc @@ -1,9 +1,9 @@ #include "include/gtest/gtest.h" #include "gmock/gmock.h" -#include "base/javacontainer/test/cpp/javavm_test.h" -#include "base/javacontainer/javacontainer.h" -#include "base/javacontainer/test/cpp/swig_factory_test.h" +#include "javacontainer/test/cpp/javavm_test.h" +#include "javacontainer/javacontainer.h" +#include "javacontainer/test/cpp/swig_factory_test.h" #include using ::testing::MatchesRegex; @@ -11,46 +11,46 @@ using ::testing::MatchesRegex; TEST(JavaContainer, basic_jar) { const std::string script_code = "%scriptclass com.exasol.udf_profiling.UdfProfiler;\n" - "%jar base/javacontainer/test/test.jar;"; + "%jar javacontainer/test/test.jar;"; JavaVMTest vm(script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/base/javacontainer"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, "\n"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/base/javacontainer/exaudf_deploy.jar"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/exaudf/base/javacontainer/exaudf_deploy.jar:base/javacontainer/test/test.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/test.jar"); EXPECT_FALSE(vm.getJavaVMInternalStatus().m_needsCompilation); const std::vector expectedJVMOptions = { "-Dexasol.scriptclass=com.exasol.udf_profiling.UdfProfiler", "-Xms128m", "-Xmx128m", "-Xss512k", "-XX:ErrorFile=/tmp/hs_err_pid%p.log", - "-Djava.class.path=/exaudf/base/javacontainer/exaudf_deploy.jar:base/javacontainer/test/test.jar", + "-Djava.class.path=/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/test.jar", "-XX:+UseSerialGC" }; EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions); } TEST(JavaContainer, basic_jar_script_class_with_white_spaces) { const std::string script_code = "%scriptclass com.exasol.udf_profiling.UdfProfiler\t ;\n" - "%jar base/javacontainer/test/test.jar;"; + "%jar javacontainer/test/test.jar;"; JavaVMTest vm(script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/base/javacontainer"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, "\n"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/base/javacontainer/exaudf_deploy.jar"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/exaudf/base/javacontainer/exaudf_deploy.jar:base/javacontainer/test/test.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/test.jar"); EXPECT_FALSE(vm.getJavaVMInternalStatus().m_needsCompilation); const std::vector expectedJVMOptions = { "-Dexasol.scriptclass=com.exasol.udf_profiling.UdfProfiler", "-Xms128m", "-Xmx128m", "-Xss512k", "-XX:ErrorFile=/tmp/hs_err_pid%p.log", - "-Djava.class.path=/exaudf/base/javacontainer/exaudf_deploy.jar:base/javacontainer/test/test.jar", + "-Djava.class.path=/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/test.jar", "-XX:+UseSerialGC" }; EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions); } TEST(JavaContainer, basic_jar_with_white_spaces) { - const std::string script_code = "%jar base/javacontainer/test/test.jar \t ;"; + const std::string script_code = "%jar javacontainer/test/test.jar \t ;"; JavaVMTest vm(script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/exaudf/base/javacontainer/exaudf_deploy.jar:base/javacontainer/test/test.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/test.jar"); } TEST(JavaContainer, basic_jars_ordering) { @@ -63,12 +63,12 @@ TEST(JavaContainer, basic_jars_ordering) { * For extractor V2: Our assumption is that the exception will be for `base/javacontainer/test/test1.jar` * as this is the first JAR file. (no re-ordering) */ - const std::string script_code = "%jar base/javacontainer/test/test1.jar:base/javacontainer/test/abc.jar;"; + const std::string script_code = "%jar javacontainer/test/test1.jar:javacontainer/test/abc.jar;"; #ifndef USE_EXTRACTOR_V2 - const char* regexExpectedException = "^.*Java VM cannot find 'base/javacontainer/test/abc\\.jar': No such file or directory$"; + const char* regexExpectedException = "^.*Java VM cannot find 'javacontainer/test/abc\\.jar': No such file or directory$"; #else - const char* regexExpectedException = "^.*Java VM cannot find 'base/javacontainer/test/test1\\.jar': No such file or directory$"; + const char* regexExpectedException = "^.*Java VM cannot find 'javacontainer/test/test1\\.jar': No such file or directory$"; #endif EXPECT_THROW({ try @@ -96,16 +96,16 @@ TEST(JavaContainer, basic_inline) { "}" "}"; JavaVMTest vm(script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/base/javacontainer"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp"); const std::string expected_script_code = std::string("package com.exasol;\r\n") + script_code; EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/base/javacontainer/exaudf_deploy.jar"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation); const std::vector expectedJVMOptions = { "-Xms128m", "-Xmx128m", "-Xss512k", "-XX:ErrorFile=/tmp/hs_err_pid%p.log", - "-Djava.class.path=/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar", + "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar", "-XX:+UseSerialGC" }; EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions); } @@ -124,18 +124,18 @@ TEST(JavaContainer, combined_inline_jar) { "return 0;" "}" "}"; - const std::string script_code_with_jar = std::string("%jar base/javacontainer/test/test.jar;") + script_code; + const std::string script_code_with_jar = std::string("%jar javacontainer/test/test.jar;") + script_code; JavaVMTest vm(script_code_with_jar); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/base/javacontainer"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp"); const std::string expected_script_code = std::string("package com.exasol;\r\n") + script_code; EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/base/javacontainer/exaudf_deploy.jar"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar:base/javacontainer/test/test.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/test.jar"); EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation); const std::vector expectedJVMOptions = { "-Xms128m", "-Xmx128m", "-Xss512k", "-XX:ErrorFile=/tmp/hs_err_pid%p.log", - "-Djava.class.path=/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar:base/javacontainer/test/test.jar", + "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/test.jar", "-XX:+UseSerialGC" }; EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions); } @@ -150,7 +150,7 @@ TEST(JavaContainer, quoted_jvm_option) { " }\n" "}\n"; JavaVMTest vm(script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/base/javacontainer"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp"); const std::string expected_script_code = "package com.exasol;\r\n\n\n" @@ -159,8 +159,8 @@ TEST(JavaContainer, quoted_jvm_option) { "\tctx.emit(\"Success!\");\n" " }\n}\n"; EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/base/javacontainer/exaudf_deploy.jar"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation); /* * Note: The option "DEF" is wrong and causes UDF's to crash! @@ -168,7 +168,7 @@ TEST(JavaContainer, quoted_jvm_option) { */ const std::vector expectedJVMOptions = { "-Dhttp.agent=\"ABC", "DEF\"", "-Xms128m", "-Xmx128m", "-Xss512k", "-XX:ErrorFile=/tmp/hs_err_pid%p.log", - "-Djava.class.path=/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar", + "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar", "-XX:+UseSerialGC" }; EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions); } @@ -191,7 +191,7 @@ TEST(JavaContainer, simple_import_script) { "}\n"; swigFactory->addModule("other_script", other_script_code); JavaVMTest vm(script_code, std::move(swigFactory)); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/base/javacontainer"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp"); const std::string expected_script_code = "package com.exasol;\r\n" @@ -204,12 +204,12 @@ TEST(JavaContainer, simple_import_script) { "\tctx.emit(\"Success!\");\n" " }\n}\n"; EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/base/javacontainer/exaudf_deploy.jar"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation); const std::vector expectedJVMOptions = { "-Dhttp.agent=\"ABC\"", "-Xms128m", "-Xmx128m", "-Xss512k", "-XX:ErrorFile=/tmp/hs_err_pid%p.log", - "-Djava.class.path=/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar", + "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar", "-XX:+UseSerialGC" }; EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions); } @@ -232,7 +232,7 @@ TEST(JavaContainer, simple_import_script_with_white_space) { "}\n"; swigFactory->addModule("other_script", other_script_code); JavaVMTest vm(script_code, std::move(swigFactory)); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/base/javacontainer"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp"); const std::string expected_script_code = "package com.exasol;\r\n" @@ -245,12 +245,12 @@ TEST(JavaContainer, simple_import_script_with_white_space) { "\tctx.emit(\"Success!\");\n" " }\n}\n"; EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/base/javacontainer/exaudf_deploy.jar"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation); const std::vector expectedJVMOptions = { "-Dhttp.agent=\"ABC\"", "-Xms128m", "-Xmx128m", "-Xss512k", "-XX:ErrorFile=/tmp/hs_err_pid%p.log", - "-Djava.class.path=/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar", + "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar", "-XX:+UseSerialGC" }; EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions); } @@ -273,7 +273,7 @@ TEST(JavaContainer, simple_import_script_with_quotes) { "}\n"; swigFactory->addModule("\"other_script\t \"", other_script_code); JavaVMTest vm(script_code, std::move(swigFactory)); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/base/javacontainer"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp"); const std::string expected_script_code = "package com.exasol;\r\n" @@ -286,12 +286,12 @@ TEST(JavaContainer, simple_import_script_with_quotes) { "\tctx.emit(\"Success!\");\n" " }\n}\n"; EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/base/javacontainer/exaudf_deploy.jar"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation); const std::vector expectedJVMOptions = { "-Dhttp.agent=\"ABC\"", "-Xms128m", "-Xmx128m", "-Xss512k", "-XX:ErrorFile=/tmp/hs_err_pid%p.log", - "-Djava.class.path=/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar", + "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar", "-XX:+UseSerialGC" }; EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions); } @@ -315,7 +315,7 @@ TEST(JavaContainer, import_script_with_recursion) { "}\n"; swigFactory->addModule("other_script", other_script_code); JavaVMTest vm(script_code, std::move(swigFactory)); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/base/javacontainer"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp"); const std::string expected_script_code = "package com.exasol;\r\n\n\n" @@ -328,12 +328,12 @@ TEST(JavaContainer, import_script_with_recursion) { "\tctx.emit(\"Success!\");\n" " }\n}\n"; EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/base/javacontainer/exaudf_deploy.jar"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation); const std::vector expectedJVMOptions = { "-Dhttp.agent=\"ABC\"", "-Xms128m", "-Xmx128m", "-Xss512k", "-XX:ErrorFile=/tmp/hs_err_pid%p.log", - "-Djava.class.path=/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar", + "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar", "-XX:+UseSerialGC" }; EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions); } @@ -356,7 +356,7 @@ TEST(JavaContainer, import_script_with_jvmoption) { "}\n"; swigFactory->addModule("other_script", other_script_code); JavaVMTest vm(script_code, std::move(swigFactory)); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/base/javacontainer"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp"); const std::string expected_script_code = "package com.exasol;\r\n\n\n" @@ -369,12 +369,12 @@ TEST(JavaContainer, import_script_with_jvmoption) { "\tctx.emit(\"Success!\");\n" " }\n}\n"; EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/base/javacontainer/exaudf_deploy.jar"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation); const std::vector expectedJVMOptions = { "-Dhttp.agent=\"ABC\"", "-Xms128m", "-Xmx128m", "-Xss512k", "-XX:ErrorFile=/tmp/hs_err_pid%p.log", - "-Djava.class.path=/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar", + "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar", "-XX:+UseSerialGC" }; EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions); } @@ -411,7 +411,7 @@ TEST(JavaContainer, multiple_import_scripts) { swigFactory->addModule("other_script_B", other_scipt_code_B); swigFactory->addModule("other_script_C", other_scipt_code_C); JavaVMTest vm(script_code, std::move(swigFactory)); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/base/javacontainer"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp"); const std::string expected_script_code = "package com.exasol;\r\n" @@ -432,12 +432,12 @@ TEST(JavaContainer, multiple_import_scripts) { "\tctx.emit(\"Success!\");\n" " }\n}\n"; EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/base/javacontainer/exaudf_deploy.jar"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation); const std::vector expectedJVMOptions = { "-Xms128m", "-Xmx128m", "-Xss512k", "-XX:ErrorFile=/tmp/hs_err_pid%p.log", - "-Djava.class.path=/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar", + "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar", "-XX:+UseSerialGC" }; EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions); } @@ -447,7 +447,7 @@ TEST(JavaContainer, import_script_with_mixed_options) { "%import other_script;\n\n" "%jvmoption -Dsomeoption=\"ABC\";\n\n" "%scriptclass com.exasol.udf_profiling.UdfProfiler;\n" - "%jar base/javacontainer/test/test.jar;" + "%jar javacontainer/test/test.jar;" "class JVMOPTION_TEST {\n" "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n" " ctx.emit(\"Success!\");\n" @@ -457,14 +457,14 @@ TEST(JavaContainer, import_script_with_mixed_options) { const std::string other_script_code = "%jvmoption -Dsomeotheroption=\"DEF\";\n\n" - "%jar base/javacontainer/test/other_test.jar;" + "%jar javacontainer/test/other_test.jar;" "class OtherClass {\n" "static void doSomething() {\n\n" " }\n" "}\n"; swigFactory->addModule("other_script", other_script_code); JavaVMTest vm(script_code, std::move(swigFactory)); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/base/javacontainer"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp"); const std::string expected_script_code = "package com.exasol;\r\n\n\n" @@ -477,13 +477,13 @@ TEST(JavaContainer, import_script_with_mixed_options) { "\tctx.emit(\"Success!\");\n" " }\n}\n"; EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/base/javacontainer/exaudf_deploy.jar"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar:base/javacontainer/test/other_test.jar:base/javacontainer/test/test.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/other_test.jar:javacontainer/test/test.jar"); EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation); const std::vector expectedJVMOptions = { "-Dexasol.scriptclass=com.exasol.udf_profiling.UdfProfiler", "-Dsomeotheroption=\"DEF\"", "-Dsomeoption=\"ABC\"", "-Xms128m", "-Xmx128m", "-Xss512k", "-XX:ErrorFile=/tmp/hs_err_pid%p.log", - "-Djava.class.path=/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar:base/javacontainer/test/other_test.jar:base/javacontainer/test/test.jar", + "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/other_test.jar:javacontainer/test/test.jar", "-XX:+UseSerialGC" }; EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions); } @@ -506,7 +506,7 @@ TEST(JavaContainer, import_script_script_class_option_ignored) { "}\n"; swigFactory->addModule("other_script", other_script_code); JavaVMTest vm(script_code, std::move(swigFactory)); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/base/javacontainer"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp"); const std::string expected_script_code = "package com.exasol;\r\n" @@ -523,12 +523,12 @@ TEST(JavaContainer, import_script_script_class_option_ignored) { "\tctx.emit(\"Success!\");\n" " }\n}\n"; EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/base/javacontainer/exaudf_deploy.jar"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation); const std::vector expectedJVMOptions = { "-Xms128m", "-Xmx128m", "-Xss512k", "-XX:ErrorFile=/tmp/hs_err_pid%p.log", - "-Djava.class.path=/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar", + "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar", "-XX:+UseSerialGC" }; EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions); } @@ -573,7 +573,7 @@ TEST(JavaContainer, import_scripts_deep_recursion) { swigFactory->addModule("other_script_C", other_scipt_code_C); swigFactory->addModule("other_script_D", other_scipt_code_D); JavaVMTest vm(script_code, std::move(swigFactory)); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/base/javacontainer"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer"); EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp"); const std::string expected_script_code = "package com.exasol;\r\n\n\n" @@ -598,12 +598,12 @@ TEST(JavaContainer, import_scripts_deep_recursion) { "\tctx.emit(\"Success!\");\n" " }\n}\n"; EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/base/javacontainer/exaudf_deploy.jar"); - EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); + EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar"); EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation); const std::vector expectedJVMOptions = { "-Xms128m", "-Xmx128m", "-Xss512k", "-XX:ErrorFile=/tmp/hs_err_pid%p.log", - "-Djava.class.path=/tmp:/exaudf/base/javacontainer/exaudf_deploy.jar", + "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar", "-XX:+UseSerialGC" }; EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions); } diff --git a/exaudfclient/base/javacontainer/test/cpp/javavm_test.cc b/exaudfclient/base/javacontainer/test/cpp/javavm_test.cc index b1f17f785..fe73a89e7 100644 --- a/exaudfclient/base/javacontainer/test/cpp/javavm_test.cc +++ b/exaudfclient/base/javacontainer/test/cpp/javavm_test.cc @@ -1,7 +1,7 @@ -#include "base/javacontainer/test/cpp/javavm_test.h" -#include "base/javacontainer/test/cpp/swig_factory_test.h" -#include "base/javacontainer/javacontainer_impl.h" -#include "base/javacontainer/script_options/extractor_impl.h" +#include "javacontainer/test/cpp/javavm_test.h" +#include "javacontainer/test/cpp/swig_factory_test.h" +#include "javacontainer/javacontainer_impl.h" +#include "javacontainer/script_options/extractor_impl.h" #include std::unique_ptr makeDefaultSwigFactory() { diff --git a/exaudfclient/base/javacontainer/test/cpp/swig_factory_test.cc b/exaudfclient/base/javacontainer/test/cpp/swig_factory_test.cc index aa46fa7dd..750789f2f 100644 --- a/exaudfclient/base/javacontainer/test/cpp/swig_factory_test.cc +++ b/exaudfclient/base/javacontainer/test/cpp/swig_factory_test.cc @@ -1,5 +1,5 @@ -#include "base/javacontainer/test/cpp/swig_factory_test.h" -#include "base/exaudflib/swig/swig_meta_data.h" +#include "javacontainer/test/cpp/swig_factory_test.h" +#include "exaudflib/swig/swig_meta_data.h" #include diff --git a/exaudfclient/base/javacontainer/test/cpp/swig_factory_test.h b/exaudfclient/base/javacontainer/test/cpp/swig_factory_test.h index 9c071d632..fedd1a4a9 100644 --- a/exaudfclient/base/javacontainer/test/cpp/swig_factory_test.h +++ b/exaudfclient/base/javacontainer/test/cpp/swig_factory_test.h @@ -3,7 +3,7 @@ #include #include -#include "base/swig_factory/swig_factory.h" +#include "swig_factory/swig_factory.h" struct SwigFactoryTestImpl : public SWIGVMContainers::SwigFactory { diff --git a/exaudfclient/base/load_dynamic.cc b/exaudfclient/base/load_dynamic.cc index 4b6949d27..38a742717 100644 --- a/exaudfclient/base/load_dynamic.cc +++ b/exaudfclient/base/load_dynamic.cc @@ -3,7 +3,7 @@ #endif #include -#include "base/exaudflib/vm/swig_vm.h" +#include "exaudflib/vm/swig_vm.h" void* handle; diff --git a/exaudfclient/base/python/exascript_python_wrap.py b/exaudfclient/base/python/exascript_python_wrap.py index 00ce02a8d..452753c9a 100644 --- a/exaudfclient/base/python/exascript_python_wrap.py +++ b/exaudfclient/base/python/exascript_python_wrap.py @@ -12,7 +12,7 @@ #print("sys.path append",path_to_pyexadataframe) sys.path.append(path_to_pyexadataframe) else: - path_to_pyexadataframe="/exaudf/base/python/python3" + path_to_pyexadataframe="/exaudf/external/exaudfclient_base+/python/python3" #print("sys.path append",path_to_pyexadataframe) sys.path.append(path_to_pyexadataframe) diff --git a/exaudfclient/base/python/python3/BUILD b/exaudfclient/base/python/python3/BUILD index 7e56d8c1a..99b90d689 100644 --- a/exaudfclient/base/python/python3/BUILD +++ b/exaudfclient/base/python/python3/BUILD @@ -5,17 +5,17 @@ genrule( cmd = """ INCLUDES=`$$PYTHON3_PREFIX/bin/$$PYTHON3_VERSION-config --includes` mkdir -p build_exascript_python_tmp_cc/exaudflib - cp "$(location //base/exaudflib:swig/script_data_transfer_objects_wrapper.h)" "$(location //base/exaudflib:exascript.i)" build_exascript_python_tmp_cc/exaudflib + cp "$(location //exaudflib:swig/script_data_transfer_objects_wrapper.h)" "$(location //exaudflib:exascript.i)" build_exascript_python_tmp_cc/exaudflib cd build_exascript_python_tmp_cc swig -v $$INCLUDES -O -DEXTERNAL_PROCESS -Wall -c++ -python -py3 -addextern -module exascript_python -o "../$(location exascript_python_tmp.cc)" exaudflib/exascript.i #Run replace_swig_import_helper.py because the generated exascript_python.py is not compatible with Python 3.12 #TODO: Update Swig to a new version which produces code compatible with Python 3.12 cd .. - python3 "$(location //base:replace_swig_import_helper.py)" "$(location exascript_python.py)" "$(location exascript_python.py)" + python3 "$(location //:replace_swig_import_helper.py)" "$(location exascript_python.py)" "$(location exascript_python.py)" """, outs = ["exascript_python_tmp.cc", "exascript_python.py"], - srcs = ["//base/exaudflib:exascript.i","//base/exaudflib:swig/script_data_transfer_objects_wrapper.h"], - tools = ["//base:replace_swig_import_helper.py"], + srcs = ["//exaudflib:exascript.i","//exaudflib:swig/script_data_transfer_objects_wrapper.h"], + tools = ["//:replace_swig_import_helper.py"], ) genrule( @@ -23,32 +23,32 @@ genrule( cmd = """ INCLUDES=`$$PYTHON3_PREFIX/bin/$$PYTHON3_VERSION-config --includes` mkdir build_exascript_python_tmp_h - cp "$(location //base/exaudflib:swig/script_data_transfer_objects_wrapper.h)" "$(location //base/exaudflib:exascript.i)" build_exascript_python_tmp_h + cp "$(location //exaudflib:swig/script_data_transfer_objects_wrapper.h)" "$(location //exaudflib:exascript.i)" build_exascript_python_tmp_h cp "$(location exascript_python_tmp.cc)" "$(location exascript_python.py)" build_exascript_python_tmp_h cd build_exascript_python_tmp_h swig -v $$INCLUDES -DEXTERNAL_PROCESS -c++ -python -py3 -external-runtime "../$(location exascript_python_tmp.h)" """, outs = ["exascript_python_tmp.h"], - srcs = ["//base/exaudflib:exascript.i","//base/exaudflib:swig/script_data_transfer_objects_wrapper.h", ":exascript_python_tmp.cc", "exascript_python.py"] + srcs = ["//exaudflib:exascript.i","//exaudflib:swig/script_data_transfer_objects_wrapper.h", ":exascript_python_tmp.cc", "exascript_python.py"] ) genrule( name = "extend_exascript_python_preset_py", - cmd = 'bash $(location //base/python:extend_exascript_python_preset_py.sh) "$(location //base/python:exascript_python_preset_core.py)" "$(location exascript_python_preset.py)" "$$PYTHON3_PREFIX" "$$PYTHON3_VERSION" ""', + cmd = 'bash $(location //python:extend_exascript_python_preset_py.sh) "$(location //python:exascript_python_preset_core.py)" "$(location exascript_python_preset.py)" "$$PYTHON3_PREFIX" "$$PYTHON3_VERSION" ""', outs = ["exascript_python_preset.py"], - srcs = ["//base/python:exascript_python_preset_core.py"], - tools = ["//base/python:extend_exascript_python_preset_py.sh"] + srcs = ["//python:exascript_python_preset_core.py"], + tools = ["//python:extend_exascript_python_preset_py.sh"] ) genrule( name = "exascript_python_int", cmd = """ cp $(SRCS) . - python3 $(location //base:build_integrated.py) "$(location exascript_python_int.h)" "exascript_python.py" "exascript_python_wrap.py" "exascript_python_preset.py" + python3 $(location //:build_integrated.py) "$(location exascript_python_int.h)" "exascript_python.py" "exascript_python_wrap.py" "exascript_python_preset.py" """, outs = ["exascript_python_int.h"], - srcs = [":exascript_python_tmp_cc", "//base/python:exascript_python_wrap.py", ":extend_exascript_python_preset_py"], - tools = ["//base:build_integrated.py"] + srcs = [":exascript_python_tmp_cc", "//python:exascript_python_wrap.py", ":extend_exascript_python_preset_py"], + tools = ["//:build_integrated.py"] ) genrule( @@ -56,14 +56,14 @@ genrule( cmd = """ ACTUAL_PYTHON_VERSION=`$$PYTHON3_PREFIX/bin/$$PYTHON3_VERSION -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'` if [[ $$ACTUAL_PYTHON_VERSION == 2* ]] ; then - python3 $(location //base:filter_swig_code.py) "$@" "$<" + python3 $(location //:filter_swig_code.py) "$@" "$<" else cp "$<" "$@" fi """, outs = ["exascript_python.h"], srcs = [":exascript_python_tmp_h"], - tools = ["//base:filter_swig_code.py"] + tools = ["//:filter_swig_code.py"] ) genrule( @@ -72,32 +72,32 @@ genrule( ACTUAL_PYTHON_VERSION=`$$PYTHON3_PREFIX/bin/$$PYTHON3_VERSION -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'` cp $(locations exascript_python_tmp_cc) . if [[ $$ACTUAL_PYTHON_VERSION == 2* ]] ; then - python $(location //base:filter_swig_code.py) "$@" exascript_python_tmp.cc + python $(location //:filter_swig_code.py) "$@" exascript_python_tmp.cc else cp exascript_python_tmp.cc "$@" fi """, outs = ["exascript_python.cc"], srcs = [":exascript_python_tmp_cc"], - tools = ["//base:filter_swig_code.py"] + tools = ["//:filter_swig_code.py"] ) cc_library( name = "exascript_python", srcs = [":filter_swig_code_exascript_python_cc",":filter_swig_code_exascript_python_h"], hdrs = [":filter_swig_code_exascript_python_h"], - deps = ["@python3//:python3","//base/exaudflib:exaudflib-deps","//base/exaudflib:header"], + deps = ["@python3//:python3","//exaudflib:exaudflib-deps","//exaudflib:header"], alwayslink=True, ) cc_library( name = "pythoncontainer", - srcs = ["//base/python:pythoncontainer.cc", ":dummy.h"], + srcs = ["//python:pythoncontainer.cc", ":dummy.h"], data = [":extend_exascript_python_preset_py"], hdrs = [":exascript_python_int", ":filter_swig_code_exascript_python_h"], include_prefix = ".", - deps = ["@python3//:python3",":exascript_python","//base/exaudflib:header", - "//base/utils:utils", "//base/python:pythoncontainer_header"], + deps = ["@python3//:python3",":exascript_python","//exaudflib:header", + "//utils:utils", "//python:pythoncontainer_header"], alwayslink=True, ) @@ -114,5 +114,5 @@ cc_binary( linkshared = 1, srcs = [":python_ext_dataframe.cc"], deps = ["@python3//:python3","@numpy//:numpy", - "//base/exaudflib:header", "//base/utils:utils"], + "//exaudflib:header", "//utils:utils"], ) diff --git a/exaudfclient/base/python/python3/python_ext_dataframe.cc b/exaudfclient/base/python/python3/python_ext_dataframe.cc index 73051398c..106fc0ab0 100644 --- a/exaudfclient/base/python/python3/python_ext_dataframe.cc +++ b/exaudfclient/base/python/python3/python_ext_dataframe.cc @@ -1,6 +1,6 @@ #include -#include "base/exaudflib/swig/swig_common.h" -#include "base/utils/debug_message.h" +#include "exaudflib/swig/swig_common.h" +#include "utils/debug_message.h" #include diff --git a/exaudfclient/base/python/pythoncontainer.cc b/exaudfclient/base/python/pythoncontainer.cc index a52b29f52..ed85ba752 100644 --- a/exaudfclient/base/python/pythoncontainer.cc +++ b/exaudfclient/base/python/pythoncontainer.cc @@ -9,9 +9,9 @@ #include #include "exascript_python_int.h" #include "exascript_python.h" -#include "base/utils/debug_message.h" +#include "utils/debug_message.h" -#include "base/exaudflib/swig/script_data_transfer_objects.h" +#include "exaudflib/swig/script_data_transfer_objects.h" #include #include diff --git a/exaudfclient/base/python/pythoncontainer.h b/exaudfclient/base/python/pythoncontainer.h index aab6eb7a9..27092a91f 100644 --- a/exaudfclient/base/python/pythoncontainer.h +++ b/exaudfclient/base/python/pythoncontainer.h @@ -1,7 +1,7 @@ #ifndef PYTHONVM_H #define PYTHONVM_H -#include "base/exaudflib/vm/swig_vm.h" +#include "exaudflib/vm/swig_vm.h" #ifdef ENABLE_PYTHON_VM diff --git a/exaudfclient/base/script_options_parser/ctpg/BUILD b/exaudfclient/base/script_options_parser/ctpg/BUILD index cdb9ee34c..2a6a5a208 100644 --- a/exaudfclient/base/script_options_parser/ctpg/BUILD +++ b/exaudfclient/base/script_options_parser/ctpg/BUILD @@ -4,6 +4,6 @@ cc_library( name = "script_option_lines_parser_ctpg", hdrs = ["script_option_lines_ctpg.h"], srcs = ["script_option_lines_ctpg.cc","ctpg.hpp"], - deps = ["//base/script_options_parser:exception"], + deps = ["//script_options_parser:exception"], copts= ["-fno-lto"], ) diff --git a/exaudfclient/base/script_options_parser/ctpg/script_option_lines_ctpg.cc b/exaudfclient/base/script_options_parser/ctpg/script_option_lines_ctpg.cc index aa3dac75d..fa7c0bac0 100644 --- a/exaudfclient/base/script_options_parser/ctpg/script_option_lines_ctpg.cc +++ b/exaudfclient/base/script_options_parser/ctpg/script_option_lines_ctpg.cc @@ -3,7 +3,7 @@ #include #include #include -#include "base/script_options_parser/exception.h" +#include "script_options_parser/exception.h" using namespace exaudf_ctpg; using namespace exaudf_ctpg::ftors; diff --git a/exaudfclient/base/script_options_parser/ctpg/test/BUILD b/exaudfclient/base/script_options_parser/ctpg/test/BUILD index 6fc31a476..a84e060aa 100644 --- a/exaudfclient/base/script_options_parser/ctpg/test/BUILD +++ b/exaudfclient/base/script_options_parser/ctpg/test/BUILD @@ -2,7 +2,7 @@ cc_test( name = "script-options-ctpg-parser-test", srcs = ["script_option_lines_test.cpp"], deps = [ - "//base/script_options_parser/ctpg:script_option_lines_parser_ctpg", + "//script_options_parser/ctpg:script_option_lines_parser_ctpg", "@googletest//:gtest_main", ], ) \ No newline at end of file diff --git a/exaudfclient/base/script_options_parser/ctpg/test/script_option_lines_test.cpp b/exaudfclient/base/script_options_parser/ctpg/test/script_option_lines_test.cpp index 6ef7e76b9..bcc4c98b2 100644 --- a/exaudfclient/base/script_options_parser/ctpg/test/script_option_lines_test.cpp +++ b/exaudfclient/base/script_options_parser/ctpg/test/script_option_lines_test.cpp @@ -1,9 +1,9 @@ -#include "base/script_options_parser/ctpg/script_option_lines_ctpg.h" +#include "script_options_parser/ctpg/script_option_lines_ctpg.h" #include #include #include #include -#include "base/script_options_parser/exception.h" +#include "script_options_parser/exception.h" using namespace ExecutionGraph; diff --git a/exaudfclient/base/script_options_parser/legacy/BUILD b/exaudfclient/base/script_options_parser/legacy/BUILD index d4aa0421a..330d4d242 100644 --- a/exaudfclient/base/script_options_parser/legacy/BUILD +++ b/exaudfclient/base/script_options_parser/legacy/BUILD @@ -4,6 +4,6 @@ cc_library( name = "script_option_lines_parser_legacy", hdrs = ["script_option_lines.h"], srcs = ["script_option_lines.cc"], - deps = ["//base/script_options_parser:exception"], + deps = ["//script_options_parser:exception"], copts= ["-fno-lto"], ) diff --git a/exaudfclient/base/script_options_parser/legacy/script_option_lines.cc b/exaudfclient/base/script_options_parser/legacy/script_option_lines.cc index b0b7e4876..7c45cea9f 100644 --- a/exaudfclient/base/script_options_parser/legacy/script_option_lines.cc +++ b/exaudfclient/base/script_options_parser/legacy/script_option_lines.cc @@ -1,7 +1,7 @@ #include "script_option_lines.h" #include #include -#include "base/script_options_parser/exception.h" +#include "script_options_parser/exception.h" diff --git a/exaudfclient/base/script_options_parser/legacy/test/BUILD b/exaudfclient/base/script_options_parser/legacy/test/BUILD index 616873204..c58d2bf9e 100644 --- a/exaudfclient/base/script_options_parser/legacy/test/BUILD +++ b/exaudfclient/base/script_options_parser/legacy/test/BUILD @@ -2,7 +2,7 @@ cc_test( name = "script-options-legacy-parser-test", srcs = ["script_option_lines_test.cpp"], deps = [ - "//base/script_options_parser/legacy:script_option_lines_parser_legacy", + "//script_options_parser/legacy:script_option_lines_parser_legacy", "@googletest//:gtest_main", ], ) \ No newline at end of file diff --git a/exaudfclient/base/script_options_parser/legacy/test/script_option_lines_test.cpp b/exaudfclient/base/script_options_parser/legacy/test/script_option_lines_test.cpp index efd3c4bce..550f99936 100644 --- a/exaudfclient/base/script_options_parser/legacy/test/script_option_lines_test.cpp +++ b/exaudfclient/base/script_options_parser/legacy/test/script_option_lines_test.cpp @@ -1,8 +1,8 @@ -#include "base/script_options_parser/legacy/script_option_lines.h" +#include "script_options_parser/legacy/script_option_lines.h" #include #include #include -#include "base/script_options_parser/exception.h" +#include "script_options_parser/exception.h" const std::string whitespace = " \t\f\v"; const std::string lineEnd = ";"; diff --git a/exaudfclient/base/streaming_container/BUILD b/exaudfclient/base/streaming_container/BUILD index 848d7774b..b57363916 100644 --- a/exaudfclient/base/streaming_container/BUILD +++ b/exaudfclient/base/streaming_container/BUILD @@ -4,5 +4,5 @@ cc_library( name = "streamingcontainer", srcs = ["streamingcontainer.cc","streamingcontainer.h"], hdrs = ["streamingcontainer.h"], - deps = ["//base/exaudflib:exaudflib-deps","//base/exaudflib:header"] + deps = ["//exaudflib:exaudflib-deps","//exaudflib:header"] ) \ No newline at end of file diff --git a/exaudfclient/base/swig_factory/BUILD b/exaudfclient/base/swig_factory/BUILD index 14ca77e5a..dcb7c12eb 100644 --- a/exaudfclient/base/swig_factory/BUILD +++ b/exaudfclient/base/swig_factory/BUILD @@ -11,5 +11,5 @@ cc_library( name = "swig_factory", hdrs = [":swig_factory.h", ":swig_factory_impl.h"], srcs = [":swig_factory_impl.cc"], - deps = ["//base/exaudflib:header"], + deps = ["//exaudflib:header"], ) diff --git a/exaudfclient/base/swig_factory/swig_factory_impl.cc b/exaudfclient/base/swig_factory/swig_factory_impl.cc index 6a2c3a3cd..b4b32079a 100644 --- a/exaudfclient/base/swig_factory/swig_factory_impl.cc +++ b/exaudfclient/base/swig_factory/swig_factory_impl.cc @@ -1,6 +1,6 @@ -#include "base/swig_factory/swig_factory_impl.h" -#include "base/exaudflib/load_dynamic.h" -#include "base/exaudflib/swig/swig_common.h" +#include "swig_factory/swig_factory_impl.h" +#include "exaudflib/load_dynamic.h" +#include "exaudflib/swig/swig_common.h" namespace SWIGVMContainers { diff --git a/exaudfclient/base/swig_factory/swig_factory_impl.h b/exaudfclient/base/swig_factory/swig_factory_impl.h index 5c4cfdcc3..5bfbb0035 100644 --- a/exaudfclient/base/swig_factory/swig_factory_impl.h +++ b/exaudfclient/base/swig_factory/swig_factory_impl.h @@ -1,7 +1,7 @@ #ifndef SWIG_FACTORY_IMPL_H #define SWIG_FACTORY_IMPL_H 1 -#include "base/swig_factory/swig_factory.h" +#include "swig_factory/swig_factory.h" namespace SWIGVMContainers { diff --git a/exaudfclient/base/variables.bzl b/exaudfclient/base/variables.bzl new file mode 100644 index 000000000..9a12f3744 --- /dev/null +++ b/exaudfclient/base/variables.bzl @@ -0,0 +1,18 @@ +BENCHMARK_VM_ENABLED_DEFINE=select({ + "//:benchmark": ["ENABLE_BENCHMARK_VM"], + "//conditions:default": [] + }) +STREAMING_VM_ENABLED_DEFINE=select({ + "//:bash": ["ENABLE_STREAMING_VM"], + "//conditions:default": [] + }) +PYTHON_VM_ENABLED_DEFINE=select({ + "//:python": ["ENABLE_PYTHON_VM"], + "//conditions:default": [] + }) +JAVA_VM_ENABLED_DEFINE=select({ + "//:java": ["ENABLE_JAVA_VM"], + "//conditions:default": [] + }) + +VM_ENABLED_DEFINES=BENCHMARK_VM_ENABLED_DEFINE+PYTHON_VM_ENABLED_DEFINE+JAVA_VM_ENABLED_DEFINE+STREAMING_VM_ENABLED_DEFINE diff --git a/exaudfclient/exaudfclient.cc b/exaudfclient/exaudfclient.cc index 2918a7c4e..42bb5f712 100644 --- a/exaudfclient/exaudfclient.cc +++ b/exaudfclient/exaudfclient.cc @@ -11,12 +11,14 @@ #include #include +#include "exaudf_lib_output_path.h" + #ifndef UDF_PLUGIN_CLIENT #include //This is required for dynamic linking in new linker namespace, not required for plugins #endif #include -#include "base/exaudflib/vm/swig_vm.h" -#include "base/exaudflib/load_dynamic.h" +#include "exaudflib/vm/swig_vm.h" +#include "exaudflib/load_dynamic.h" #ifdef ENABLE_BENCHMARK_VM #include "benchmark_container/benchmark_container.h" #endif @@ -24,7 +26,7 @@ #include "streaming_container/streamingcontainer.h" #endif #include -#include "base/utils/debug_message.h" +#include "utils/debug_message.h" #include #include #include @@ -38,11 +40,11 @@ #ifdef ENABLE_JAVA_VM -#include "base/javacontainer/javacontainer_builder.h" +#include "javacontainer/javacontainer_builder.h" #endif //ENABLE_JAVA_VM #ifdef ENABLE_PYTHON_VM -#include "base/python/pythoncontainer.h" +#include "python/pythoncontainer.h" #endif //ENABLE_PYTHON_VM #ifdef UDF_PLUGIN_CLIENT diff --git a/exaudfclient/variables.bzl b/exaudfclient/variables.bzl index 9a12f3744..7448649fd 100644 --- a/exaudfclient/variables.bzl +++ b/exaudfclient/variables.bzl @@ -1,17 +1,17 @@ BENCHMARK_VM_ENABLED_DEFINE=select({ - "//:benchmark": ["ENABLE_BENCHMARK_VM"], + "@exaudfclient_base//:benchmark": ["ENABLE_BENCHMARK_VM"], "//conditions:default": [] }) STREAMING_VM_ENABLED_DEFINE=select({ - "//:bash": ["ENABLE_STREAMING_VM"], + "@exaudfclient_base//:bash": ["ENABLE_STREAMING_VM"], "//conditions:default": [] }) PYTHON_VM_ENABLED_DEFINE=select({ - "//:python": ["ENABLE_PYTHON_VM"], + "@exaudfclient_base//:python": ["ENABLE_PYTHON_VM"], "//conditions:default": [] }) JAVA_VM_ENABLED_DEFINE=select({ - "//:java": ["ENABLE_JAVA_VM"], + "@exaudfclient_base//:java": ["ENABLE_JAVA_VM"], "//conditions:default": [] }) diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_deps/packages/conda_packages b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_deps/packages/conda_packages index ebe16a480..19cc0d3e7 100644 --- a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_deps/packages/conda_packages +++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/build_deps/packages/conda_packages @@ -1,6 +1,6 @@ protobuf|6.31.1 pcre|8.45 -bazel|7.6.1 +bazel|8.3.1 make|4.3 chrpath|0.16 gxx_linux-64|15.1.0 diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/packages/conda_packages b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/packages/conda_packages index 187b0952a..9fc1765a3 100644 --- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/packages/conda_packages +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/packages/conda_packages @@ -1,6 +1,6 @@ protobuf|6.31.1 pcre|8.45 -bazel|7.6.1 +bazel|8.3.1 gxx_linux-64|12.4.0 gcc_linux-64|12.4.0 make|4.3 diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/Dockerfile index a640cae9a..b1ae80810 100644 --- a/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/Dockerfile @@ -10,7 +10,7 @@ COPY scripts /scripts RUN mkdir -p /build_info/packages COPY build_deps/packages /build_info/packages/build_deps -ENV BAZEL_PACKAGE_VERSION="7.2.1" +ENV BAZEL_PACKAGE_VERSION="8.3.1" ENV BAZEL_PACKAGE_FILE="bazel_$BAZEL_PACKAGE_VERSION-linux-x86_64.deb" ENV BAZEL_PACKAGE_URL="https://github.com/bazelbuild/bazel/releases/download/$BAZEL_PACKAGE_VERSION/$BAZEL_PACKAGE_FILE" diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages index 0dbfd3a29..8bad853b7 100644 --- a/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages @@ -2,7 +2,7 @@ coreutils|8.32-4.1ubuntu1.2 locales|2.35-0ubuntu3.11 tar|1.34+dfsg-1ubuntu0.1.22.04.2 curl|7.81.0-1ubuntu1.21 -openjdk-11-jdk-headless|11.0.28+6-1ubuntu1~22.04.1 +openjdk-11-jdk-headless|11.0.29+7-1ubuntu1~22.04 build-essential|12.9ubuntu3 libpcre3-dev|2:8.39-13ubuntu0.22.04.1 protobuf-compiler|3.12.4-1ubuntu7.22.04.4