rename memory module, split up tests for all modules

locationtech · Sep 17, 2024 · 073a768 · 073a768
1 parent 4a149be
commit 073a768
Show file tree

Hide file tree

Showing 39 changed files with 104 additions and 8 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -44,15 +44,111 @@ jobs:
       - name: Remove geomesa artifacts
         if: success() || failure()
         run: rm -rf ~/.m2/repository/org/locationtech/geomesa
-  accumulo-tests:
+  accumulo-ds-tests:
     needs: build-scala
     uses: ./.github/workflows/module-unit-tests.yml
     with:
       module-selector: -pl :geomesa-accumulo-datastore_${{ inputs.scala-version }}
       scala-version: ${{ inputs.scala-version }}
-  non-accumulo-tests:
+  accumulo-other-tests:
     needs: build-scala
     uses: ./.github/workflows/module-unit-tests.yml
     with:
-      module-selector: -pl -:geomesa-accumulo-datastore_${{ inputs.scala-version }}
+      module-selector: -f geomesa-accumulo -pl -:geomesa-accumulo-datastore_${{ inputs.scala-version }}
+      scala-version: ${{ inputs.scala-version }}
+  arrow-tests:
+    needs: build-scala
+    uses: ./.github/workflows/module-unit-tests.yml
+    with:
+      module-selector: -f geomesa-arrow
+      scala-version: ${{ inputs.scala-version }}
+  cassandra-tests:
+    needs: build-scala
+    uses: ./.github/workflows/module-unit-tests.yml
+    with:
+      module-selector: -f geomesa-cassandra
+      scala-version: ${{ inputs.scala-version }}
+  convert-tests:
+    needs: build-scala
+    uses: ./.github/workflows/module-unit-tests.yml
+    with:
+      module-selector: -f geomesa-convert
+      scala-version: ${{ inputs.scala-version }}
+  cqengine-tests:
+    needs: build-scala
+    uses: ./.github/workflows/module-unit-tests.yml
+    with:
+      module-selector: -f geomesa-cqengine-parent
+      scala-version: ${{ inputs.scala-version }}
+  features-tests:
+    needs: build-scala
+    uses: ./.github/workflows/module-unit-tests.yml
+    with:
+      module-selector: -f geomesa-features
+      scala-version: ${{ inputs.scala-version }}
+  fs-tests:
+    needs: build-scala
+    uses: ./.github/workflows/module-unit-tests.yml
+    with:
+      module-selector: -f geomesa-fs
+      scala-version: ${{ inputs.scala-version }}
+  gt-tests:
+    needs: build-scala
+    uses: ./.github/workflows/module-unit-tests.yml
+    with:
+      module-selector: -f geomesa-gt
+      scala-version: ${{ inputs.scala-version }}
+  hbase-tests:
+    needs: build-scala
+    uses: ./.github/workflows/module-unit-tests.yml
+    with:
+      module-selector: -f geomesa-hbase
+      scala-version: ${{ inputs.scala-version }}
+  kafka-tests:
+    needs: build-scala
+    uses: ./.github/workflows/module-unit-tests.yml
+    with:
+      module-selector: -f geomesa-kafka
+      scala-version: ${{ inputs.scala-version }}
+  lambda-tests:
+    needs: build-scala
+    uses: ./.github/workflows/module-unit-tests.yml
+    with:
+      module-selector: -f geomesa-lambda
+      scala-version: ${{ inputs.scala-version }}
+  metrics-tests:
+    needs: build-scala
+    uses: ./.github/workflows/module-unit-tests.yml
+    with:
+      module-selector: -f geomesa-metrics
+      scala-version: ${{ inputs.scala-version }}
+  process-tests:
+    needs: build-scala
+    uses: ./.github/workflows/module-unit-tests.yml
+    with:
+      module-selector: -f geomesa-process
+      scala-version: ${{ inputs.scala-version }}
+  redis-tests:
+    needs: build-scala
+    uses: ./.github/workflows/module-unit-tests.yml
+    with:
+      module-selector: -f geomesa-redis
+      scala-version: ${{ inputs.scala-version }}
+  spark-tests:
+    needs: build-scala
+    uses: ./.github/workflows/module-unit-tests.yml
+    with:
+      module-selector: -f geomesa-spark
+      scala-version: ${{ inputs.scala-version }}
+  utils-tests:
+    needs: build-scala
+    uses: ./.github/workflows/module-unit-tests.yml
+    with:
+      module-selector: -f geomesa-utils-parent
+      scala-version: ${{ inputs.scala-version }}
+  other-tests:
+    needs: build-scala
+    uses: ./.github/workflows/module-unit-tests.yml
+    with:
+      module-selector: -pl geomesa-filter,geomesa-index-api,geomesa-jobs,geomesa-security,geomesa-tools,geomesa-z3
       scala-version: ${{ inputs.scala-version }}
