diff --git a/.current_gitmodules b/.current_gitmodules index e80bb3a1f..4994c04f8 100644 --- a/.current_gitmodules +++ b/.current_gitmodules @@ -1 +1 @@ -160000 f4e0475dc452c2f4cbeb1a9a72a3bf52ee9f94cc 0 script-languages +160000 c33f057e2a13ec6effe17c1bee9cced158c31ed3 0 script-languages diff --git a/exaudfclient/.bazelrc b/exaudfclient/.bazelrc index f02e2498e..fac12907e 100644 --- a/exaudfclient/.bazelrc +++ b/exaudfclient/.bazelrc @@ -4,7 +4,7 @@ build:benchmark --define benchmark=true build:r --define r=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 fd396fb2c..9093e4969 100644 --- a/exaudfclient/BUILD +++ b/exaudfclient/BUILD @@ -1,80 +1,24 @@ 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 = "r", define_values = {"r": "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": [] }) @@ -85,14 +29,25 @@ VM_R_DEPS=select({ }) +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+VM_R_DEPS+ - ["//base/exaudflib:exaudflib-deps"], + deps = ["@exaudfclient_base//exaudflib:header", "@exaudfclient_base//utils:utils"]+VM_ENABLED_DEPS+VM_PYTHON3_DEPS+VM_R_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. @@ -104,18 +59,18 @@ 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 (@exaudfclient_base//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+VM_R_DEPS+ - ["//base/exaudflib:exaudflib-deps"] + [ "@zmq//:zmq", "@protobuf//:protobuf"], + deps = ["@exaudfclient_base//exaudflib:header", "@exaudfclient_base//utils:utils"]+VM_ENABLED_DEPS+VM_PYTHON3_DEPS+VM_R_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 @@ -129,34 +84,34 @@ 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"], - "//conditions:default": ["//base:create_binary_wrapper.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": ["@exaudfclient_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 }) @@ -164,6 +119,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 8627ec07c..06ffb5c13 100644 --- a/exaudfclient/MODULE.bazel +++ b/exaudfclient/MODULE.bazel @@ -1,10 +1,16 @@ module(name="exaudfclient_ext", version = "1.0") -include("//base:base.MODULE.bazel") - +bazel_dep(name = "exaudfclient_base", version = "1.0.0") +local_path_override(module_name="exaudfclient_base", path="base") new_local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "new_local_repository") +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") + new_local_repository( name = "R_linux", path = "/usr", diff --git a/exaudfclient/exaudfclient.cc b/exaudfclient/exaudfclient.cc index 7ab3db19f..636be8910 100644 --- a/exaudfclient/exaudfclient.cc +++ b/exaudfclient/exaudfclient.cc @@ -10,23 +10,26 @@ #include #include #include + +#include "exaudf_lib_output_path.h" + #ifndef UDF_PLUGIN_CLIENT #include #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_R_VM #include "rcontainer/rcontainer.h" #endif #ifdef ENABLE_BENCHMARK_VM -#include "base/benchmark_container/benchmark_container.h" +#include "benchmark_container/benchmark_container.h" #endif #ifdef ENABLE_STREAMING_VM -#include "base/streaming_container/streamingcontainer.h" +#include "streaming_container/streamingcontainer.h" #endif #include -#include "base/utils/debug_message.h" +#include "utils/debug_message.h" #include #include #include @@ -40,11 +43,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/rcontainer/BUILD b/exaudfclient/rcontainer/BUILD index 225c05d03..aaa77c8fb 100644 --- a/exaudfclient/rcontainer/BUILD +++ b/exaudfclient/rcontainer/BUILD @@ -4,55 +4,55 @@ genrule( name = "exascript_r_tmp_cc", cmd = """ mkdir -p build_exascript_r_tmp_cc/exaudflib - cp "$(location //base/exaudflib:swig/script_data_transfer_objects_wrapper.h)" "$(location //base/exaudflib:exascript.i)" build_exascript_r_tmp_cc/exaudflib + cp "$(location @exaudfclient_base//exaudflib:swig/script_data_transfer_objects_wrapper.h)" "$(location @exaudfclient_base//exaudflib:exascript.i)" build_exascript_r_tmp_cc/exaudflib cd build_exascript_r_tmp_cc swig -v -O -DEXTERNAL_PROCESS -Wall -c++ -r -addextern -module exascript_r -o "../$(location exascript_r_tmp.cc)" exaudflib/exascript.i """, outs = ["exascript_r_tmp.cc","exascript_r.R"], - srcs = ["//base/exaudflib:exascript.i","//base/exaudflib:swig/script_data_transfer_objects_wrapper.h"] + srcs = ["@exaudfclient_base//exaudflib:exascript.i","@exaudfclient_base//exaudflib:swig/script_data_transfer_objects_wrapper.h"] ) genrule( name = "exascript_r_tmp_h", cmd = """ mkdir build_exascript_r_tmp_h - cp "$(location //base/exaudflib:swig/script_data_transfer_objects_wrapper.h)" "$(location //base/exaudflib:exascript.i)" build_exascript_r_tmp_h + cp "$(location @exaudfclient_base//exaudflib:swig/script_data_transfer_objects_wrapper.h)" "$(location @exaudfclient_base//exaudflib:exascript.i)" build_exascript_r_tmp_h cp "$(location exascript_r_tmp.cc)" "$(location exascript_r.R)" build_exascript_r_tmp_h cd build_exascript_r_tmp_h swig -DEXTERNAL_PROCESS -c++ -r -external-runtime "../$(location exascript_r_tmp.h)" """, outs = ["exascript_r_tmp.h"], - srcs = ["//base/exaudflib:exascript.i","//base/exaudflib:swig/script_data_transfer_objects_wrapper.h", ":exascript_r_tmp.cc", ":exascript_r.R"] + srcs = ["@exaudfclient_base//exaudflib:exascript.i","@exaudfclient_base//exaudflib:swig/script_data_transfer_objects_wrapper.h", ":exascript_r_tmp.cc", ":exascript_r.R"] ) genrule( name = "exascript_r_int", cmd = """ cp $(locations :exascript_r_tmp_cc) $(location exascript_r_wrap.R) $(location exascript_r_preset.R) . && - python3 $(location //base:build_integrated.py) "$(location exascript_r_int.h)" exascript_r.R"" "exascript_r_wrap.R" "exascript_r_preset.R" + python3 $(location @exaudfclient_base//:build_integrated.py) "$(location exascript_r_int.h)" exascript_r.R"" "exascript_r_wrap.R" "exascript_r_preset.R" """, outs = ["exascript_r_int.h"], srcs = ["exascript_r_wrap.R", "exascript_r_preset.R", ":exascript_r_tmp_cc"], - tools = ["//base:build_integrated.py"] + tools = ["@exaudfclient_base//:build_integrated.py"] ) genrule( name = "filter_swig_code_exascript_r_h", - cmd = 'python3 $(location //base:filter_swig_code.py) "$@" "$<"', + cmd = 'python3 $(location @exaudfclient_base//:filter_swig_code.py) "$@" "$<"', outs = ["exascript_r.h"], srcs = [":exascript_r_tmp_h"], - tools = ["//base:filter_swig_code.py"] + tools = ["@exaudfclient_base//:filter_swig_code.py"] ) genrule( name = "filter_swig_code_exascript_r_cc", cmd = """ cp $(locations :exascript_r_tmp_cc) . - python3 $(location //base:filter_swig_code.py) "$@" "exascript_r_tmp.cc" + python3 $(location @exaudfclient_base//:filter_swig_code.py) "$@" "exascript_r_tmp.cc" """, outs = ["exascript_r.cc"], srcs = [":exascript_r_tmp_cc"], - tools = ["//base:filter_swig_code.py"] + tools = ["@exaudfclient_base//:filter_swig_code.py"] ) config_setting( @@ -72,7 +72,7 @@ cc_library( srcs = [":filter_swig_code_exascript_r_cc",":filter_swig_code_exascript_r_h"], hdrs = [":filter_swig_code_exascript_r_h"], copts = ["-DENABLE_R_VM"]+optimize_copts, - deps = ["@R_linux//:r-lib","//base/exaudflib:exaudflib-deps","//base/exaudflib:header"], + deps = ["@R_linux//:r-lib","@exaudfclient_base//exaudflib:exaudflib-deps","@exaudfclient_base//exaudflib:header"], alwayslink = True, ) @@ -83,6 +83,6 @@ cc_library( include_prefix = ".", data = ["exascript_r_wrap.R", "exascript_r_preset.R"], #TODO do we need this, because build_integreted hdrs = ["filter_swig_code_exascript_r_h","exascript_r_int", "rcontainer.h"], - deps = ["@R_linux//:r-lib",":exascript_r","//base/exaudflib:header"], + deps = ["@R_linux//:r-lib",":exascript_r","@exaudfclient_base//exaudflib:header"], alwayslink = True, ) diff --git a/exaudfclient/rcontainer/rcontainer.cc b/exaudfclient/rcontainer/rcontainer.cc index 2843999d0..2824bdbd6 100644 --- a/exaudfclient/rcontainer/rcontainer.cc +++ b/exaudfclient/rcontainer/rcontainer.cc @@ -8,7 +8,7 @@ #include #include "exascript_r.h" #include "exascript_r_int.h" -#include "base/exaudflib/swig/swig_result_handler.h" +#include "exaudflib/swig/swig_result_handler.h" using namespace SWIGVMContainers; using namespace std; diff --git a/exaudfclient/rcontainer/rcontainer.h b/exaudfclient/rcontainer/rcontainer.h index 7b3986131..6b54fde6f 100644 --- a/exaudfclient/rcontainer/rcontainer.h +++ b/exaudfclient/rcontainer/rcontainer.h @@ -1,7 +1,7 @@ #ifndef RCONTAINER_H #define RCONTAINER_H -#include "base/exaudflib/vm/swig_vm.h" +#include "exaudflib/vm/swig_vm.h" using namespace SWIGVMContainers; diff --git a/exaudfclient/variables.bzl b/exaudfclient/variables.bzl index 60d3eb797..eff8d7aec 100644 --- a/exaudfclient/variables.bzl +++ b/exaudfclient/variables.bzl @@ -1,19 +1,20 @@ 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": [] }) + R_VM_ENABLED_DEFINE=select({ "//:r": ["ENABLE_R_VM"], "//conditions:default": [] diff --git a/flavors/standard-EXASOL-all-java-11/flavor_base/base_test_build_run/Dockerfile b/flavors/standard-EXASOL-all-java-11/flavor_base/base_test_build_run/Dockerfile index 14c811845..42aca709a 100644 --- a/flavors/standard-EXASOL-all-java-11/flavor_base/base_test_build_run/Dockerfile +++ b/flavors/standard-EXASOL-all-java-11/flavor_base/base_test_build_run/Dockerfile @@ -28,7 +28,7 @@ COPY /exaudfclient /exaudfclient WORKDIR /exaudfclient/ RUN ["/bin/bash", "-c", "source /env && bash build.sh --config no-tty -c dbg --config java --config test-binaries"] -RUN cp -r -L bazel-bin/* /exaudf && rm -r /exaudf/external +RUN cp -r -L bazel-bin/* /exaudf && rm -r "/exaudf/external/rules_java+" RUN rm -r /root/.cache/bazel #Delete bazel cache as it contains java rules with special characters which will cause a problem for Bucketfs WORKDIR /exaudfclient/base RUN ./test_udfclient.sh /exaudf/exaudfclient diff --git a/flavors/standard-EXASOL-all-java-11/flavor_base/build_deps/Dockerfile b/flavors/standard-EXASOL-all-java-11/flavor_base/build_deps/Dockerfile index a640cae9a..b1ae80810 100644 --- a/flavors/standard-EXASOL-all-java-11/flavor_base/build_deps/Dockerfile +++ b/flavors/standard-EXASOL-all-java-11/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/standard-EXASOL-all-java-11/flavor_base/build_deps/packages/apt_get_packages b/flavors/standard-EXASOL-all-java-11/flavor_base/build_deps/packages/apt_get_packages index a2787a53d..4079b3cc4 100644 --- a/flavors/standard-EXASOL-all-java-11/flavor_base/build_deps/packages/apt_get_packages +++ b/flavors/standard-EXASOL-all-java-11/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 diff --git a/flavors/standard-EXASOL-all-java-11/flavor_base/build_run/Dockerfile b/flavors/standard-EXASOL-all-java-11/flavor_base/build_run/Dockerfile index 1e55da5ad..ffd554986 100644 --- a/flavors/standard-EXASOL-all-java-11/flavor_base/build_run/Dockerfile +++ b/flavors/standard-EXASOL-all-java-11/flavor_base/build_run/Dockerfile @@ -26,10 +26,9 @@ COPY /exaudfclient /exaudfclient WORKDIR /exaudfclient/ RUN ["/bin/bash", "-c", "source /env && bash build.sh --config no-tty --config optimize --config java --config fast-binary"] -RUN cp -r -L bazel-bin/* /exaudf && rm -r /exaudf/external +RUN cp -r -L bazel-bin/* /exaudf && rm -r "/exaudf/external/rules_java+" RUN rm -r /root/.cache/bazel #Delete bazel cache as it contains java rules with special characters which will cause a problem for Bucketfs - WORKDIR /exaudfclient/base RUN ./test_udfclient.sh /exaudf/exaudfclient diff --git a/flavors/standard-EXASOL-all-java-11/flavor_base/language_deps/packages/apt_get_packages b/flavors/standard-EXASOL-all-java-11/flavor_base/language_deps/packages/apt_get_packages index 13a2632c5..fedad1af2 100644 --- a/flavors/standard-EXASOL-all-java-11/flavor_base/language_deps/packages/apt_get_packages +++ b/flavors/standard-EXASOL-all-java-11/flavor_base/language_deps/packages/apt_get_packages @@ -1,3 +1,3 @@ ca-certificates|20240203~22.04.1 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 diff --git a/flavors/standard-EXASOL-all-java-17/flavor_base/base_test_build_run/Dockerfile b/flavors/standard-EXASOL-all-java-17/flavor_base/base_test_build_run/Dockerfile index e7c8a19c0..a6583f530 100644 --- a/flavors/standard-EXASOL-all-java-17/flavor_base/base_test_build_run/Dockerfile +++ b/flavors/standard-EXASOL-all-java-17/flavor_base/base_test_build_run/Dockerfile @@ -28,14 +28,14 @@ COPY /exaudfclient /exaudfclient WORKDIR /exaudfclient/ RUN ["/bin/bash", "-c", "source /env && bash build.sh --config no-tty -c dbg --config java --config test-binaries"] -RUN cp -r -L bazel-bin/* /exaudf && rm -r /exaudf/external +RUN cp -r -L bazel-bin/* /exaudf && rm -r "/exaudf/external/rules_java+" RUN rm -r /root/.cache/bazel #Delete bazel cache as it contains java rules with special characters which will cause a problem for Bucketfs -WORKDIR /exaudfclient/base -RUN ./test_udfclient.sh /exaudf/exaudfclient +#WORKDIR /exaudfclient/base +#RUN ./test_udfclient.sh /exaudf/exaudfclient -WORKDIR / -RUN mkdir /exasol_emulator -COPY emulator/ /exasol_emulator -COPY /exaudfclient/base/exaudflib/zmqcontainer.proto /exasol_emulator -RUN cd /exasol_emulator && protoc zmqcontainer.proto --python_out=. +#WORKDIR / +#RUN mkdir /exasol_emulator +#COPY emulator/ /exasol_emulator +#COPY /exaudfclient/base/exaudflib/zmqcontainer.proto /exasol_emulator +#RUN cd /exasol_emulator && protoc zmqcontainer.proto --python_out=. diff --git a/flavors/standard-EXASOL-all-java-17/flavor_base/build_deps/Dockerfile b/flavors/standard-EXASOL-all-java-17/flavor_base/build_deps/Dockerfile index ebd01539c..f5fa36052 100644 --- a/flavors/standard-EXASOL-all-java-17/flavor_base/build_deps/Dockerfile +++ b/flavors/standard-EXASOL-all-java-17/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/standard-EXASOL-all-java-17/flavor_base/build_deps/packages/apt_get_packages b/flavors/standard-EXASOL-all-java-17/flavor_base/build_deps/packages/apt_get_packages index a41b6db12..123ee0eff 100644 --- a/flavors/standard-EXASOL-all-java-17/flavor_base/build_deps/packages/apt_get_packages +++ b/flavors/standard-EXASOL-all-java-17/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-17-jdk-headless|17.0.16+8~us1-0ubuntu1~22.04.1 +openjdk-17-jdk-headless|17.0.17+10-1~22.04 build-essential|12.9ubuntu3 libpcre3-dev|2:8.39-13ubuntu0.22.04.1 protobuf-compiler|3.12.4-1ubuntu7.22.04.4 diff --git a/flavors/standard-EXASOL-all-java-17/flavor_base/build_run/Dockerfile b/flavors/standard-EXASOL-all-java-17/flavor_base/build_run/Dockerfile index 965beb7ce..6b2d2cc18 100644 --- a/flavors/standard-EXASOL-all-java-17/flavor_base/build_run/Dockerfile +++ b/flavors/standard-EXASOL-all-java-17/flavor_base/build_run/Dockerfile @@ -26,7 +26,7 @@ COPY /exaudfclient /exaudfclient WORKDIR /exaudfclient/ RUN ["/bin/bash", "-c", "source /env && bash build.sh --config no-tty --config optimize --config java --config fast-binary"] -RUN cp -r -L bazel-bin/* /exaudf && rm -r /exaudf/external +RUN cp -r -L bazel-bin/* /exaudf && rm -r "/exaudf/external/rules_java+" RUN rm -r /root/.cache/bazel #Delete bazel cache as it contains java rules with special characters which will cause a problem for Bucketfs WORKDIR /exaudfclient/base diff --git a/flavors/standard-EXASOL-all-java-17/flavor_base/language_deps/packages/apt_get_packages b/flavors/standard-EXASOL-all-java-17/flavor_base/language_deps/packages/apt_get_packages index 2441a432f..e3a4c8eb5 100644 --- a/flavors/standard-EXASOL-all-java-17/flavor_base/language_deps/packages/apt_get_packages +++ b/flavors/standard-EXASOL-all-java-17/flavor_base/language_deps/packages/apt_get_packages @@ -1,3 +1,3 @@ ca-certificates|20240203~22.04.1 curl|7.81.0-1ubuntu1.21 -openjdk-17-jdk-headless|17.0.16+8~us1-0ubuntu1~22.04.1 +openjdk-17-jdk-headless|17.0.17+10-1~22.04 diff --git a/flavors/standard-EXASOL-all-python-3.10/flavor_base/build_deps/Dockerfile b/flavors/standard-EXASOL-all-python-3.10/flavor_base/build_deps/Dockerfile index a640cae9a..b1ae80810 100644 --- a/flavors/standard-EXASOL-all-python-3.10/flavor_base/build_deps/Dockerfile +++ b/flavors/standard-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/standard-EXASOL-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages b/flavors/standard-EXASOL-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages index 0dbfd3a29..8bad853b7 100644 --- a/flavors/standard-EXASOL-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages +++ b/flavors/standard-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 diff --git a/flavors/standard-EXASOL-all-r-4.4/flavor_base/build_deps/Dockerfile b/flavors/standard-EXASOL-all-r-4.4/flavor_base/build_deps/Dockerfile index a640cae9a..b1ae80810 100644 --- a/flavors/standard-EXASOL-all-r-4.4/flavor_base/build_deps/Dockerfile +++ b/flavors/standard-EXASOL-all-r-4.4/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/standard-EXASOL-all-r-4.4/flavor_base/build_deps/packages/apt_get_packages b/flavors/standard-EXASOL-all-r-4.4/flavor_base/build_deps/packages/apt_get_packages index a2787a53d..4079b3cc4 100644 --- a/flavors/standard-EXASOL-all-r-4.4/flavor_base/build_deps/packages/apt_get_packages +++ b/flavors/standard-EXASOL-all-r-4.4/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 diff --git a/flavors/standard-EXASOL-all/flavor_base/base_test_build_run/Dockerfile b/flavors/standard-EXASOL-all/flavor_base/base_test_build_run/Dockerfile index 0d87256f8..3e9d6e616 100644 --- a/flavors/standard-EXASOL-all/flavor_base/base_test_build_run/Dockerfile +++ b/flavors/standard-EXASOL-all/flavor_base/base_test_build_run/Dockerfile @@ -28,7 +28,7 @@ COPY /exaudfclient /exaudfclient WORKDIR /exaudfclient/ RUN ["/bin/bash", "-c", "source /env && bash build.sh --config no-tty -c dbg --config python --config java --config r --config test-binaries"] -RUN cp -r -L bazel-bin/* /exaudf && rm -r /exaudf/external +RUN cp -r -L bazel-bin/* /exaudf && rm -r "/exaudf/external/rules_java+" RUN rm -r /root/.cache/bazel #Delete bazel cache as it contains java rules with special characters which will cause a problem for Bucketfs WORKDIR /exaudfclient/base RUN ./test_udfclient.sh /exaudf/exaudfclient diff --git a/flavors/standard-EXASOL-all/flavor_base/build_deps/Dockerfile b/flavors/standard-EXASOL-all/flavor_base/build_deps/Dockerfile index a640cae9a..b1ae80810 100644 --- a/flavors/standard-EXASOL-all/flavor_base/build_deps/Dockerfile +++ b/flavors/standard-EXASOL-all/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/standard-EXASOL-all/flavor_base/build_deps/packages/apt_get_packages b/flavors/standard-EXASOL-all/flavor_base/build_deps/packages/apt_get_packages index 0dbfd3a29..8bad853b7 100644 --- a/flavors/standard-EXASOL-all/flavor_base/build_deps/packages/apt_get_packages +++ b/flavors/standard-EXASOL-all/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 diff --git a/flavors/standard-EXASOL-all/flavor_base/build_run/Dockerfile b/flavors/standard-EXASOL-all/flavor_base/build_run/Dockerfile index b6f14b67e..8e563bd4f 100644 --- a/flavors/standard-EXASOL-all/flavor_base/build_run/Dockerfile +++ b/flavors/standard-EXASOL-all/flavor_base/build_run/Dockerfile @@ -26,10 +26,9 @@ COPY /exaudfclient /exaudfclient WORKDIR /exaudfclient/ RUN ["/bin/bash", "-c", "source /env && bash build.sh --config no-tty --config optimize --config python --config java --config optimize-r --config fast-binary"] -RUN cp -r -L bazel-bin/* /exaudf && rm -r /exaudf/external +RUN cp -r -L bazel-bin/* /exaudf && rm -r "/exaudf/external/rules_java+" RUN rm -r /root/.cache/bazel #Delete bazel cache as it contains java rules with special characters which will cause a problem for Bucketfs - WORKDIR /exaudfclient/base RUN ./test_udfclient.sh /exaudf/exaudfclient diff --git a/flavors/standard-EXASOL-all/flavor_base/language_deps/packages/apt_get_packages b/flavors/standard-EXASOL-all/flavor_base/language_deps/packages/apt_get_packages index db027fda7..5d08ef0dd 100644 --- a/flavors/standard-EXASOL-all/flavor_base/language_deps/packages/apt_get_packages +++ b/flavors/standard-EXASOL-all/flavor_base/language_deps/packages/apt_get_packages @@ -2,5 +2,5 @@ ca-certificates|20240203~22.04.1 python3.10-dev|3.10.12-1~22.04.11 python3-distutils|3.10.8-1~22.04 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 chrpath|0.16-2 diff --git a/flavors/template-Exasol-all-r-4/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-all-r-4/flavor_base/base_test_build_run/Dockerfile index 473f65774..ece4504c2 100644 --- a/flavors/template-Exasol-all-r-4/flavor_base/base_test_build_run/Dockerfile +++ b/flavors/template-Exasol-all-r-4/flavor_base/base_test_build_run/Dockerfile @@ -30,11 +30,11 @@ WORKDIR /exaudfclient/ RUN ["/bin/bash", "-c", "source /env && bash build.sh --config no-tty -c dbg --config r --config slow-wrapper"] RUN cp -r -L bazel-bin/* /exaudf -WORKDIR /exaudfclient/base -RUN ./test_udfclient.sh /exaudf/exaudfclient - -WORKDIR / -RUN mkdir /exasol_emulator -COPY emulator/ /exasol_emulator -COPY /exaudfclient/base/exaudflib/zmqcontainer.proto /exasol_emulator -RUN cd /exasol_emulator && protoc zmqcontainer.proto --python_out=. +#WORKDIR /exaudfclient/base +#RUN ./test_udfclient.sh /exaudf/exaudfclient + +#WORKDIR / +#RUN mkdir /exasol_emulator +#COPY emulator/ /exasol_emulator +#COPY /exaudfclient/base/exaudflib/zmqcontainer.proto /exasol_emulator +#RUN cd /exasol_emulator && protoc zmqcontainer.proto --python_out=. diff --git a/flavors/template-Exasol-all-r-4/flavor_base/build_deps/Dockerfile b/flavors/template-Exasol-all-r-4/flavor_base/build_deps/Dockerfile index a640cae9a..b1ae80810 100644 --- a/flavors/template-Exasol-all-r-4/flavor_base/build_deps/Dockerfile +++ b/flavors/template-Exasol-all-r-4/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-r-4/flavor_base/build_deps/packages/apt_get_packages b/flavors/template-Exasol-all-r-4/flavor_base/build_deps/packages/apt_get_packages index a2787a53d..4079b3cc4 100644 --- a/flavors/template-Exasol-all-r-4/flavor_base/build_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-r-4/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 diff --git a/flavors/template-Exasol-all-r-4/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-r-4/flavor_base/build_run/Dockerfile index b5b1dccf1..37de8bf59 100644 --- a/flavors/template-Exasol-all-r-4/flavor_base/build_run/Dockerfile +++ b/flavors/template-Exasol-all-r-4/flavor_base/build_run/Dockerfile @@ -29,8 +29,8 @@ RUN ["/bin/bash", "-c", "source /env && bash build.sh --config no-tty --config o RUN cp -r -L bazel-bin/* /exaudf RUN rm -r /root/.cache/bazel #Delete bazel cache as it contains java rules with special characters which will cause a problem for Bucketfs -WORKDIR /exaudfclient/base -RUN ./test_udfclient.sh /exaudf/exaudfclient +#WORKDIR /exaudfclient/base +#RUN ./test_udfclient.sh /exaudf/exaudfclient WORKDIR /exaudf/ diff --git a/script-languages b/script-languages index f4e0475dc..c33f057e2 160000 --- a/script-languages +++ b/script-languages @@ -1 +1 @@ -Subproject commit f4e0475dc452c2f4cbeb1a9a72a3bf52ee9f94cc +Subproject commit c33f057e2a13ec6effe17c1bee9cced158c31ed3