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
2 changes: 1 addition & 1 deletion benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-ffi</artifactId>
<version>2.1.10</version>
<version>${jnr.version}</version>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
Expand Down
2 changes: 0 additions & 2 deletions benchmark/src/main/java/aisdata/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@

public class Main {
private static final Logger logger = LoggerFactory.getLogger(Main.class);
static error_handler_fn errorHandler = new error_handler();
private STBox stbx;

public static void main(String[] args) throws Exception {
Expand All @@ -63,7 +62,6 @@ public static void main(String[] args) throws Exception {
try {
logger.info("Initializing MEOS library");
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(errorHandler);

final StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
env.setParallelism(1);
Expand Down
6 changes: 0 additions & 6 deletions benchmark/src/main/java/aisdata/Query1_Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@

import jnr.ffi.Pointer;
import functions.GeneratedFunctions;
import functions.error_handler;
import functions.error_handler_fn;

/**
* Query 1 - High-Risk Zone Proximity Monitoring
Expand Down Expand Up @@ -166,7 +164,6 @@ public static void main(String[] args) throws Exception {
try {
logger.info("Initializing MEOS library");
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(new error_handler());

final StreamExecutionEnvironment env =
StreamExecutionEnvironment.getExecutionEnvironment();
Expand Down Expand Up @@ -260,7 +257,6 @@ public static class HighRiskZoneWindowFunction

private transient Pointer[] hazardZones;

private transient error_handler_fn errorHandler;

private static final DateTimeFormatter TIMESTAMP_FMT =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssxxx");
Expand All @@ -274,9 +270,7 @@ public HighRiskZoneWindowFunction(String[] zoneWkt, double distanceMeters) {
@Override
public void open(OpenContext parameters) throws Exception {
super.open(parameters);
errorHandler = new error_handler();
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(errorHandler);
// Parse the INPolygons only once per worker.
// geog_in(wkt, -1) creates a geography type (SRID=4326), so
// edwithin_tgeo_geo computes distances geodetically in metres - consistent
Expand Down
6 changes: 0 additions & 6 deletions benchmark/src/main/java/aisdata/Query2_Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

import jnr.ffi.Pointer;
import functions.GeneratedFunctions;
import functions.error_handler;
import functions.error_handler_fn;

/**
* Query 2 - Brake System Monitoring
Expand Down Expand Up @@ -169,7 +167,6 @@ public static void main(String[] args) throws Exception {
try {
logger.info("Initializing MEOS library");
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(new error_handler());

final StreamExecutionEnvironment env =
StreamExecutionEnvironment.getExecutionEnvironment();
Expand Down Expand Up @@ -289,7 +286,6 @@ public static class BrakeMonitoringWindowFunction

private transient Pointer[] maintenanceZones;

private transient error_handler_fn errorHandler;

private static final DateTimeFormatter TIMESTAMP_FMT =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssxxx");
Expand All @@ -307,9 +303,7 @@ public BrakeMonitoringWindowFunction(
@Override
public void open(OpenContext parameters) throws Exception {
super.open(parameters);
errorHandler = new error_handler();
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(errorHandler);
// Parse the maintenance area polygons only once per worker.
// geog_in(wkt, -1) creates a geography type (SRID=4326 implicit), consistent
// with the tgeogpoint created by tgeogpoint_in below.
Expand Down
6 changes: 0 additions & 6 deletions benchmark/src/main/java/aisdata/Query3_Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@

import jnr.ffi.Pointer;
import functions.GeneratedFunctions;
import functions.error_handler;
import functions.error_handler_fn;

/**
* Query 3 - Trajectory Creation
Expand Down Expand Up @@ -99,7 +97,6 @@ public static void main(String[] args) throws Exception {
try {
logger.info("Initializing MEOS library");
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(new error_handler());

final StreamExecutionEnvironment env =
StreamExecutionEnvironment.getExecutionEnvironment();
Expand Down Expand Up @@ -181,7 +178,6 @@ public static class TrajectoryCreationWindowFunction
private static final Logger log =
LoggerFactory.getLogger(TrajectoryCreationWindowFunction.class);

private transient error_handler_fn errorHandler;

private static final DateTimeFormatter TIMESTAMP_FMT =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssxxx");
Expand All @@ -190,9 +186,7 @@ public static class TrajectoryCreationWindowFunction
@Override
public void open(OpenContext parameters) throws Exception {
super.open(parameters);
errorHandler = new error_handler();
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(errorHandler);
log.info("MEOS initialized in TrajectoryCreationWindowFunction.open()");
}

Expand Down
6 changes: 0 additions & 6 deletions benchmark/src/main/java/aisdata/Query4_Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

import jnr.ffi.Pointer;
import functions.GeneratedFunctions;
import functions.error_handler;
import functions.error_handler_fn;

/**
* Query 4 - Trajectory Creation in a Restricted Space
Expand Down Expand Up @@ -150,7 +148,6 @@ public static void main(String[] args) throws Exception {
try {
logger.info("Initializing MEOS library");
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(new error_handler());

final StreamExecutionEnvironment env =
StreamExecutionEnvironment.getExecutionEnvironment();
Expand Down Expand Up @@ -243,7 +240,6 @@ public static class RestrictedTrajectoryWindowFunction
private transient Pointer stbox;

/** Initialised in {@link #open}: Pointer is not serialisable. */
private transient error_handler_fn errorHandler;

private static final DateTimeFormatter TIMESTAMP_FMT =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssxxx");
Expand All @@ -267,9 +263,7 @@ public RestrictedTrajectoryWindowFunction(
@Override
public void open(OpenContext parameters) throws Exception {
super.open(parameters);
errorHandler = new error_handler();
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(errorHandler);

// stbox_make parameters:
// hasx=true → include spatial (XY) dimensions
Expand Down
6 changes: 0 additions & 6 deletions benchmark/src/main/java/aisdata/Query5_Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

import jnr.ffi.Pointer;
import functions.GeneratedFunctions;
import functions.error_handler;
import functions.error_handler_fn;

/**
* Query 5 - Trajectory Creation and High-Speed Alert
Expand Down Expand Up @@ -169,7 +167,6 @@ public static void main(String[] args) throws Exception {
try {
logger.info("Initializing MEOS library");
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(new error_handler());

final StreamExecutionEnvironment env =
StreamExecutionEnvironment.getExecutionEnvironment();
Expand Down Expand Up @@ -269,7 +266,6 @@ public static class HighSpeedAlertWindowFunction
private final double minSpeedThresholdMs;

/** Initialised in {@link #open} since Pointer is not serialisable. */
private transient error_handler_fn errorHandler;

/**
* Geofence polygon pointer, parsed once in {@link #open} for reuse across all windows.
Expand Down Expand Up @@ -298,9 +294,7 @@ public HighSpeedAlertWindowFunction(
@Override
public void open(OpenContext parameters) throws Exception {
super.open(parameters);
errorHandler = new error_handler();
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(errorHandler);

// geog_in(wkt, -1) → SRID=4326 geography, consistent with tgeogpoint_in.
geofence = GeneratedFunctions.geog_in(geofenceWkt, -1);
Expand Down
5 changes: 0 additions & 5 deletions benchmark/src/main/java/aisdata/Query6_Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

import jnr.ffi.Pointer;
import functions.GeneratedFunctions;
import functions.error_handler;

/**
* Query 6 - Positional Divergence for a Device
Expand Down Expand Up @@ -109,7 +108,6 @@ public static void main(String[] args) throws Exception {
try {
logger.info("Initializing MEOS library");
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(new error_handler());

final StreamExecutionEnvironment env =
StreamExecutionEnvironment.getExecutionEnvironment();
Expand Down Expand Up @@ -205,14 +203,11 @@ public static class NearestApproachJoinFunction extends RichJoinFunction<AISData
private static final DateTimeFormatter TIMESTAMP_FMT =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssxxx");

private transient error_handler errorHandler;

@Override
public void open(OpenContext parameters) throws Exception {
super.open(parameters);
errorHandler = new error_handler();
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(errorHandler);
}

@Override
Expand Down
5 changes: 0 additions & 5 deletions benchmark/src/main/java/aisdata/Query7_Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

import jnr.ffi.Pointer;
import functions.GeneratedFunctions;
import functions.error_handler;

/**
* Query 7 - Global Closest Device Pairs (Top-k Closest Pairs)
Expand Down Expand Up @@ -119,7 +118,6 @@ public static void main(String[] args) throws Exception {
try {
logger.info("Initializing MEOS library");
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(new error_handler());

final StreamExecutionEnvironment env =
StreamExecutionEnvironment.getExecutionEnvironment();
Expand Down Expand Up @@ -226,14 +224,11 @@ public ClosestPairsCoGroupFunction(int topK) {
this.topK = topK;
}

private transient error_handler errorHandler;

@Override
public void open(OpenContext parameters) throws Exception {
super.open(parameters);
errorHandler = new error_handler();
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(errorHandler);
}

/**
Expand Down
3 changes: 0 additions & 3 deletions benchmark/src/main/java/aisdata/Query8_Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@

import jnr.ffi.Pointer;
import functions.GeneratedFunctions;
import functions.error_handler;

/**
* Query 8 - Trajectory "Denoising" with Extended Kalman Filter (AIS dataset)
Expand Down Expand Up @@ -175,7 +174,6 @@ public static void main(String[] args) throws Exception {
try {
logger.info("Initializing MEOS library");
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(new error_handler());

final StreamExecutionEnvironment env =
StreamExecutionEnvironment.getExecutionEnvironment();
Expand Down Expand Up @@ -302,7 +300,6 @@ public EKFWindowFunction(double gate, double q, double variance, boolean dropOut
public void open(OpenContext parameters) throws Exception {
super.open(parameters);
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(new error_handler());
}

/**
Expand Down
6 changes: 0 additions & 6 deletions benchmark/src/main/java/aisdata/Query8_V2_Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
import org.slf4j.LoggerFactory;

import functions.GeneratedFunctions;
import functions.error_handler;
import functions.error_handler_fn;
import types.temporal.TInterpolation;

/**
Expand Down Expand Up @@ -64,7 +62,6 @@ public static void main(String[] args) throws Exception {

try {
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(new error_handler());

final StreamExecutionEnvironment env =
StreamExecutionEnvironment.getExecutionEnvironment();
Expand Down Expand Up @@ -112,7 +109,6 @@ public static class MeosEkfWindowFunction
private final double r;
private final boolean dropOutliers;

private transient error_handler_fn errorHandler;

public MeosEkfWindowFunction(double gate, double q, double r, boolean dropOutliers) {
this.gate = gate;
Expand All @@ -124,9 +120,7 @@ public MeosEkfWindowFunction(double gate, double q, double r, boolean dropOutlie
@Override
public void open(OpenContext parameters) throws Exception {
super.open(parameters);
errorHandler = new error_handler();
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(errorHandler);
}

@Override
Expand Down
5 changes: 0 additions & 5 deletions benchmark/src/main/java/aisdata/Query9_Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

import jnr.ffi.Pointer;
import functions.GeneratedFunctions;
import functions.error_handler;

/**
* Query 9 - Windowed Per-Device kNN Join
Expand Down Expand Up @@ -96,7 +95,6 @@ public static void main(String[] args) throws Exception {

try {
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(new error_handler());

final StreamExecutionEnvironment env =
StreamExecutionEnvironment.getExecutionEnvironment();
Expand Down Expand Up @@ -198,14 +196,11 @@ public KnnCoGroupFunction(int k) {
this.k = k;
}

private transient error_handler errorHandler;

@Override
public void open(OpenContext parameters) throws Exception {
super.open(parameters);
errorHandler = new error_handler();
GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(errorHandler);
}

@Override
Expand Down
3 changes: 0 additions & 3 deletions benchmark/src/main/java/aisdata/TrajectoryWindowFunction.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,13 @@ public class TrajectoryWindowFunction extends
ProcessWindowFunction<Tuple4<Integer, Double, Double, Long>, TGeomPointSeq, Integer, TimeWindow> {

private static final Logger logger = LoggerFactory.getLogger(TrajectoryWindowFunction.class);
private transient error_handler_fn errorHandler; // Non-static and transient
// private int count = 0; // count variable seems unused, can be removed if not needed

@Override
public void open(OpenContext parameters) throws Exception {
super.open(parameters);
errorHandler = new error_handler(); // Initialize error handler here

GeneratedFunctions.meos_initialize_timezone("UTC");
GeneratedFunctions.meos_initialize_error_handler(errorHandler);
logger.info("MEOS initialized in TrajectoryWindowFunction.open()");
}

Expand Down
2 changes: 0 additions & 2 deletions benchmark/src/main/java/berlinmod/BerlinMODCorpus.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

import functions.GeneratedFunctions;
import jnr.ffi.Pointer;
import org.mobilitydb.flink.meos.wirings.MeosWiringRuntime;

import java.nio.file.Files;
import java.nio.file.Paths;
Expand Down Expand Up @@ -92,7 +91,6 @@ public static final class Params {
* (columns {@code tripid,vehid,day,seqno,geom,t}), reprojected 3857→4326
* through MEOS, sorted by timestamp. {@code maxRows <= 0} loads all rows. */
public static List<BerlinMODTrip> fromInstantsCsv(String path, int maxRows) throws Exception {
MeosWiringRuntime.ensureInitializedOnThread();
List<BerlinMODTrip> events = new ArrayList<>();
try (Stream<String> lines = Files.lines(Paths.get(path))) {
java.util.Iterator<String> it = lines.iterator();
Expand Down
Loading
Loading