Clean and fix code

Author: bchapuis

baremaps-calcite/src/main/java/org/apache/baremaps/calcite/BaremapsDdlExecutor.java

@@ -557,27 +557,6 @@ public void execute(SqlCreateTableLike create,
         schema.getTable(tableName, context.config().caseSensitive());
     final Table table = requireNonNull(tableEntry, "tableEntry").getTable();
 
-    InitializerExpressionFactory ief = NullInitializerExpressionFactory.INSTANCE;
-    if (table instanceof Wrapper) {
-      final InitializerExpressionFactory sourceIef =
-          ((Wrapper) table).unwrap(InitializerExpressionFactory.class);
-      if (sourceIef != null) {
-        final Set<SqlCreateTableLike.LikeOption> optionSet = create.options();
-        final boolean includingGenerated =
-            optionSet.contains(SqlCreateTableLike.LikeOption.GENERATED)
-                || optionSet.contains(SqlCreateTableLike.LikeOption.ALL);
-        final boolean includingDefaults =
-            optionSet.contains(SqlCreateTableLike.LikeOption.DEFAULTS)
-                || optionSet.contains(SqlCreateTableLike.LikeOption.ALL);
-
-        // initializes columns based on the source table InitializerExpressionFactory
-        // and like options.
-        ief =
-            new CopiedTableInitializerExpressionFactory(
-                includingGenerated, includingDefaults, sourceIef);
-      }
-    }
-
     final JavaTypeFactory typeFactory = context.getTypeFactory();
     final RelDataType rowType = table.getRowType(typeFactory);
     // Table does not exist. Create it.

baremaps-calcite/src/main/java/org/apache/baremaps/calcite/BaremapsTableFactory.java

@@ -77,7 +77,7 @@ public Table create(
     RelDataTypeFactory typeFactory = new JavaTypeFactoryImpl();
 
     return switch (format) {
-      case "data" -> createDataTable(name, operand, protoRowType, typeFactory);
+      case "data" -> createDataTable(name, operand, typeFactory);
       case "osm" -> createOpenStreetMapTable(operand);
       case "csv" -> createCsvTable(operand);
       case "shp" -> createShapefileTable(operand);
@@ -94,14 +94,12 @@ public Table create(
    *
    * @param name the table name
    * @param operand the operand properties
-   * @param protoRowType the prototype row type
    * @param typeFactory the type factory to use
    * @return the created table
    */
   private Table createDataTable(
       String name,
       Map<String, Object> operand,
-      RelProtoDataType protoRowType,
       RelDataTypeFactory typeFactory) {
     String directory = (String) operand.get("directory");
     if (directory == null) {
@@ -110,7 +108,7 @@ private Table createDataTable(
     try {
       Memory<MappedByteBuffer> memory = new MemoryMappedDirectory(Paths.get(directory));
       ByteBuffer header = memory.header();
-      long size = header.getLong();
+      header.getLong(); // Skip the size
       int length = header.getInt();
       byte[] bytes = new byte[length];
       header.get(bytes);

baremaps-calcite/src/main/java/org/apache/baremaps/calcite/postgres/PostgresDdlExecutor.java

@@ -218,9 +218,7 @@ private DataSource getDataSource(CalcitePrepare.Context context) {
   /** Truncate the PostgreSQL table. */
   static void truncate(SqlIdentifier name, CalcitePrepare.Context context, DataSource dataSource) {
     final Pair<@Nullable CalciteSchema, String> pair = schema(context, true, name);
-    final @Nullable CalciteSchema schema = pair.left;
     final String tableName = pair.right;
-
     try (Connection connection = dataSource.getConnection();
         PreparedStatement stmt =
             connection.prepareStatement("TRUNCATE TABLE \"" + tableName + "\"")) {
@@ -619,7 +617,6 @@ public void execute(SqlCreateTable create,
     boolean first = true;
     // Process column declarations for the CREATE TABLE statement
     final ImmutableList.Builder<ColumnDef> b = ImmutableList.builder();
-    final RelDataTypeFactory.Builder builder = typeFactory.builder();
     final RelDataTypeFactory.Builder storedBuilder = typeFactory.builder();
     final SqlValidator validator = validator(context, true);
 
@@ -632,7 +629,6 @@ public void execute(SqlCreateTable create,
       if (c.e instanceof SqlColumnDeclaration) {
         final SqlColumnDeclaration d = (SqlColumnDeclaration) c.e;
         final RelDataType type = d.dataType.deriveType(validator, true);
-        builder.add(d.name.getSimple(), type);
         if (d.strategy != ColumnStrategy.VIRTUAL) {
           storedBuilder.add(d.name.getSimple(), type);
         }
@@ -655,7 +651,6 @@ public void execute(SqlCreateTable create,
             ? ColumnStrategy.NULLABLE
             : ColumnStrategy.NOT_NULLABLE;
         b.add(ColumnDef.of(c.e, f.getType(), strategy));
-        builder.add(id.getSimple(), f.getType());
         storedBuilder.add(id.getSimple(), f.getType());
 
         // Add column to SQL statement
@@ -671,7 +666,6 @@ public void execute(SqlCreateTable create,
 
     createTableSql.append(")");
 
-    final RelDataType rowType = builder.build();
     if (pair.left.plus().getTable(pair.right) != null) {
       // Table exists.
       if (create.ifNotExists) {

baremaps-calcite/src/main/java/org/apache/baremaps/calcite/postgres/PostgresModifiableTable.java

@@ -498,15 +498,15 @@ public boolean contains(Object o) {
         }
 
         String sql = "SELECT COUNT(*) FROM \"" + tableName + "\" WHERE " + whereClause;
-        PreparedStatement pstmt = connection.prepareStatement(sql);
-
-        for (int i = 0; i < values.length; i++) {
-          pstmt.setObject(i + 1, values[i]);
-        }
-
-        ResultSet rs = pstmt.executeQuery();
-        if (rs.next()) {
-          return rs.getInt(1) > 0;
+        try (PreparedStatement statement = connection.prepareStatement(sql)) {
+          for (int i = 0; i < values.length; i++) {
+            statement.setObject(i + 1, values[i]);
+          }
+          try (ResultSet rs = statement.executeQuery()) {
+            if (rs.next()) {
+              return rs.getInt(1) > 0;
+            }
+          }
         }
         return false;
       } catch (SQLException e) {

baremaps-calcite/src/main/java/org/apache/baremaps/calcite/postgres/PostgresTypeConversion.java

@@ -18,9 +18,7 @@
 package org.apache.baremaps.calcite.postgres;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import org.apache.baremaps.calcite.data.DataColumn;
 import org.apache.baremaps.calcite.data.DataSchema;
 import org.apache.calcite.rel.type.RelDataType;
@@ -36,44 +34,6 @@ private PostgresTypeConversion() {
     // Prevent instantiation
   }
 
-  private static final Map<String, SqlTypeName> POSTGRES_TO_SQL_TYPE = new HashMap<>();
-
-  static {
-    // Standard PostgreSQL types
-    POSTGRES_TO_SQL_TYPE.put("varchar", SqlTypeName.VARCHAR);
-    POSTGRES_TO_SQL_TYPE.put("char", SqlTypeName.CHAR);
-    POSTGRES_TO_SQL_TYPE.put("text", SqlTypeName.VARCHAR);
-    POSTGRES_TO_SQL_TYPE.put("smallint", SqlTypeName.SMALLINT);
-    POSTGRES_TO_SQL_TYPE.put("int2", SqlTypeName.SMALLINT);
-    POSTGRES_TO_SQL_TYPE.put("integer", SqlTypeName.INTEGER);
-    POSTGRES_TO_SQL_TYPE.put("int4", SqlTypeName.INTEGER);
-    POSTGRES_TO_SQL_TYPE.put("bigint", SqlTypeName.BIGINT);
-    POSTGRES_TO_SQL_TYPE.put("int8", SqlTypeName.BIGINT);
-    POSTGRES_TO_SQL_TYPE.put("decimal", SqlTypeName.DECIMAL);
-    POSTGRES_TO_SQL_TYPE.put("numeric", SqlTypeName.DECIMAL);
-    POSTGRES_TO_SQL_TYPE.put("real", SqlTypeName.REAL);
-    POSTGRES_TO_SQL_TYPE.put("float4", SqlTypeName.FLOAT);
-    POSTGRES_TO_SQL_TYPE.put("double precision", SqlTypeName.DOUBLE);
-    POSTGRES_TO_SQL_TYPE.put("float8", SqlTypeName.DOUBLE);
-    POSTGRES_TO_SQL_TYPE.put("boolean", SqlTypeName.BOOLEAN);
-    POSTGRES_TO_SQL_TYPE.put("bool", SqlTypeName.BOOLEAN);
-    POSTGRES_TO_SQL_TYPE.put("date", SqlTypeName.DATE);
-    POSTGRES_TO_SQL_TYPE.put("time", SqlTypeName.TIME);
-    POSTGRES_TO_SQL_TYPE.put("timestamp", SqlTypeName.TIMESTAMP);
-    POSTGRES_TO_SQL_TYPE.put("timestamptz", SqlTypeName.TIMESTAMP_WITH_LOCAL_TIME_ZONE);
-    POSTGRES_TO_SQL_TYPE.put("uuid", SqlTypeName.VARCHAR);
-    POSTGRES_TO_SQL_TYPE.put("json", SqlTypeName.OTHER);
-    POSTGRES_TO_SQL_TYPE.put("jsonb", SqlTypeName.OTHER);
-    POSTGRES_TO_SQL_TYPE.put("bytea", SqlTypeName.BINARY);
-    POSTGRES_TO_SQL_TYPE.put("interval", SqlTypeName.INTERVAL_DAY_SECOND);
-
-    // PostGIS specific types
-    POSTGRES_TO_SQL_TYPE.put("geometry", SqlTypeName.GEOMETRY);
-    POSTGRES_TO_SQL_TYPE.put("geography", SqlTypeName.GEOMETRY);
-    POSTGRES_TO_SQL_TYPE.put("box2d", SqlTypeName.OTHER);
-    POSTGRES_TO_SQL_TYPE.put("box3d", SqlTypeName.OTHER);
-  }
-
   /**
    * Converts a PostgreSQL type to a Calcite RelDataType.
    *

baremaps-calcite/src/test/java/org/apache/baremaps/calcite/postgres/PostgresDdlExecutorTest.java

@@ -28,18 +28,13 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
-import org.locationtech.jts.geom.Coordinate;
-import org.locationtech.jts.geom.GeometryFactory;
-import org.locationtech.jts.geom.Point;
 
 /**
  * Tests for the PostgresDdlExecutor class, which provides DDL execution abilities for PostgreSQL
  * tables through Calcite.
  */
 class PostgresDdlExecutorTest extends PostgresContainerTest {
 
-  private GeometryFactory geometryFactory = new GeometryFactory();
-
   @BeforeEach
   void setUp() throws SQLException {
     // Set ThreadLocal DataSource for PostgresDdlExecutor.INSTANCE to use
@@ -80,9 +75,6 @@ void testMaterializedView() throws SQLException {
       CalciteConnection calciteConnection = connection.unwrap(CalciteConnection.class);
       SchemaPlus rootSchema = calciteConnection.getRootSchema();
 
-      // Create a custom PostgresDdlExecutor with our DataSource
-      PostgresDdlExecutor ddlExecutor = new PostgresDdlExecutor(dataSource());
-
       // Add schema and tables to Calcite
       try {
         // Create PostgreSQL tables in Calcite schema
@@ -164,7 +156,6 @@ private void createTestData() throws SQLException {
           "population INTEGER)");
 
       // Insert Paris
-      Point parisPoint = geometryFactory.createPoint(new Coordinate(2.3522, 48.8566));
       String parisWKT = "POINT(2.3522 48.8566)";
       try (PreparedStatement ps = connection.prepareStatement(
           "INSERT INTO city VALUES (1, 'Paris', ST_GeomFromText(?, 4326))")) {
@@ -173,7 +164,6 @@ private void createTestData() throws SQLException {
       }
 
       // Insert New York
-      Point nyPoint = geometryFactory.createPoint(new Coordinate(-74.0060, 40.7128));
       String nyWKT = "POINT(-74.0060 40.7128)";
       try (PreparedStatement ps = connection.prepareStatement(
           "INSERT INTO city VALUES (2, 'New York', ST_GeomFromText(?, 4326))")) {
@@ -202,9 +192,6 @@ void testCreateAndDropTable() throws SQLException {
       CalciteConnection calciteConnection = connection.unwrap(CalciteConnection.class);
       SchemaPlus rootSchema = calciteConnection.getRootSchema();
 
-      // Create a custom PostgresDdlExecutor with our DataSource
-      PostgresDdlExecutor ddlExecutor = new PostgresDdlExecutor(dataSource());
-
       try {
         // Test CREATE TABLE
         try (Statement statement = connection.createStatement()) {
@@ -280,9 +267,6 @@ void testCreateAndDropView() throws SQLException {
       CalciteConnection calciteConnection = connection.unwrap(CalciteConnection.class);
       SchemaPlus rootSchema = calciteConnection.getRootSchema();
 
-      // Create a custom PostgresDdlExecutor with our DataSource
-      PostgresDdlExecutor ddlExecutor = new PostgresDdlExecutor(dataSource());
-
       try {
         // Register tables with Calcite
         PostgresModifiableTable cityTable = new PostgresModifiableTable(dataSource(), "city");

baremaps-core/src/main/java/org/apache/baremaps/tasks/ImportGeoPackage.java

@@ -127,7 +127,12 @@ public void execute(WorkflowContext context) throws Exception {
         logger.info("Is GeoPackageSchema: {}", registeredSchema instanceof GeoPackageSchema);
 
         // Get the list of tables in the GeoPackage
-        List<String> tables = getGeoPackageTables(geoPackageSchema);
+        List<String> tables = new ArrayList<>();
+
+        // Get the tables directly from the GeoPackage file
+        GeoPackage geoPackage = GeoPackageManager.open(file.toFile());
+        tables.addAll(geoPackage.getFeatureTables());
+        geoPackage.close();
 
         if (tables.isEmpty()) {
           logger.warn("No tables found in GeoPackage: {}", path);
@@ -152,13 +157,11 @@ public void execute(WorkflowContext context) throws Exception {
           }
 
           // Set SRID on geometry column if specified
-          if (databaseSrid != null) {
-            try (Connection pgConnection = dataSource.getConnection();
-                Statement stmt = pgConnection.createStatement()) {
-              stmt.execute(String.format(
-                  "SELECT UpdateGeometrySRID('%s', 'geom', %d)",
-                  sanitizedTableName, databaseSrid));
-            }
+          try (Connection pgConnection = dataSource.getConnection();
+              Statement stmt = pgConnection.createStatement()) {
+            stmt.execute(String.format(
+                "SELECT UpdateGeometrySRID('%s', 'geom', %d)",
+                sanitizedTableName, databaseSrid));
           }
 
           // Verify that the table was created in PostgreSQL
@@ -196,24 +199,6 @@ public void execute(WorkflowContext context) throws Exception {
     logger.info("Successfully imported GeoPackage to database");
   }
 
-  /**
-   * Gets the list of tables in the GeoPackage.
-   * 
-   * @param geoPackageSchema the GeoPackage schema
-   * @return the list of table names
-   * @throws Exception if an error occurs
-   */
-  private List<String> getGeoPackageTables(GeoPackageSchema geoPackageSchema) throws Exception {
-    List<String> tables = new ArrayList<>();
-
-    // Get the tables directly from the GeoPackage file
-    GeoPackage geoPackage = GeoPackageManager.open(file.toFile());
-    tables.addAll(geoPackage.getFeatureTables());
-    geoPackage.close();
-
-    return tables;
-  }
-
   /**
    * Sanitizes a table name to prevent SQL injection.
    * 

baremaps-core/src/main/java/org/apache/baremaps/tasks/ImportGeoParquet.java

@@ -28,8 +28,6 @@
 import org.apache.baremaps.workflow.Task;
 import org.apache.baremaps.workflow.WorkflowContext;
 import org.apache.baremaps.workflow.WorkflowException;
-import org.apache.calcite.jdbc.CalciteConnection;
-import org.apache.calcite.schema.SchemaPlus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -108,8 +106,6 @@ public void execute(WorkflowContext context) throws Exception {
 
       // Create a connection to Calcite
       try (Connection connection = DriverManager.getConnection("jdbc:calcite:", info)) {
-        CalciteConnection calciteConnection = connection.unwrap(CalciteConnection.class);
-        SchemaPlus rootSchema = calciteConnection.getRootSchema();
 
         // Get the list of tables in the GeoParquet
         String[] tables = getGeoParquetTables(connection);
@@ -137,13 +133,11 @@ public void execute(WorkflowContext context) throws Exception {
           }
 
           // Set SRID on geometry column if specified
-          if (databaseSrid != null) {
-            try (Connection pgConnection = dataSource.getConnection();
-                Statement stmt = pgConnection.createStatement()) {
-              stmt.execute(String.format(
-                  "SELECT UpdateGeometrySRID('%s', 'geometry', %d)",
-                  sanitizedTableName, databaseSrid));
-            }
+          try (Connection pgConnection = dataSource.getConnection();
+              Statement stmt = pgConnection.createStatement()) {
+            stmt.execute(String.format(
+                "SELECT UpdateGeometrySRID('%s', 'geometry', %d)",
+                sanitizedTableName, databaseSrid));
           }
 
           // Verify that the table was created in PostgreSQL