Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion GENERATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ master the first time). All of that script's options pass through:

```bash
tools/refresh-from-master.sh --mdb ~/src/MobilityDB # refresh against a local MobilityDB branch
tools/refresh-from-master.sh --skip-tests # regenerate + compile, skip the smoke tests
```

This repo's last leg is `tools/refresh.conf`: the `binding` Maven module, the `org.jmeos:meos:1.0`
Expand Down
2 changes: 1 addition & 1 deletion benchmark/DockerfileSQL
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ COPY benchmark/pom.xml .
RUN mvn dependency:go-offline -q

COPY benchmark/src ./src
RUN mvn clean package -DskipTests -q
RUN mvn clean package -q

# ─────────────────────────────────────────────
# Stage 3: Runtime — Flink base + libmeos + JAR
Expand Down
4 changes: 2 additions & 2 deletions benchmark/Dockerfile_q8_meos_kalman
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ RUN FPATH=/usr/local/jmeos/src/main/java/functions/functions.java && \

# Build JMEOS jar (with EKF-capable libmeos.so embedded + patched functions.java).
# Jars are output to /usr/local/jmeos/jar/ (not target/).
RUN cd /usr/local/jmeos && mvn clean package -DskipTests \
RUN cd /usr/local/jmeos && mvn clean package \
&& mkdir -p /usr/local/jar \
&& cp /usr/local/jmeos/jar/*.jar /usr/local/jar/

Expand All @@ -66,7 +66,7 @@ COPY src /build/src
COPY pom.xml /build/pom.xml
RUN mkdir -p /build/jar && cp /usr/local/jar/JMEOS.jar /build/jar/JMEOS.jar
RUN cd /build \
&& mvn clean package -DskipTests -DqueryMainClass="aisdata.Query8_V2_Main" -q \
&& mvn clean package -DqueryMainClass="aisdata.Query8_V2_Main" -q \
&& mkdir -p /app \
&& cp target/flink-kafka2postgres-1.0-SNAPSHOT.jar /app/flink-kafka2postgres.jar

Expand Down
4 changes: 2 additions & 2 deletions benchmark/run_query.sh
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ restore_q8_files() {
trap 'restore_q8_files; rm -f "$TMP_DOCKERFILE" 2>/dev/null || true' EXIT

echo ""
info "Step 1/3: Build Maven (mvn clean package -DskipTests) ..."
info "Step 1/3: Build Maven (mvn clean package) ..."

if [[ "$QUERY_NUM" != "8" ]]; then
info "Temporarily masking Query8 files (temporal_ext_kalman_filter not available before the patch)..."
Expand All @@ -133,7 +133,7 @@ if [[ "$QUERY_NUM" != "8" ]]; then
fi
fi

if ! mvn clean package -DskipTests -DqueryMainClass="${CLASS}" -q; then
if ! mvn clean package -DqueryMainClass="${CLASS}" -q; then
error "Maven build failed."
exit 1
fi
Expand Down
5 changes: 3 additions & 2 deletions tools/refresh.conf
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# refresh.conf — MobilityFlink's last leg for tools/refresh-jvm-chain.sh (in MEOS-API).
# The chain (MobilityDB -> catalog + libmeos -> JMEOS jar) is shared; only these differ per
# consumer. BUILD_CMD runs from <repo>/<BUILD_DIR> with $PREFIX (the libmeos install prefix),
# $CATALOG and $JAR exported; $SKIP_TESTS is set when --skip-tests is passed.
# $CATALOG and $JAR exported. The suite always runs: it is what tells a regenerated
# surface from a merely well-formed one.
ENGINE=flink
BUILD_DIR=.
JMEOS_COORDS=org.jmeos:meos:1.0
GENERATOR_DEST=tools
BUILD_CMD='LD_LIBRARY_PATH="$PREFIX/lib" mvn -B -Dmeos.lib.dir="$PREFIX/lib" -Dmeos.enabled=true ${SKIP_TESTS:+-DskipTests} clean test'
BUILD_CMD='LD_LIBRARY_PATH="$PREFIX/lib" mvn -B -Dmeos.lib.dir="$PREFIX/lib" -Dmeos.enabled=true clean test'
Loading