diff --git a/docs/user/appendix/memory.rst b/docs/user/appendix/memory.rst
@@ -3,7 +3,7 @@
 In-Memory Indexing
 ==================
 
-The **geomesa-memory** module provides a in-memory cache of ``SimpleFeature``\ s that supports indexing and filtering,
+The **geomesa-cqengine** module provides a in-memory cache of ``SimpleFeature``\ s that supports indexing and filtering,
 using the `CQEngine <https://github.com/npgall/cqengine>`__ collection query engine. This is implemented by the
 ``GeoCQEngine`` class.
 

diff --git a/...memory/geomesa-cqengine-datastore/pom.xml → ...parent/geomesa-cqengine-datastore/pom.xml b/...memory/geomesa-cqengine-datastore/pom.xml → ...parent/geomesa-cqengine-datastore/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <artifactId>geomesa-memory_2.12</artifactId>
+        <artifactId>geomesa-cqengine-parent_2.12</artifactId>
         <groupId>org.locationtech.geomesa</groupId>
         <version>5.1.0-SNAPSHOT</version>
     </parent>

diff --git a/...org.geotools.api.data.DataStoreFactorySpi → ...org.geotools.api.data.DataStoreFactorySpi b/...org.geotools.api.data.DataStoreFactorySpi → ...org.geotools.api.data.DataStoreFactorySpi
diff --git a/...gine/datastore/GeoCQEngineDataStore.scala → ...gine/datastore/GeoCQEngineDataStore.scala b/...gine/datastore/GeoCQEngineDataStore.scala → ...gine/datastore/GeoCQEngineDataStore.scala
diff --git a/...tastore/GeoCQEngineDataStoreFactory.scala → ...tastore/GeoCQEngineDataStoreFactory.scala b/...tastore/GeoCQEngineDataStoreFactory.scala → ...tastore/GeoCQEngineDataStoreFactory.scala
diff --git a/...e/datastore/GeoCQEngineFeatureStore.scala → ...e/datastore/GeoCQEngineFeatureStore.scala b/...e/datastore/GeoCQEngineFeatureStore.scala → ...e/datastore/GeoCQEngineFeatureStore.scala
diff --git a/.../datastore/GeoCQEngineDataStoreTest.scala → .../datastore/GeoCQEngineDataStoreTest.scala b/.../datastore/GeoCQEngineDataStoreTest.scala → .../datastore/GeoCQEngineDataStoreTest.scala
diff --git a/...y/cqengine/datastore/SampleFeatures.scala → ...y/cqengine/datastore/SampleFeatures.scala b/...y/cqengine/datastore/SampleFeatures.scala → ...y/cqengine/datastore/SampleFeatures.scala
diff --git a/...ngine-datastore/src/test/shared-resources → ...ngine-datastore/src/test/shared-resources b/...ngine-datastore/src/test/shared-resources → ...ngine-datastore/src/test/shared-resources
diff --git a/geomesa-memory/geomesa-cqengine/pom.xml → ...-cqengine-parent/geomesa-cqengine/pom.xml b/geomesa-memory/geomesa-cqengine/pom.xml → ...-cqengine-parent/geomesa-cqengine/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <artifactId>geomesa-memory_2.12</artifactId>
+        <artifactId>geomesa-cqengine-parent_2.12</artifactId>
         <groupId>org.locationtech.geomesa</groupId>
         <version>5.1.0-SNAPSHOT</version>
     </parent>

