GEOMESA-3424 Update to Arrow 18.1.0 (#3242)

locationtech · Dec 4, 2024 · 0d693d4 · 0d693d4
1 parent 253b1b3
commit 0d693d4
Show file tree

Hide file tree

Showing 17 changed files with 218 additions and 46 deletions.
diff --git a/build/cqs.tsv b/build/cqs.tsv
@@ -149,11 +149,11 @@ org.apache.accumulo:accumulo-core	2.0.1	compile
 org.apache.accumulo:accumulo-core	2.1.3	compile
 org.apache.accumulo:accumulo-hadoop-mapreduce	2.0.1	compile
 org.apache.accumulo:accumulo-hadoop-mapreduce	2.1.3	compile
-org.apache.arrow:arrow-format	17.0.0	compile
-org.apache.arrow:arrow-memory-core	17.0.0	compile
-org.apache.arrow:arrow-memory-netty	17.0.0	compile
-org.apache.arrow:arrow-memory-netty-buffer-patch	17.0.0	compile
-org.apache.arrow:arrow-vector	17.0.0	compile
+org.apache.arrow:arrow-format	18.1.0	compile
+org.apache.arrow:arrow-memory-core	18.1.0	compile
+org.apache.arrow:arrow-memory-netty	18.1.0	compile
+org.apache.arrow:arrow-memory-netty-buffer-patch	18.1.0	compile
+org.apache.arrow:arrow-vector	18.1.0	compile
 org.apache.avro:avro	1.11.4	compile
 org.apache.commons:commons-collections4	4.4	compile
 org.apache.commons:commons-compress	1.26.0	compile
@@ -324,7 +324,7 @@ com.uber:h3	4.1.1	test
 commons-lang:commons-lang	2.6	test
 junit:junit	4.13.2	test
 org.apache.accumulo:accumulo-test	2.1.3	test
-org.apache.arrow:arrow-vector	tests:17.0.0	test
+org.apache.arrow:arrow-vector	tests:18.1.0	test
 org.apache.cassandra:cassandra-all	3.11.14	test
 org.apache.cassandra:cassandra-thrift	3.11.14	test
 org.apache.curator:curator-test	5.6.0	test

diff --git a/docs/user/geoserver.rst b/docs/user/geoserver.rst
@@ -23,6 +23,8 @@ although this may occasionally cause errors as GeoServer does not follow semanti
 +-------------------+-------------------+
 | GeoMesa Version   | GeoServer Version |
 +===================+===================+
+| 5.2.0             | 2.26.1            |
++-------------------+-------------------+
 | 5.1.0             | 2.26.0            |
 +-------------------+-------------------+
 | 5.0.0             | 2.24.2            |

diff --git a/docs/user/upgrade.rst b/docs/user/upgrade.rst
@@ -98,6 +98,7 @@ Dependency Version Upgrades
 
 The following dependencies have been upgraded:
 
+* arrow ``17.0.0`` -> ``18.1.0``
 * geotools ``32.0`` -> ``32.1``
 * hbase ``2.5.8-hadoop3`` -> ``2.6.1-hadoop3``
 * hadoop ``3.4.0`` -> ``3.4.1``

diff --git a/...esa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/LineStringFloatVector.java b/...esa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/LineStringFloatVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractLineStringVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -24,11 +23,25 @@ public class LineStringFloatVector extends AbstractLineStringVector<Float4Vector
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_FLOAT_LIST;
 
-  public LineStringFloatVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public LineStringFloatVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public LineStringFloatVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public LineStringFloatVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 

diff --git a/.../geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/LineStringVector.java b/.../geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/LineStringVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractLineStringVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -27,11 +26,25 @@ public class LineStringVector extends AbstractLineStringVector<Float8Vector> {
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_DOUBLE_LIST;
 
-  public LineStringVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public LineStringVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public LineStringVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public LineStringVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 

diff --git a/...rrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiLineStringFloatVector.java b/...rrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiLineStringFloatVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractMultiLineStringVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -24,11 +23,25 @@ public class MultiLineStringFloatVector extends AbstractMultiLineStringVector<Fl
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_FLOAT_LIST_2;
 
-  public MultiLineStringFloatVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public MultiLineStringFloatVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public MultiLineStringFloatVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public MultiLineStringFloatVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 

diff --git a/...esa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiLineStringVector.java b/...esa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiLineStringVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractMultiLineStringVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -27,11 +26,25 @@ public class MultiLineStringVector extends AbstractMultiLineStringVector<Float8V
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_DOUBLE_LIST_2;
 
-  public MultiLineStringVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public MultiLineStringVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public MultiLineStringVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public MultiLineStringVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 

diff --git a/...esa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPointFloatVector.java b/...esa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPointFloatVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractMultiPointVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -24,11 +23,25 @@ public class MultiPointFloatVector extends AbstractMultiPointVector<Float4Vector
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_FLOAT_LIST;
 
-  public MultiPointFloatVector(String name, BufferAllocator allocator,@Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public MultiPointFloatVector(String name, BufferAllocator allocator,Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public MultiPointFloatVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public MultiPointFloatVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 

diff --git a/.../geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPointVector.java b/.../geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPointVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractMultiPointVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -27,11 +26,25 @@ public class MultiPointVector extends AbstractMultiPointVector<Float8Vector> {
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_DOUBLE_LIST;
 
-  public MultiPointVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public MultiPointVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public MultiPointVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public MultiPointVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 

diff --git a/...a-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPolygonFloatVector.java b/...a-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPolygonFloatVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractMultiPolygonVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -24,11 +23,25 @@ public class MultiPolygonFloatVector extends AbstractMultiPolygonVector<Float4Ve
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_FLOAT_LIST_3;
 
-  public MultiPolygonFloatVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public MultiPolygonFloatVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public MultiPolygonFloatVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public MultiPolygonFloatVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 

diff --git a/...eomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPolygonVector.java b/...eomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/MultiPolygonVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractMultiPolygonVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -27,11 +26,25 @@ public class MultiPolygonVector extends AbstractMultiPolygonVector<Float8Vector>
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_DOUBLE_LIST_3;
 
-  public MultiPolygonVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public MultiPolygonVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public MultiPolygonVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public MultiPolygonVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }
 

diff --git a/.../geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PointFloatVector.java b/.../geomesa-arrow-jts/src/main/java/org/locationtech/geomesa/arrow/jts/PointFloatVector.java
@@ -15,7 +15,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.locationtech.geomesa.arrow.jts.impl.AbstractPointVector;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -24,11 +23,25 @@ public class PointFloatVector extends AbstractPointVector<Float4Vector> {
   // fields created by this vector
   public static final List<Field> fields = GeometryFields.XY_FLOAT;
 
-  public PointFloatVector(String name, BufferAllocator allocator, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param allocator allocator for the vector
+   * @param metadata metadata (may be null)
+   */
+  public PointFloatVector(String name, BufferAllocator allocator, Map<String, String> metadata) {
     super(name, allocator, metadata);
   }
 
-  public PointFloatVector(String name, AbstractContainerVector container, @Nullable Map<String, String> metadata) {
+  /**
+   * Constructor
+   *
+   * @param name name of the vector
+   * @param container parent container
+   * @param metadata metadata (may be null)
+   */
+  public PointFloatVector(String name, AbstractContainerVector container, Map<String, String> metadata) {
     super(name, container, metadata);
   }