[SEDONA-349] Drop rarely used constructors and their tests in Java (#954

)
apache · Aug 10, 2023 · 9428bca · 9428bca
1 parent fcd91ba
commit 9428bca
Show file tree

Hide file tree

Showing 72 changed files with 283 additions and 4,552 deletions.
diff --git a/R/tests/testthat/test-data-interface.R b/R/tests/testthat/test-data-interface.R
@@ -35,8 +35,7 @@ test_rdd_with_non_spatial_attrs <- invoke_new(
   1L, # offset
   sc$state$enums$delimiter$csv,
   TRUE,
-  1L, # numPartitions
-  sc$state$object_cache$storage_levels$memory_only
+  1L # numPartitions
 ) %>%
   apache.sedona:::new_spatial_rdd("point")
 
@@ -575,8 +574,7 @@ test_that("sedona_write_wkb() works as expected", {
     0L, # offset
     sc$state$enums$delimiter$wkb,
     TRUE,
-    1L, # numPartitions
-    sc$state$object_cache$storage_levels$memory_only
+    1L # numPartitions
   )
 
   expect_result_matches_original(pt_rdd)
@@ -593,8 +591,7 @@ test_that("sedona_write_wkt() works as expected", {
     0L, # offset
     sc$state$enums$delimiter$wkt,
     TRUE,
-    1L, # numPartitions
-    sc$state$object_cache$storage_levels$memory_only
+    1L # numPartitions
   )
 
   expect_result_matches_original(pt_rdd)
@@ -611,8 +608,7 @@ test_that("sedona_write_geojson() works as expected", {
     0L, # offset
     sc$state$enums$delimiter$geojson,
     TRUE,
-    1L, # numPartitions
-    sc$state$object_cache$storage_levels$memory_only
+    1L # numPartitions
   )
 
   expect_result_matches_original_geojson(pt_rdd)

diff --git a/core/src/main/java/org/apache/sedona/core/showcase/EarthdataMapperRunnableExample.java b/core/src/main/java/org/apache/sedona/core/showcase/EarthdataMapperRunnableExample.java
@@ -143,7 +143,8 @@ public static void testSpatialRangeQuery()
     {
         EarthdataHDFPointMapper earthdataHDFPoint = new EarthdataHDFPointMapper(HDFIncrement, HDFOffset, HDFRootGroupName,
                 HDFDataVariableList, HDFDataVariableName, urlPrefix);
-        PointRDD spatialRDD = new PointRDD(sc, InputLocation, numPartitions, earthdataHDFPoint, StorageLevel.MEMORY_ONLY());
+        PointRDD spatialRDD = new PointRDD(sc, InputLocation, numPartitions, earthdataHDFPoint);
+        spatialRDD.rawSpatialRDD.persist(StorageLevel.MEMORY_ONLY());
         for (int i = 0; i < loopTimes; i++) {
             long resultSize;
             try {
@@ -164,14 +165,15 @@ public static void testSpatialRangeQueryUsingIndex()
     {
         EarthdataHDFPointMapper earthdataHDFPoint = new EarthdataHDFPointMapper(HDFIncrement, HDFOffset, HDFRootGroupName,
                 HDFDataVariableList, HDFDataVariableName, urlPrefix);
-        PointRDD spatialRDD = new PointRDD(sc, InputLocation, numPartitions, earthdataHDFPoint, StorageLevel.MEMORY_ONLY());
+        PointRDD spatialRDD = new PointRDD(sc, InputLocation, numPartitions, earthdataHDFPoint);
         try {
             spatialRDD.buildIndex(IndexType.RTREE, false);
         }
         catch (Exception e1) {
             // TODO Auto-generated catch block
             e1.printStackTrace();
         }
+        spatialRDD.indexedRawRDD.persist(StorageLevel.MEMORY_ONLY());
         for (int i = 0; i < loopTimes; i++) {
             try {
                 long resultSize;

diff --git a/core/src/main/java/org/apache/sedona/core/showcase/Example.java b/core/src/main/java/org/apache/sedona/core/showcase/Example.java
@@ -191,8 +191,6 @@ public static void main(String[] args)
             testSpatialJoinQueryUsingIndex();
             testDistanceJoinQuery();
             testDistanceJoinQueryUsingIndex();
-            testCRSTransformationSpatialRangeQuery();
-            testCRSTransformationSpatialRangeQueryUsingIndex();
             testLoadShapefileIntoPolygonRDD();
         }
         catch (Exception e) {
@@ -212,7 +210,7 @@ public static void main(String[] args)
     public static void testSpatialRangeQuery()
             throws Exception
     {
-        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true, StorageLevel.MEMORY_ONLY());
+        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true);
         objectRDD.rawSpatialRDD.persist(StorageLevel.MEMORY_ONLY());
         for (int i = 0; i < eachQueryLoopTimes; i++) {
             long resultSize = RangeQuery.SpatialRangeQuery(objectRDD, rangeQueryWindow, false, false).count();
@@ -228,7 +226,7 @@ public static void testSpatialRangeQuery()
     public static void testSpatialRangeQueryUsingIndex()
             throws Exception
     {
-        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true, StorageLevel.MEMORY_ONLY());
+        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true);
         objectRDD.buildIndex(PointRDDIndexType, false);
         objectRDD.indexedRawRDD.persist(StorageLevel.MEMORY_ONLY());
         for (int i = 0; i < eachQueryLoopTimes; i++) {
@@ -245,7 +243,7 @@ public static void testSpatialRangeQueryUsingIndex()
     public static void testSpatialKnnQuery()
             throws Exception
     {
-        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true, StorageLevel.MEMORY_ONLY());
+        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true);
         objectRDD.rawSpatialRDD.persist(StorageLevel.MEMORY_ONLY());
         for (int i = 0; i < eachQueryLoopTimes; i++) {
             List<Point> result = KNNQuery.SpatialKnnQuery(objectRDD, kNNQueryPoint, 1000, false);
@@ -261,7 +259,7 @@ public static void testSpatialKnnQuery()
     public static void testSpatialKnnQueryUsingIndex()
             throws Exception
     {
-        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true, StorageLevel.MEMORY_ONLY());
+        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true);
         objectRDD.buildIndex(PointRDDIndexType, false);
         objectRDD.indexedRawRDD.persist(StorageLevel.MEMORY_ONLY());
         for (int i = 0; i < eachQueryLoopTimes; i++) {
@@ -279,7 +277,7 @@ public static void testSpatialJoinQuery()
             throws Exception
     {
         queryWindowRDD = new PolygonRDD(sc, PolygonRDDInputLocation, PolygonRDDStartOffset, PolygonRDDEndOffset, PolygonRDDSplitter, true);
-        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true, StorageLevel.MEMORY_ONLY());
+        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true);
 
         objectRDD.spatialPartitioning(joinQueryPartitioningType);
         queryWindowRDD.spatialPartitioning(objectRDD.getPartitioner());
@@ -301,7 +299,7 @@ public static void testSpatialJoinQueryUsingIndex()
             throws Exception
     {
         queryWindowRDD = new PolygonRDD(sc, PolygonRDDInputLocation, PolygonRDDStartOffset, PolygonRDDEndOffset, PolygonRDDSplitter, true);
-        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true, StorageLevel.MEMORY_ONLY());
+        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true);
 
         objectRDD.spatialPartitioning(joinQueryPartitioningType);
         queryWindowRDD.spatialPartitioning(objectRDD.getPartitioner());
@@ -325,7 +323,7 @@ public static void testSpatialJoinQueryUsingIndex()
     public static void testDistanceJoinQuery()
             throws Exception
     {
-        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true, StorageLevel.MEMORY_ONLY());
+        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true);
         CircleRDD queryWindowRDD = new CircleRDD(objectRDD, 0.1);
 
         objectRDD.spatialPartitioning(GridType.QUADTREE);
@@ -349,7 +347,7 @@ public static void testDistanceJoinQuery()
     public static void testDistanceJoinQueryUsingIndex()
             throws Exception
     {
-        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true, StorageLevel.MEMORY_ONLY());
+        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true);
         CircleRDD queryWindowRDD = new CircleRDD(objectRDD, 0.1);
 
         objectRDD.spatialPartitioning(GridType.QUADTREE);
@@ -366,39 +364,6 @@ public static void testDistanceJoinQueryUsingIndex()
         }
     }
 
-    /**
-     * Test CRS transformation spatial range query.
-     *
-     * @throws Exception the exception
-     */
-    public static void testCRSTransformationSpatialRangeQuery()
-            throws Exception
-    {
-        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true, StorageLevel.MEMORY_ONLY(), "epsg:4326", "epsg:3005");
-        objectRDD.rawSpatialRDD.persist(StorageLevel.MEMORY_ONLY());
-        for (int i = 0; i < eachQueryLoopTimes; i++) {
-            long resultSize = RangeQuery.SpatialRangeQuery(objectRDD, rangeQueryWindow, false, false).count();
-            assert resultSize > -1;
-        }
-    }
-
-    /**
-     * Test CRS transformation spatial range query using index.
-     *
-     * @throws Exception the exception
-     */
-    public static void testCRSTransformationSpatialRangeQueryUsingIndex()
-            throws Exception
-    {
-        objectRDD = new PointRDD(sc, PointRDDInputLocation, PointRDDOffset, PointRDDSplitter, true, StorageLevel.MEMORY_ONLY(), "epsg:4326", "epsg:3005");
-        objectRDD.buildIndex(PointRDDIndexType, false);
-        objectRDD.indexedRawRDD.persist(StorageLevel.MEMORY_ONLY());
-        for (int i = 0; i < eachQueryLoopTimes; i++) {
-            long resultSize = RangeQuery.SpatialRangeQuery(objectRDD, rangeQueryWindow, false, true).count();
-            assert resultSize > -1;
-        }
-    }
-
     public static void testLoadShapefileIntoPolygonRDD()
             throws Exception
     {