diff --git a/...ine/attribute/SimpleFeatureAttribute.java → ...ine/attribute/SimpleFeatureAttribute.java b/...ine/attribute/SimpleFeatureAttribute.java → ...ine/attribute/SimpleFeatureAttribute.java
diff --git a/.../attribute/SimpleFeatureFidAttribute.java → .../attribute/SimpleFeatureFidAttribute.java b/.../attribute/SimpleFeatureFidAttribute.java → .../attribute/SimpleFeatureFidAttribute.java
diff --git a/...mory/cqengine/index/AbstractGeoIndex.java → ...mory/cqengine/index/AbstractGeoIndex.java b/...mory/cqengine/index/AbstractGeoIndex.java → ...mory/cqengine/index/AbstractGeoIndex.java
diff --git a/...memory/cqengine/index/BucketGeoIndex.java → ...memory/cqengine/index/BucketGeoIndex.java b/...memory/cqengine/index/BucketGeoIndex.java → ...memory/cqengine/index/BucketGeoIndex.java
diff --git a/...omesa/memory/cqengine/index/GeoIndex.java → ...omesa/memory/cqengine/index/GeoIndex.java b/...omesa/memory/cqengine/index/GeoIndex.java → ...omesa/memory/cqengine/index/GeoIndex.java
diff --git a/...a/memory/cqengine/index/GeoIndexType.java → ...a/memory/cqengine/index/GeoIndexType.java b/...a/memory/cqengine/index/GeoIndexType.java → ...a/memory/cqengine/index/GeoIndexType.java
diff --git a/...mory/cqengine/index/QuadTreeGeoIndex.java → ...mory/cqengine/index/QuadTreeGeoIndex.java b/...mory/cqengine/index/QuadTreeGeoIndex.java → ...mory/cqengine/index/QuadTreeGeoIndex.java
diff --git a/...emory/cqengine/index/STRtreeGeoIndex.java → ...emory/cqengine/index/STRtreeGeoIndex.java b/...emory/cqengine/index/STRtreeGeoIndex.java → ...emory/cqengine/index/STRtreeGeoIndex.java
diff --git a/...qengine/index/param/BucketIndexParam.java → ...qengine/index/param/BucketIndexParam.java b/...qengine/index/param/BucketIndexParam.java → ...qengine/index/param/BucketIndexParam.java
diff --git a/.../cqengine/index/param/GeoIndexParams.java → .../cqengine/index/param/GeoIndexParams.java b/.../cqengine/index/param/GeoIndexParams.java → .../cqengine/index/param/GeoIndexParams.java
diff --git a/...engine/index/param/STRtreeIndexParam.java → ...engine/index/param/STRtreeIndexParam.java b/...engine/index/param/STRtreeIndexParam.java → ...engine/index/param/STRtreeIndexParam.java
diff --git a/...y/cqengine/query/GeoToolsFilterQuery.java → ...y/cqengine/query/GeoToolsFilterQuery.java b/...y/cqengine/query/GeoToolsFilterQuery.java → ...y/cqengine/query/GeoToolsFilterQuery.java
diff --git a/...esa/memory/cqengine/query/Intersects.java → ...esa/memory/cqengine/query/Intersects.java b/...esa/memory/cqengine/query/Intersects.java → ...esa/memory/cqengine/query/Intersects.java
diff --git a/...geomesa/memory/cqengine/GeoCQEngine.scala → ...geomesa/memory/cqengine/GeoCQEngine.scala b/...geomesa/memory/cqengine/GeoCQEngine.scala → ...geomesa/memory/cqengine/GeoCQEngine.scala
diff --git a/...a/memory/cqengine/GeoCQIndexSupport.scala → ...a/memory/cqengine/GeoCQIndexSupport.scala b/...a/memory/cqengine/GeoCQIndexSupport.scala → ...a/memory/cqengine/GeoCQIndexSupport.scala
diff --git a/...esa/memory/cqengine/GeoIndexFactory.scala → ...esa/memory/cqengine/GeoIndexFactory.scala b/...esa/memory/cqengine/GeoIndexFactory.scala → ...esa/memory/cqengine/GeoIndexFactory.scala
diff --git a/...cqengine/utils/CQEngineQueryVisitor.scala → ...cqengine/utils/CQEngineQueryVisitor.scala b/...cqengine/utils/CQEngineQueryVisitor.scala → ...cqengine/utils/CQEngineQueryVisitor.scala
diff --git a/...a/memory/cqengine/utils/CQIndexType.scala → ...a/memory/cqengine/utils/CQIndexType.scala b/...a/memory/cqengine/utils/CQIndexType.scala → ...a/memory/cqengine/utils/CQIndexType.scala
diff --git a/.../memory/cqengine/utils/QueryBuilder.scala → .../memory/cqengine/utils/QueryBuilder.scala b/.../memory/cqengine/utils/QueryBuilder.scala → .../memory/cqengine/utils/QueryBuilder.scala
diff --git a/...memory/cqengine/utils/SFTAttributes.scala → ...memory/cqengine/utils/SFTAttributes.scala b/...memory/cqengine/utils/SFTAttributes.scala → ...memory/cqengine/utils/SFTAttributes.scala
diff --git a/...gine/utils/CQEngineQueryVisitorTest.scala → ...gine/utils/CQEngineQueryVisitorTest.scala b/...gine/utils/CQEngineQueryVisitorTest.scala → ...gine/utils/CQEngineQueryVisitorTest.scala
diff --git a/...qengine/utils/CQIndexingOptionsTest.scala → ...qengine/utils/CQIndexingOptionsTest.scala b/...qengine/utils/CQIndexingOptionsTest.scala → ...qengine/utils/CQIndexingOptionsTest.scala
diff --git a/...ne/utils/GeoCQEngineIndexChoiceTest.scala → ...ne/utils/GeoCQEngineIndexChoiceTest.scala b/...ne/utils/GeoCQEngineIndexChoiceTest.scala → ...ne/utils/GeoCQEngineIndexChoiceTest.scala
diff --git a/...mory/cqengine/utils/GeoCQEngineTest.scala → ...mory/cqengine/utils/GeoCQEngineTest.scala b/...mory/cqengine/utils/GeoCQEngineTest.scala → ...mory/cqengine/utils/GeoCQEngineTest.scala
diff --git a/...emory/cqengine/utils/SampleFeatures.scala → ...emory/cqengine/utils/SampleFeatures.scala b/...emory/cqengine/utils/SampleFeatures.scala → ...emory/cqengine/utils/SampleFeatures.scala
diff --git a/...eomesa-cqengine/src/test/shared-resources → ...eomesa-cqengine/src/test/shared-resources b/...eomesa-cqengine/src/test/shared-resources → ...eomesa-cqengine/src/test/shared-resources
diff --git a/geomesa-memory/pom.xml → geomesa-cqengine-parent/pom.xml b/geomesa-memory/pom.xml → geomesa-cqengine-parent/pom.xml
@@ -8,7 +8,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>geomesa-memory_2.12</artifactId>
+    <artifactId>geomesa-cqengine-parent_2.12</artifactId>
     <name>GeoMesa In-Memory Database</name>
     <packaging>pom</packaging>
 

diff --git a/pom.xml b/pom.xml
@@ -26,6 +26,7 @@
         <module>geomesa-arrow</module>
         <module>geomesa-cassandra</module>
         <module>geomesa-convert</module>
+        <module>geomesa-cqengine-parent</module>
         <module>geomesa-features</module>
         <module>geomesa-filter</module>
         <module>geomesa-fs</module>
@@ -35,7 +36,6 @@
         <module>geomesa-jobs</module>
         <module>geomesa-kafka</module>
         <module>geomesa-lambda</module>
-        <module>geomesa-memory</module>
         <module>geomesa-metrics</module>
         <module>geomesa-process</module>
         <module>geomesa-redis</module>