diff --git a/.gitignore b/.gitignore index 8aa066f..3c10e7a 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,10 @@ tools/codegen_spark_udfs.py # tools/refresh-from-master.sh scratch (sibling clones + libmeos prefix). .meos-chain/ + +# Build output, never committed: the shade plugin's rewritten pom, and any +# libmeos a working copy builds. A committed library goes stale against the +# catalog the surface is generated from — the tests then answer from a MEOS +# that predates it, while CI answers from the one it just built. +dependency-reduced-pom.xml +**/lib/libmeos.so diff --git a/benchmark/DockerfileSQL b/benchmark/DockerfileSQL deleted file mode 100644 index b9ba6be..0000000 --- a/benchmark/DockerfileSQL +++ /dev/null @@ -1,83 +0,0 @@ -# ───────────────────────────────────────────── -# Stage 1: Build libmeos.so from source -# ───────────────────────────────────────────── -FROM ubuntu:22.04 AS meos-builder - -RUN apt-get update && apt-get install -y --no-install-recommends \ - build-essential \ - cmake \ - git \ - ca-certificates \ - libgeos-dev \ - libproj-dev \ - libjson-c-dev \ - libgsl-dev \ - && rm -rf /var/lib/apt/lists/* - -RUN git clone --depth 1 https://github.com/MobilityDB/MobilityDB.git /mobilitydb - -RUN mkdir /mobilitydb/build && cd /mobilitydb/build \ - && cmake -DMEOS=ON -DCMAKE_BUILD_TYPE=Release .. \ - && make -j$(nproc) \ - && make install - -# libmeos.so lands in /usr/local/lib after make install - -# ───────────────────────────────────────────── -# Stage 2: Build the fat JAR with Maven -# ───────────────────────────────────────────── -FROM maven:3.9.6-eclipse-temurin-21 AS java-builder - -WORKDIR /build - -# Install into local Maven repo -COPY benchmark/jar/JMEOS.jar /tmp/JMEOS.jar -RUN mvn install:install-file \ - -Dfile=/tmp/JMEOS.jar \ - -DgroupId=com.mobilitydb \ - -DartifactId=jmeos \ - -Dversion=1.0.0 \ - -Dpackaging=jar \ - -q - -# Also copy to the path pom.xml's systemPath points to -COPY benchmark/jar/JMEOS.jar ./jar/JMEOS.jar - -COPY benchmark/pom.xml . -RUN mvn dependency:go-offline -q - -COPY benchmark/src ./src -RUN mvn clean package -q - -# ───────────────────────────────────────────── -# Stage 3: Runtime — Flink base + libmeos + JAR -# ───────────────────────────────────────────── -FROM flink:2.1.3-java21 - -# Runtime deps for libmeos.so -USER root -RUN apt-get update && apt-get install -y --no-install-recommends \ - libgeos-dev \ - libproj-dev \ - libjson-c-dev \ - libgsl-dev \ - --fix-missing \ - && rm -rf /var/lib/apt/lists/* - -# Copy libmeos.so from the builder -COPY --from=meos-builder /usr/local/lib/libmeos* /usr/local/lib/ -RUN ldconfig - -# Copy the fat JAR -COPY --from=java-builder /build/target/flink-kafka2postgres-1.0-SNAPSHOT.jar /opt/flink/usrlib/benchmark.jar - -# Run FloatSpanSQLTest standalone -# Remove the bundled planner — DelegateExecutorFactory in opt/ is the correct one -CMD ["java", \ - "-Djava.library.path=/usr/local/lib", \ - "-cp", "/opt/flink/lib/*:/opt/flink/usrlib/benchmark.jar", \ - -# "sql.FloatSpanSQLTest"] -# "sql.STBoxSQLTest"] -# "sql.TBoxSQLTest"] - "sql.TNumberSQLTest"] diff --git a/benchmark/dependency-reduced-pom.xml b/benchmark/dependency-reduced-pom.xml deleted file mode 100644 index 5f007c2..0000000 --- a/benchmark/dependency-reduced-pom.xml +++ /dev/null @@ -1,284 +0,0 @@ - - - 4.0.0 - Mariana - flink-kafka2postgres - 1.0-SNAPSHOT - - - - src/main/resources - - - ${project.basedir}/jmeos - - - - - maven-compiler-plugin - 3.12.1 - - ${target.java.version} - - ${sedona.source.excludes} - - - ${sedona.source.excludes} - - - - - maven-shade-plugin - 3.1.1 - - - package - - shade - - - - - *:* - - - META-INF.versions.9.module-info - org.apache.flink:flink-shaded-force-shading - com.google.code.findbugs:jsr305 - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - ${queryMainClass} - - - - - - - - maven-surefire-plugin - 3.2.5 - - false - - ${meos.enabled} - - - ${meos.lib.dir} - - --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED - - - - - - - sedona - - - org.apache.sedona - sedona-flink-shaded_2.12 - 1.9.0 - - - org.datasyslab - geotools-wrapper - 1.8.1-33.1 - - - - nothing-excluded/** - - - - - - org.apache.flink - flink-streaming-java - 2.0.0 - provided - - - flink-file-sink-common - org.apache.flink - - - flink-runtime - org.apache.flink - - - flink-shaded-guava - org.apache.flink - - - commons-math3 - org.apache.commons - - - - - org.apache.flink - flink-clients - 2.0.0 - provided - - - commons-cli - commons-cli - - - flink-datastream - org.apache.flink - - - flink-runtime - org.apache.flink - - - - - org.apache.flink - flink-core - 2.0.0 - provided - - - flink-core-api - org.apache.flink - - - flink-annotations - org.apache.flink - - - flink-shaded-asm-9 - org.apache.flink - - - flink-shaded-jackson - org.apache.flink - - - snakeyaml-engine - org.snakeyaml - - - commons-text - org.apache.commons - - - kryo - com.esotericsoftware - - - commons-collections - commons-collections - - - commons-compress - org.apache.commons - - - flink-shaded-guava - org.apache.flink - - - - - org.apache.flink - flink-table-api-java-bridge - 2.0.0 - provided - - - flink-table-api-java - org.apache.flink - - - flink-table-api-bridge-base - org.apache.flink - - - - - org.apache.flink - flink-table-planner_2.12 - 2.0.0 - provided - - - value - org.immutables - - - value-annotations - org.immutables - - - commons-compiler - org.codehaus.janino - - - janino - org.codehaus.janino - - - flink-table-api-scala_2.12 - org.apache.flink - - - flink-table-runtime - org.apache.flink - - - - - org.junit.jupiter - junit-jupiter-api - 5.7.0 - test - - - apiguardian-api - org.apiguardian - - - opentest4j - org.opentest4j - - - junit-platform-commons - org.junit.platform - - - - - - ${project.basedir}/lib - 21 - 2.13.4 - 5.8.2 - 2.0.0 - aisdata.Query1_Main - 3.2.0 - 21 - true - 4.0.1-2.0 - UTF-8 - 2.17.2 - 21 - **/sedona/** - - diff --git a/benchmark/lib/libmeos.so b/benchmark/lib/libmeos.so deleted file mode 100755 index 2de4693..0000000 Binary files a/benchmark/lib/libmeos.so and /dev/null differ diff --git a/benchmark/pom.xml b/benchmark/pom.xml index 9bf5469..112bd8f 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -35,11 +35,6 @@ 3.2.0 2.17.2 21 - - true - ${project.basedir}/lib