Calcite schema ddl

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

@@ -31,7 +31,7 @@
 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.data.DataTableSchema;
 import org.apache.baremaps.calcite.flatgeobuf.FlatGeoBufTable;
 import org.apache.baremaps.calcite.geopackage.GeoPackageTable;
 import org.apache.baremaps.calcite.geoparquet.GeoParquetTable;
@@ -108,15 +108,16 @@ private Table createDataTable(
       int length = header.getInt();
       byte[] bytes = new byte[length];
       header.get(bytes);
-      DataSchema dataSchema = DataSchema.read(new ByteArrayInputStream(bytes), typeFactory);
-      DataRowType dataRowType = new DataRowType(dataSchema);
+      DataTableSchema dataTableSchema =
+          DataTableSchema.read(new ByteArrayInputStream(bytes), typeFactory);
+      DataRowType dataRowType = new DataRowType(dataTableSchema);
       DataCollection<DataRow> dataCollection = AppendOnlyLog.<DataRow>builder()
           .dataType(dataRowType)
           .memory(memory)
           .build();
       return new DataModifiableTable(
           name,
-          dataSchema,
+          dataTableSchema,
           dataCollection,
           typeFactory);
     } catch (IOException e) {
@@ -143,9 +144,9 @@ private Table createOpenStreetMapTable(Map<String, Object> operand) {
 
       // Create an entity reader based on the file extension
       if (filePath.endsWith(".pbf") || filePath.endsWith(".osm.pbf")) {
-        return createTableFromPbf(inputStream);
+        return createTableFromPbf(Paths.get(filePath));
       } else if (filePath.endsWith(".xml") || filePath.endsWith(".osm")) {
-        return createTableFromXml(inputStream);
+        return createTableFromXml(Paths.get(filePath));
       } else {
         throw new IllegalArgumentException(
             "Unsupported file format. Supported formats are .pbf, .osm.pbf, .xml, and .osm");
@@ -249,16 +250,6 @@ private Table createFlatGeoBufTable(Map<String, Object> operand) {
     }
   }
 
-  /**
-   * Create a table from a PBF file.
-   *
-   * @param inputStream the input stream
-   * @return the table
-   */
-  public static OpenStreetMapTable createTableFromPbf(InputStream inputStream) {
-    return new OpenStreetMapTable(new PbfEntityReader().setGeometries(true), inputStream);
-  }
-
   /**
    * Create a table from a PBF file.
    *
@@ -267,17 +258,9 @@ public static OpenStreetMapTable createTableFromPbf(InputStream inputStream) {
    * @throws IOException if an I/O error occurs
    */
   public static OpenStreetMapTable createTableFromPbf(Path path) throws IOException {
-    return createTableFromPbf(new FileInputStream(path.toFile()));
-  }
-
-  /**
-   * Create a table from an XML file.
-   *
-   * @param inputStream the input stream
-   * @return the table
-   */
-  public static OpenStreetMapTable createTableFromXml(InputStream inputStream) {
-    return new OpenStreetMapTable(new XmlEntityReader().setGeometries(true), inputStream);
+    PbfEntityReader reader = new PbfEntityReader();
+    reader.setGeometries(true);
+    return new OpenStreetMapTable(path.toFile(), reader);
   }
 
   /**
@@ -288,7 +271,9 @@ public static OpenStreetMapTable createTableFromXml(InputStream inputStream) {
    * @throws IOException if an I/O error occurs
    */
   public static OpenStreetMapTable createTableFromXml(Path path) throws IOException {
-    return createTableFromXml(new FileInputStream(path.toFile()));
+    XmlEntityReader reader = new XmlEntityReader();
+    reader.setGeometries(true);
+    return new OpenStreetMapTable(path.toFile(), reader);
   }
 
   private Table createGeoParquetTable(Map<String, Object> operand) {

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

@@ -65,7 +65,7 @@ public class DataModifiableTable extends AbstractTable implements ModifiableTabl
   private final String name;
   private final RelProtoDataType protoRowType;
   private final RelDataType rowType;
-  private final DataSchema schema;
+  private final DataTableSchema schema;
   public final DataCollection<DataRow> rows;
 
   /**
@@ -92,7 +92,7 @@ public DataModifiableTable(String name,
       columns.add(new DataColumnFixed(columnName, columnCardinality, relDataType));
     });
 
-    this.schema = new DataSchema(name, columns);
+    this.schema = new DataTableSchema(name, columns);
 
     // Create the collection
     DataRowType dataRowType = new DataRowType(schema);
@@ -109,7 +109,7 @@ public DataModifiableTable(String name,
    * @param typeFactory the type factory
    */
   public DataModifiableTable(String name,
-      DataSchema schema,
+      DataTableSchema schema,
       DataCollection<DataRow> rows,
       RelDataTypeFactory typeFactory) {
     super();

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

@@ -23,7 +23,7 @@
 /**
  * A row in a table with values corresponding to the schema columns.
  */
-public record DataRow(DataSchema schema, List<Object> values) {
+public record DataRow(DataTableSchema schema, List<Object> values) {
 
   /**
    * Constructs a row with validation.

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

@@ -118,14 +118,14 @@ public static <T> DataType<T> getType(SqlTypeName sqlTypeName) {
     return dataType;
   }
 
-  private final DataSchema rowType;
+  private final DataTableSchema rowType;
 
   /**
    * Constructs a DataRowType with the given schema.
    *
    * @param rowType the row schema
    */
-  public DataRowType(DataSchema rowType) {
+  public DataRowType(DataTableSchema rowType) {
     this.rowType = Objects.requireNonNull(rowType, "Row type cannot be null");
   }