Fix compilation issues in calcite module

Author: bchapuis

baremaps-calcite/src/main/java/org/apache/baremaps/calcite2/BaremapsDdlExecutor.java renamed to baremaps-calcite/src/main/java/org/apache/baremaps/calcite/BaremapsDdlExecutor.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.calcite2;
+package org.apache.baremaps.calcite;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
@@ -26,8 +26,8 @@
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.*;
-import org.apache.baremaps.calcite2.data.DataMaterializedView;
-import org.apache.baremaps.calcite2.data.DataModifiableTable;
+import org.apache.baremaps.calcite.data.DataMaterializedView;
+import org.apache.baremaps.calcite.data.DataModifiableTable;
 import org.apache.calcite.adapter.java.JavaTypeFactory;
 import org.apache.calcite.adapter.jdbc.JdbcSchema;
 import org.apache.calcite.avatica.AvaticaUtils;

baremaps-calcite/src/main/java/org/apache/baremaps/calcite2/BaremapsTableFactory.java renamed to baremaps-calcite/src/main/java/org/apache/baremaps/calcite/BaremapsTableFactory.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.calcite2;
+package org.apache.baremaps.calcite;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -27,16 +27,16 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Map;
-import org.apache.baremaps.calcite2.csv.CsvTable;
-import org.apache.baremaps.calcite2.data.DataModifiableTable;
-import org.apache.baremaps.calcite2.data.DataRow;
-import org.apache.baremaps.calcite2.data.DataRowType;
-import org.apache.baremaps.calcite2.data.DataSchema;
-import org.apache.baremaps.calcite2.flatgeobuf.FlatGeoBufTable;
-import org.apache.baremaps.calcite2.geoparquet.GeoParquetTable;
-import org.apache.baremaps.calcite2.openstreetmap.OpenStreetMapTable;
-import org.apache.baremaps.calcite2.rpsl.RpslTable;
-import org.apache.baremaps.calcite2.shapefile.ShapefileTable;
+import org.apache.baremaps.calcite.csv.CsvTable;
+import org.apache.baremaps.calcite.data.DataModifiableTable;
+import org.apache.baremaps.calcite.data.DataRow;
+import org.apache.baremaps.calcite.data.DataRowType;
+import org.apache.baremaps.calcite.data.DataSchema;
+import org.apache.baremaps.calcite.flatgeobuf.FlatGeoBufTable;
+import org.apache.baremaps.calcite.geoparquet.GeoParquetTable;
+import org.apache.baremaps.calcite.openstreetmap.OpenStreetMapTable;
+import org.apache.baremaps.calcite.rpsl.RpslTable;
+import org.apache.baremaps.calcite.shapefile.ShapefileTable;
 import org.apache.baremaps.data.collection.AppendOnlyLog;
 import org.apache.baremaps.data.collection.DataCollection;
 import org.apache.baremaps.data.memory.Memory;

baremaps-calcite/src/main/java/org/apache/baremaps/calcite2/csv/CsvTable.java renamed to baremaps-calcite/src/main/java/org/apache/baremaps/calcite/csv/CsvTable.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.calcite2.csv;
+package org.apache.baremaps.calcite.csv;
 
 import com.fasterxml.jackson.databind.MappingIterator;
 import com.fasterxml.jackson.dataformat.csv.CsvMapper;

baremaps-calcite/src/main/java/org/apache/baremaps/calcite2/data/DataColumn.java renamed to baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataColumn.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.calcite2.data;
+package org.apache.baremaps.calcite.data;
 
 import java.io.Serializable;
 import org.apache.calcite.rel.type.RelDataType;

baremaps-calcite/src/main/java/org/apache/baremaps/calcite2/data/DataColumnFixed.java renamed to baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataColumnFixed.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.calcite2.data;
+package org.apache.baremaps.calcite.data;
 
 import java.util.Objects;
 import org.apache.calcite.rel.type.RelDataType;

baremaps-calcite/src/main/java/org/apache/baremaps/calcite2/data/DataColumnNested.java renamed to baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataColumnNested.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.calcite2.data;
+package org.apache.baremaps.calcite.data;
 
 import java.util.ArrayList;
 import java.util.List;

baremaps-calcite/src/main/java/org/apache/baremaps/calcite2/data/DataMaterializedView.java renamed to baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataMaterializedView.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.calcite2.data;
+package org.apache.baremaps.calcite.data;
 
 
 import org.apache.calcite.materialize.MaterializationKey;

baremaps-calcite/src/main/java/org/apache/baremaps/calcite2/data/DataModifiableTable.java renamed to baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataModifiableTable.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.calcite2.data;
+package org.apache.baremaps.calcite.data;
 
 import static java.util.Objects.requireNonNull;
 

baremaps-calcite/src/main/java/org/apache/baremaps/calcite2/data/DataRow.java renamed to baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataRow.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.calcite2.data;
+package org.apache.baremaps.calcite.data;
 
 import java.util.List;
 import java.util.Objects;

baremaps-calcite/src/main/java/org/apache/baremaps/calcite2/data/DataRowType.java renamed to baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataRowType.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.calcite2.data;
+package org.apache.baremaps.calcite.data;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;