This is an automated email from the ASF dual-hosted git repository. bchapuis pushed a commit to branch calcite-schema-ddl in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit 24247028200c974c0925a1d7e914048adf085b27 Author: Bertil Chapuis <[email protected]> AuthorDate: Mon Apr 14 15:49:22 2025 +0200 Improve class name --- .../baremaps/calcite/BaremapsTableFactory.java | 8 ++-- .../baremaps/calcite/data/DataModifiableTable.java | 6 +-- .../org/apache/baremaps/calcite/data/DataRow.java | 2 +- .../apache/baremaps/calcite/data/DataRowType.java | 4 +- .../data/{DataSchema.java => DataTableSchema.java} | 22 +++++----- .../calcite/postgres/PostgresModifiableTable.java | 48 +++++++++++----------- .../calcite/postgres/PostgresTypeConversion.java | 4 +- .../baremaps/calcite/BaremapsDdlExecutorTest.java | 12 +++--- .../postgres/PostgresModifiableTableTest.java | 4 +- ...chemaTest.java => TileDataTableSchemaTest.java} | 2 +- .../baremaps/tilestore/file/FileTileStoreTest.java | 4 +- .../tilestore/mbtiles/MBTilesStoreTest.java | 4 +- 12 files changed, 60 insertions(+), 60 deletions(-) diff --git a/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/BaremapsTableFactory.java b/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/BaremapsTableFactory.java index 4a2756b09..857f46261 100644 --- a/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/BaremapsTableFactory.java +++ b/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/BaremapsTableFactory.java @@ -31,7 +31,7 @@ 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.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,15 @@ public class BaremapsTableFactory implements TableFactory<Table> { 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) { diff --git a/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataModifiableTable.java b/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataModifiableTable.java index 5f415b28d..4b3bdd6ab 100644 --- a/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataModifiableTable.java +++ b/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 class DataModifiableTable extends AbstractTable implements ModifiableTabl 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 class DataModifiableTable extends AbstractTable implements ModifiableTabl * @param typeFactory the type factory */ public DataModifiableTable(String name, - DataSchema schema, + DataTableSchema schema, DataCollection<DataRow> rows, RelDataTypeFactory typeFactory) { super(); diff --git a/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataRow.java b/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataRow.java index 4ba72fdc3..0df5b4a7d 100644 --- a/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataRow.java +++ b/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataRow.java @@ -23,7 +23,7 @@ import java.util.Objects; /** * 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. diff --git a/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataRowType.java b/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataRowType.java index 2181aff6f..fad1a7f24 100644 --- a/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataRowType.java +++ b/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataRowType.java @@ -118,14 +118,14 @@ public class DataRowType implements DataType<DataRow> { 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"); } diff --git a/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataSchema.java b/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataTableSchema.java similarity index 93% rename from baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataSchema.java rename to baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataTableSchema.java index a89e75dbf..920f24252 100644 --- a/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataSchema.java +++ b/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/data/DataTableSchema.java @@ -36,10 +36,10 @@ import org.apache.calcite.rel.type.RelDataTypeFactory; import org.apache.calcite.sql.type.SqlTypeName; /** - * A {@link DataSchema} defines the structure of a table. + * A {@link DataTableSchema} defines the structure of a table. */ -public record DataSchema(String name, - List<DataColumn> columns) implements Serializable { +public record DataTableSchema(String name, + List<DataColumn> columns) implements Serializable { /** * Constructs a schema with validation. @@ -50,7 +50,7 @@ public record DataSchema(String name, * @throws IllegalArgumentException if name is blank, columns is empty, or columns contains * duplicates */ - public DataSchema { + public DataTableSchema { Objects.requireNonNull(name, "Schema name cannot be null"); Objects.requireNonNull(columns, "Columns cannot be null"); @@ -143,7 +143,7 @@ public record DataSchema(String name, /** * Custom JSON deserializer for DataSchema. */ - static class DataSchemaDeserializer extends JsonDeserializer<DataSchema> { + static class DataSchemaDeserializer extends JsonDeserializer<DataTableSchema> { private RelDataTypeFactory typeFactory; /** @@ -156,7 +156,7 @@ public record DataSchema(String name, } @Override - public DataSchema deserialize(JsonParser parser, DeserializationContext ctxt) + public DataTableSchema deserialize(JsonParser parser, DeserializationContext ctxt) throws IOException { ObjectNode node = parser.getCodec().readTree(parser); if (!node.has("name")) { @@ -182,7 +182,7 @@ public record DataSchema(String name, } }); - return new DataSchema(name, columns); + return new DataTableSchema(name, columns); } DataColumn deserialize(JsonNode node) { @@ -252,7 +252,7 @@ public record DataSchema(String name, new NamedType(DataColumnFixed.class, "FIXED"), new NamedType(DataColumnNested.class, "NESTED")); var module = new SimpleModule(); - module.addDeserializer(DataSchema.class, new DataSchemaDeserializer(typeFactory)); + module.addDeserializer(DataTableSchema.class, new DataSchemaDeserializer(typeFactory)); mapper.registerModule(module); return mapper; } @@ -265,13 +265,13 @@ public record DataSchema(String name, * @return the schema * @throws IOException if an I/O error occurs */ - public static DataSchema read(InputStream inputStream, RelDataTypeFactory typeFactory) + public static DataTableSchema read(InputStream inputStream, RelDataTypeFactory typeFactory) throws IOException { Objects.requireNonNull(inputStream, "Input stream cannot be null"); Objects.requireNonNull(typeFactory, "Type factory cannot be null"); var mapper = configureObjectMapper(typeFactory); - return mapper.readValue(inputStream, DataSchema.class); + return mapper.readValue(inputStream, DataTableSchema.class); } /** @@ -282,7 +282,7 @@ public record DataSchema(String name, * @param typeFactory the type factory to use * @throws IOException if an I/O error occurs */ - public static void write(OutputStream outputStream, DataSchema schema, + public static void write(OutputStream outputStream, DataTableSchema schema, RelDataTypeFactory typeFactory) throws IOException { Objects.requireNonNull(outputStream, "Output stream cannot be null"); Objects.requireNonNull(schema, "Schema cannot be null"); diff --git a/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/postgres/PostgresModifiableTable.java b/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/postgres/PostgresModifiableTable.java index 8502c3dcd..e2fb59cd0 100644 --- a/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/postgres/PostgresModifiableTable.java +++ b/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/postgres/PostgresModifiableTable.java @@ -23,7 +23,7 @@ import java.util.*; import javax.sql.DataSource; import org.apache.baremaps.calcite.data.DataColumn; import org.apache.baremaps.calcite.data.DataColumnFixed; -import org.apache.baremaps.calcite.data.DataSchema; +import org.apache.baremaps.calcite.data.DataTableSchema; import org.apache.baremaps.postgres.copy.*; import org.apache.baremaps.postgres.metadata.ColumnResult; import org.apache.baremaps.postgres.metadata.DatabaseMetadata; @@ -69,7 +69,7 @@ public class PostgresModifiableTable extends AbstractTable private final DataSource dataSource; private final String tableName; private final RelDataType rowType; - private final DataSchema dataSchema; + private final DataTableSchema dataTableSchema; /** * Constructs a PostgisTable with the specified data source and table name. @@ -95,8 +95,8 @@ public class PostgresModifiableTable extends AbstractTable throws SQLException { this.dataSource = dataSource; this.tableName = tableName; - this.dataSchema = discoverSchema(); - this.rowType = PostgresTypeConversion.toRelDataType(typeFactory, dataSchema); + this.dataTableSchema = discoverSchema(); + this.rowType = PostgresTypeConversion.toRelDataType(typeFactory, dataTableSchema); } /** @@ -105,7 +105,7 @@ public class PostgresModifiableTable extends AbstractTable * @return the schema of the table * @throws SQLException if an SQL error occurs */ - private DataSchema discoverSchema() throws SQLException { + private DataTableSchema discoverSchema() throws SQLException { List<DataColumn> columns = new ArrayList<>(); // Use DatabaseMetadata to get column information @@ -162,7 +162,7 @@ public class PostgresModifiableTable extends AbstractTable columns.add(new DataColumnFixed(columnName, cardinality, relDataType)); } - return new DataSchema(tableName, columns); + return new DataTableSchema(tableName, columns); } /** @@ -172,7 +172,7 @@ public class PostgresModifiableTable extends AbstractTable * @return the schema constructed from direct column query * @throws SQLException if an SQL error occurs */ - private DataSchema getSchemaFromDirectQuery() throws SQLException { + private DataTableSchema getSchemaFromDirectQuery() throws SQLException { List<DataColumn> columns = new ArrayList<>(); try (Connection connection = dataSource.getConnection()) { @@ -279,7 +279,7 @@ public class PostgresModifiableTable extends AbstractTable throw new SQLException("No columns found for table: " + tableName); } - return new DataSchema(tableName, columns); + return new DataTableSchema(tableName, columns); } /** @@ -378,8 +378,8 @@ public class PostgresModifiableTable extends AbstractTable * * @return the schema of the table */ - public DataSchema schema() { - return dataSchema; + public DataTableSchema schema() { + return dataTableSchema; } /** @@ -405,7 +405,7 @@ public class PostgresModifiableTable extends AbstractTable return new AbstractEnumerable<>() { @Override public Enumerator<Object[]> enumerator() { - return new PostgisEnumerator(dataSource, dataSchema); + return new PostgisEnumerator(dataSource, dataTableSchema); } }; } @@ -490,11 +490,11 @@ public class PostgresModifiableTable extends AbstractTable Object[] values = (Object[]) o; StringBuilder whereClause = new StringBuilder(); - for (int i = 0; i < dataSchema.columns().size(); i++) { + for (int i = 0; i < dataTableSchema.columns().size(); i++) { if (i > 0) { whereClause.append(" AND "); } - whereClause.append("\"").append(dataSchema.columns().get(i).name()).append("\" = ?"); + whereClause.append("\"").append(dataTableSchema.columns().get(i).name()).append("\" = ?"); } String sql = "SELECT COUNT(*) FROM \"" + tableName + "\" WHERE " + whereClause; @@ -517,7 +517,7 @@ public class PostgresModifiableTable extends AbstractTable @Override public Iterator<Object[]> iterator() { return new Iterator<Object[]>() { - private final PostgisEnumerator enumerator = new PostgisEnumerator(dataSource, dataSchema); + private final PostgisEnumerator enumerator = new PostgisEnumerator(dataSource, dataTableSchema); private boolean hasNext = enumerator.moveNext(); @Override @@ -545,9 +545,9 @@ public class PostgresModifiableTable extends AbstractTable ResultSet rs = stmt.executeQuery("SELECT * FROM \"" + tableName + "\"")) { while (rs.next()) { - Object[] row = new Object[dataSchema.columns().size()]; - for (int i = 0; i < dataSchema.columns().size(); i++) { - DataColumn column = dataSchema.columns().get(i); + Object[] row = new Object[dataTableSchema.columns().size()]; + for (int i = 0; i < dataTableSchema.columns().size(); i++) { + DataColumn column = dataTableSchema.columns().get(i); if (column.sqlTypeName() == SqlTypeName.GEOMETRY) { byte[] wkb = rs.getBytes(i + 1); row[i] = deserializeWkb(wkb); @@ -581,7 +581,7 @@ public class PostgresModifiableTable extends AbstractTable // Use COPY API for better performance PGConnection pgConnection = connection.unwrap(PGConnection.class); String copyCommand = "COPY \"" + tableName + "\" (" + - dataSchema.columns().stream() + dataTableSchema.columns().stream() .map(col -> "\"" + col.name() + "\"") .collect(java.util.stream.Collectors.joining(", ")) + @@ -593,16 +593,16 @@ public class PostgresModifiableTable extends AbstractTable for (Object[] objects : c) { Objects.requireNonNull(objects, "Values cannot be null"); - if (objects.length != dataSchema.columns().size()) { + if (objects.length != dataTableSchema.columns().size()) { throw new IllegalArgumentException( - "Expected " + dataSchema.columns().size() + " values, got " + objects.length); + "Expected " + dataTableSchema.columns().size() + " values, got " + objects.length); } - writer.startRow(dataSchema.columns().size()); + writer.startRow(dataTableSchema.columns().size()); for (int i = 0; i < objects.length; i++) { Object value = objects[i]; - DataColumn column = dataSchema.columns().get(i); + DataColumn column = dataTableSchema.columns().get(i); if (value == null) { writer.writeNull(); @@ -697,7 +697,7 @@ public class PostgresModifiableTable extends AbstractTable */ private static class PostgisEnumerator implements Enumerator<Object[]> { private final DataSource dataSource; - private final DataSchema schema; + private final DataTableSchema schema; private Connection connection; private Statement statement; private ResultSet resultSet; @@ -710,7 +710,7 @@ public class PostgresModifiableTable extends AbstractTable * @param dataSource the data source * @param schema the schema */ - public PostgisEnumerator(DataSource dataSource, DataSchema schema) { + public PostgisEnumerator(DataSource dataSource, DataTableSchema schema) { this.dataSource = dataSource; this.schema = schema; this.current = null; diff --git a/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/postgres/PostgresTypeConversion.java b/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/postgres/PostgresTypeConversion.java index 2c2d79f29..2324a9119 100644 --- a/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/postgres/PostgresTypeConversion.java +++ b/baremaps-calcite/src/main/java/org/apache/baremaps/calcite/postgres/PostgresTypeConversion.java @@ -20,7 +20,7 @@ package org.apache.baremaps.calcite.postgres; import java.util.ArrayList; import java.util.List; import org.apache.baremaps.calcite.data.DataColumn; -import org.apache.baremaps.calcite.data.DataSchema; +import org.apache.baremaps.calcite.data.DataTableSchema; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeFactory; import org.apache.calcite.sql.type.SqlTypeName; @@ -171,7 +171,7 @@ public class PostgresTypeConversion { * @return the corresponding RelDataType */ public static RelDataType toRelDataType(RelDataTypeFactory typeFactory, - DataSchema schema) { + DataTableSchema schema) { List<RelDataType> types = new ArrayList<>(); List<String> names = new ArrayList<>(); diff --git a/baremaps-calcite/src/test/java/org/apache/baremaps/calcite/BaremapsDdlExecutorTest.java b/baremaps-calcite/src/test/java/org/apache/baremaps/calcite/BaremapsDdlExecutorTest.java index af177ee38..a34153e6c 100644 --- a/baremaps-calcite/src/test/java/org/apache/baremaps/calcite/BaremapsDdlExecutorTest.java +++ b/baremaps-calcite/src/test/java/org/apache/baremaps/calcite/BaremapsDdlExecutorTest.java @@ -52,7 +52,7 @@ public class BaremapsDdlExecutorTest { void setUp() throws IOException { // Create and initialize city collection MemoryMappedDirectory cityMemory = new MemoryMappedDirectory(Paths.get(CITY_DATA_DIR)); - DataSchema citySchema = createCitySchema(); + DataTableSchema citySchema = createCitySchema(); DataRowType cityRowType = new DataRowType(citySchema); cityCollection = AppendOnlyLog.<DataRow>builder() .dataType(cityRowType) @@ -62,7 +62,7 @@ public class BaremapsDdlExecutorTest { // Create and initialize population collection MemoryMappedDirectory populationMemory = new MemoryMappedDirectory(Paths.get(POPULATION_DATA_DIR)); - DataSchema populationSchema = createPopulationSchema(); + DataTableSchema populationSchema = createPopulationSchema(); DataRowType populationRowType = new DataRowType(populationSchema); populationCollection = AppendOnlyLog.<DataRow>builder() .dataType(populationRowType) @@ -78,9 +78,9 @@ public class BaremapsDdlExecutorTest { FileUtils.deleteRecursively(Paths.get(CITY_POPULATION_DIR).toFile()); } - private DataSchema createCitySchema() { + private DataTableSchema createCitySchema() { RelDataTypeFactory typeFactory = new JavaTypeFactoryImpl(); - return new DataSchema("city", List.of( + return new DataTableSchema("city", List.of( new DataColumnFixed("id", DataColumn.Cardinality.REQUIRED, typeFactory.createSqlType(org.apache.calcite.sql.type.SqlTypeName.INTEGER)), new DataColumnFixed("name", DataColumn.Cardinality.OPTIONAL, @@ -89,9 +89,9 @@ public class BaremapsDdlExecutorTest { typeFactory.createSqlType(org.apache.calcite.sql.type.SqlTypeName.GEOMETRY)))); } - private DataSchema createPopulationSchema() { + private DataTableSchema createPopulationSchema() { RelDataTypeFactory typeFactory = new JavaTypeFactoryImpl(); - return new DataSchema("population", List.of( + return new DataTableSchema("population", List.of( new DataColumnFixed("city_id", DataColumn.Cardinality.REQUIRED, typeFactory.createSqlType(org.apache.calcite.sql.type.SqlTypeName.INTEGER)), new DataColumnFixed("population", DataColumn.Cardinality.OPTIONAL, diff --git a/baremaps-calcite/src/test/java/org/apache/baremaps/calcite/postgres/PostgresModifiableTableTest.java b/baremaps-calcite/src/test/java/org/apache/baremaps/calcite/postgres/PostgresModifiableTableTest.java index d2662440f..6f24ca826 100644 --- a/baremaps-calcite/src/test/java/org/apache/baremaps/calcite/postgres/PostgresModifiableTableTest.java +++ b/baremaps-calcite/src/test/java/org/apache/baremaps/calcite/postgres/PostgresModifiableTableTest.java @@ -25,7 +25,7 @@ import java.util.Collection; import java.util.List; import java.util.Properties; import javax.sql.DataSource; -import org.apache.baremaps.calcite.data.DataSchema; +import org.apache.baremaps.calcite.data.DataTableSchema; import org.apache.baremaps.testing.PostgresContainerTest; import org.apache.calcite.jdbc.CalciteConnection; import org.apache.calcite.jdbc.JavaTypeFactoryImpl; @@ -89,7 +89,7 @@ class PostgresModifiableTableTest extends PostgresContainerTest { @Tag("integration") void schemaContainsExpectedColumns() throws Exception { PostgresModifiableTable table = new PostgresModifiableTable(dataSource(), TEST_TABLE); - DataSchema schema = table.schema(); + DataTableSchema schema = table.schema(); assertNotNull(schema, "Schema should not be null"); assertEquals(TEST_TABLE, schema.name(), "Schema should have correct name"); diff --git a/baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileDataSchemaTest.java b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileDataTableSchemaTest.java similarity index 97% rename from baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileDataSchemaTest.java rename to baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileDataTableSchemaTest.java index 0fea6925f..81a5296f4 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileDataSchemaTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileDataTableSchemaTest.java @@ -24,7 +24,7 @@ import java.nio.ByteBuffer; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -public abstract class TileDataSchemaTest { +public abstract class TileDataTableSchemaTest { // TODO: try to move this in the testing module diff --git a/baremaps-core/src/test/java/org/apache/baremaps/tilestore/file/FileTileStoreTest.java b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/file/FileTileStoreTest.java index d229899ba..a96d95235 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/tilestore/file/FileTileStoreTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/file/FileTileStoreTest.java @@ -24,12 +24,12 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import org.apache.baremaps.data.util.FileUtils; -import org.apache.baremaps.tilestore.TileDataSchemaTest; +import org.apache.baremaps.tilestore.TileDataTableSchemaTest; import org.apache.baremaps.tilestore.TileStore; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -class FileTileStoreTest extends TileDataSchemaTest { +class FileTileStoreTest extends TileDataTableSchemaTest { Path directory; diff --git a/baremaps-core/src/test/java/org/apache/baremaps/tilestore/mbtiles/MBTilesStoreTest.java b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/mbtiles/MBTilesStoreTest.java index 7ef9f9887..33e23e9d9 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/tilestore/mbtiles/MBTilesStoreTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/mbtiles/MBTilesStoreTest.java @@ -26,13 +26,13 @@ import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; import org.apache.baremaps.data.util.FileUtils; -import org.apache.baremaps.tilestore.TileDataSchemaTest; +import org.apache.baremaps.tilestore.TileDataTableSchemaTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.sqlite.SQLiteDataSource; -class MBTilesStoreTest extends TileDataSchemaTest { +class MBTilesStoreTest extends TileDataTableSchemaTest { Path file;
