From 11bbf9d85919e08e9dc43ff1225790ac898bd155 Mon Sep 17 00:00:00 2001
From: Grigory Pomadchin <gr.pomadchin@gmail.com>
Date: Sat, 9 Apr 2022 14:26:54 -0400
Subject: [PATCH] Rename the pushdown rules package to avoid possible future
 conflicts

---
 .../spatial/rules/SpatialFilterPushdownRules.scala              | 2 +-
 .../sql/hive/{hiveless => carto}/spatial/rules/package.scala    | 2 +-
 .../scala/com/carto/analyticstoolbox/HiveTestEnvironment.scala  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename core/src/main/scala/org/apache/spark/sql/hive/{hiveless => carto}/spatial/rules/SpatialFilterPushdownRules.scala (97%)
 rename core/src/main/scala/org/apache/spark/sql/hive/{hiveless => carto}/spatial/rules/package.scala (95%)

diff --git a/core/src/main/scala/org/apache/spark/sql/hive/hiveless/spatial/rules/SpatialFilterPushdownRules.scala b/core/src/main/scala/org/apache/spark/sql/hive/carto/spatial/rules/SpatialFilterPushdownRules.scala
similarity index 97%
rename from core/src/main/scala/org/apache/spark/sql/hive/hiveless/spatial/rules/SpatialFilterPushdownRules.scala
rename to core/src/main/scala/org/apache/spark/sql/hive/carto/spatial/rules/SpatialFilterPushdownRules.scala
index 3890f1a..cba231a 100644
--- a/core/src/main/scala/org/apache/spark/sql/hive/hiveless/spatial/rules/SpatialFilterPushdownRules.scala
+++ b/core/src/main/scala/org/apache/spark/sql/hive/carto/spatial/rules/SpatialFilterPushdownRules.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql.hive.hiveless.spatial.rules
+package org.apache.spark.sql.hive.carto.spatial.rules
 
 import com.carto.analyticstoolbox.core._
 import com.carto.analyticstoolbox.index.ST_IntersectsExtent
diff --git a/core/src/main/scala/org/apache/spark/sql/hive/hiveless/spatial/rules/package.scala b/core/src/main/scala/org/apache/spark/sql/hive/carto/spatial/rules/package.scala
similarity index 95%
rename from core/src/main/scala/org/apache/spark/sql/hive/hiveless/spatial/rules/package.scala
rename to core/src/main/scala/org/apache/spark/sql/hive/carto/spatial/rules/package.scala
index e980eb3..b470dd4 100644
--- a/core/src/main/scala/org/apache/spark/sql/hive/hiveless/spatial/rules/package.scala
+++ b/core/src/main/scala/org/apache/spark/sql/hive/carto/spatial/rules/package.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql.hive.hiveless.spatial
+package org.apache.spark.sql.hive.carto.spatial
 
 import org.apache.spark.sql.catalyst.expressions.{And, Expression}
 import org.apache.spark.sql.hive.HiveGenericUDF
diff --git a/core/src/test/scala/com/carto/analyticstoolbox/HiveTestEnvironment.scala b/core/src/test/scala/com/carto/analyticstoolbox/HiveTestEnvironment.scala
index 6e1ab82..e6237db 100644
--- a/core/src/test/scala/com/carto/analyticstoolbox/HiveTestEnvironment.scala
+++ b/core/src/test/scala/com/carto/analyticstoolbox/HiveTestEnvironment.scala
@@ -19,7 +19,7 @@ package com.carto.analyticstoolbox
 import geotrellis.spark.testkit.TestEnvironment
 import org.apache.spark.SparkConf
 import org.apache.spark.serializer.KryoSerializer
-import org.apache.spark.sql.hive.hiveless.spatial.rules.SpatialFilterPushdownRules
+import org.apache.spark.sql.hive.carto.spatial.rules.SpatialFilterPushdownRules
 import org.apache.spark.sql.{SQLContext, SparkSession}
 import org.scalatest.{BeforeAndAfterAll, Suite}