This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git.
from 5024fa9 Continue to parse unit even if the date can not be parsed. For example the unit is sometime "hours since analysis" instead of "hours since 1970-01-01 00:00:00". new 9d096ae Provides `SQLBuilder` configuration in a separated class (`Syntax`) for making possible to reuse configuration analysis. Add methods in `SQLBuilder` for pagination and for distinct values. new dae2bed Move the handling of `ReferenceSystem` outside `SQLBuilder`. new 84fcc96 Add a copy constructor. Document the issue about parameterized type in `Visitor.visit(…)` methods. new 8918191 Add a method for getting filters as a `F₀ AND F₁ AND F₂ AND F₃ AND ...` sequence. It allows to translate some Fₙ to SQL statements without forcing an "all or nothing" policy. new 5b1cdce Give public access to the `SortProperty` elements wrapped by `SortByComparator`. It allows `DataStore` implementations to translate "sort by" into SQL statements. new 2279b2a Provide `String` constants for predefined attribute names. It avoid synchronization on `GenericName.toString()` calls. new 9daf881 Better `toString()` (for debugging only) of the query executed by `FeatureSubset`. Give to `Stream.filter(Predicate)` the filter directly, not a lambda to the `test` method. This is important for allowing stream implementations to optimize the filters. new 8a9f4c2 Relax the requirement that the source CRS is non-null in a call to `transform(targetCRS)`. A null sourceCRS will be a no-operation. This is consistent with current target CRS policy. This change is for making easier to implement a data store on SQL database such as PostGIS, when the geometry in a filter expression is often specified by a WKT without CRS. new d94bbdd Add an `Optimization.setFeatureType(…)` method and update some filter/expression implementations for taking advantage of it. new 7e23b40 Refactoring of `sis-sqlstorage` module: - Make import closer to the order on other branch. This is not necessarily a better order, but the intend is to reduce conflicts at merge time. - Merge `SQLBiFunction` and `ColumnAdapter` into a single abstract class: `ValueGetter`. - Merge `SQLColumn`, `ColumnRef` and `GeometryColumn` in a single `Column` class. - Merge `DialectMapping` and `ANSIMapping` in a single `Session` class. - Delegate WKB parsing to the geometry library ( [...] new 0fe01ad Remove (for now) JMH dependencies because not used anymore. We will revert this commit in the future if JMH is used again. The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/sis/feature/EnvelopeOperation.java | 5 +- .../apache/sis/filter/BinaryGeometryFilter.java | 51 +- .../java/org/apache/sis/filter/LeafExpression.java | 2 +- .../java/org/apache/sis/filter/Optimization.java | 153 +++- .../java/org/apache/sis/filter/PropertyValue.java | 120 ++- .../sis/internal/feature/AttributeConvention.java | 31 +- .../sis/internal/feature/GeometryWrapper.java | 5 +- .../org/apache/sis/internal/feature/jts/JTS.java | 14 +- .../apache/sis/internal/feature/jts/Wrapper.java | 4 +- .../org/apache/sis/internal/filter/Visitor.java | 67 +- .../sis/internal/filter/sqlmm/TwoGeometries.java | 40 + .../apache/sis/feature/EnvelopeOperationTest.java | 4 +- .../org/apache/sis/filter/LogicalFunctionTest.java | 35 + .../apache/sis/internal/feature/jts/JTSTest.java | 9 +- .../internal/filter/sqlmm/RegistryTestCase.java | 28 +- .../apache/sis/internal/metadata/sql/Dialect.java | 2 +- .../sis/internal/metadata/sql/SQLBuilder.java | 146 ++-- .../apache/sis/internal/metadata/sql/Syntax.java | 84 +++ .../apache/sis/metadata/sql/MetadataSource.java | 18 +- .../apache/sis/metadata/sql/MetadataWriter.java | 8 +- .../apache/sis/internal/map/SEPortrayerTest.java | 2 +- ide-project/NetBeans/build.xml | 3 + ide-project/NetBeans/nbproject/project.properties | 2 - pom.xml | 8 - storage/sis-sqlstore/pom.xml | 12 +- .../sis/internal/sql/feature/ANSIInterpreter.java | 398 ---------- .../sis/internal/sql/feature/ANSIMapping.java | 147 ---- .../apache/sis/internal/sql/feature/Analyzer.java | 829 +++++++++++---------- .../internal/sql/feature/BaseStreamWrapper.java | 159 ---- .../internal/sql/feature/CRSIdentification.java | 114 --- .../apache/sis/internal/sql/feature/Column.java | 241 ++++++ .../sis/internal/sql/feature/ColumnAdapter.java | 84 --- .../apache/sis/internal/sql/feature/ColumnRef.java | 84 --- .../apache/sis/internal/sql/feature/Connector.java | 58 -- .../apache/sis/internal/sql/feature/Database.java | 467 ++++++++++-- .../sis/internal/sql/feature/DialectMapping.java | 81 -- .../internal/sql/feature/DoubleStreamWrapper.java | 343 --------- .../sis/internal/sql/feature/EWKBReader.java | 366 ++++----- .../sis/internal/sql/feature/FeatureAdapter.java | 414 +++++++--- .../sis/internal/sql/feature/FeatureIterator.java | 336 +++++++++ .../sis/internal/sql/feature/FeatureStream.java | 406 ++++++++++ .../apache/sis/internal/sql/feature/Features.java | 675 ----------------- .../sql/feature/GeometryIdentification.java | 188 ----- .../sis/internal/sql/feature/InfoStatements.java | 419 +++++++++++ .../sis/internal/sql/feature/OGC06104r4.java | 182 ----- .../internal/sql/feature/PostGISInterpreter.java | 123 --- .../sis/internal/sql/feature/PostGISMapping.java | 248 ------ .../sql/feature/PostGISSpatialFilterAdapter.java | 309 -------- .../sis/internal/sql/feature/PrimaryKey.java | 92 ++- .../sis/internal/sql/feature/QueryFeatureSet.java | 499 ------------- .../apache/sis/internal/sql/feature/Relation.java | 87 ++- .../apache/sis/internal/sql/feature/Resources.java | 25 + .../sis/internal/sql/feature/Resources.properties | 5 + .../internal/sql/feature/Resources_fr.properties | 7 +- .../sis/internal/sql/feature/SQLBiFunction.java | 58 -- .../sis/internal/sql/feature/SQLCloseable.java | 32 - .../apache/sis/internal/sql/feature/SQLColumn.java | 79 -- .../sis/internal/sql/feature/SQLQueryAdapter.java | 162 ---- .../internal/sql/feature/SQLTypeSpecification.java | 108 --- .../sis/internal/sql/feature/SelectionClause.java | 176 +++++ .../sql/feature/SelectionClauseWriter.java | 419 +++++++++++ .../sis/internal/sql/feature/SpatialFunctions.java | 150 ---- .../apache/sis/internal/sql/feature/StreamSQL.java | 408 ---------- .../sis/internal/sql/feature/StreamWrapper.java | 373 --------- .../sis/internal/sql/feature/SubsetAdapter.java | 174 ----- .../org/apache/sis/internal/sql/feature/Table.java | 338 ++++----- .../sis/internal/sql/feature/TableAnalyzer.java | 189 +++++ .../sis/internal/sql/feature/TableReference.java | 38 +- .../sis/internal/sql/feature/TableSubset.java | 93 --- .../sis/internal/sql/feature/ValueGetter.java | 372 +++++++++ .../sis/internal/sql/feature/package-info.java | 17 +- .../internal/sql/postgis/ExtendedClauseWriter.java | 70 ++ .../sis/internal/sql/postgis/ExtendedInfo.java | 82 ++ .../apache/sis/internal/sql/postgis/Postgres.java | 151 ++++ .../sis/internal/sql/postgis}/package-info.java | 6 +- .../sis/internal/stream/BaseStreamWrapper.java | 97 +++ .../apache/sis/internal/stream/DeferredStream.java | 168 +++++ .../sis/internal/stream/DoubleStreamWrapper.java | 285 +++++++ .../sis/internal/stream/PaginedDoubleStream.java | 102 +++ .../apache/sis/internal/stream/PaginedStream.java | 113 +++ .../apache/sis/internal/stream/StreamWrapper.java | 319 ++++++++ .../apache/sis/internal/stream}/package-info.java | 7 +- .../java/org/apache/sis/storage/sql/SQLStore.java | 64 +- .../apache/sis/storage/sql/SQLStoreProvider.java | 12 + .../org/apache/sis/storage/sql/SchemaModifier.java | 20 +- .../org/apache/sis/storage/sql/package-info.java | 3 +- .../apache/sis/internal/sql/feature/EWKBTest.java | 39 +- .../sql/feature/FilterInterpreterTest.java | 181 ----- .../internal/sql/feature/PostGISMappingTest.java | 49 -- .../sql/feature/QuerySpliteratorsBench.java | 182 ----- .../sql/feature/SelectionClauseWriterTest.java | 150 ++++ .../sis/internal/sql/postgis/PostgresTest.java | 21 +- .../org/apache/sis/storage/sql/SQLStoreTest.java | 536 ++++--------- .../org/apache/sis/test/suite/SQLTestSuite.java | 4 +- .../sis/internal/storage/query/FeatureQuery.java | 17 +- .../sis/internal/storage/query/FeatureSubset.java | 2 +- .../internal/storage/query/SortByComparator.java | 22 +- 97 files changed, 6744 insertions(+), 7383 deletions(-) create mode 100644 core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Syntax.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/ANSIInterpreter.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/ANSIMapping.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/BaseStreamWrapper.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/CRSIdentification.java create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Column.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/ColumnAdapter.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/ColumnRef.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Connector.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/DialectMapping.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/DoubleStreamWrapper.java create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/FeatureIterator.java create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/FeatureStream.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Features.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/GeometryIdentification.java create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/InfoStatements.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/OGC06104r4.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/PostGISInterpreter.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/PostGISMapping.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/PostGISSpatialFilterAdapter.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/QueryFeatureSet.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SQLBiFunction.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SQLCloseable.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SQLColumn.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SQLQueryAdapter.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SQLTypeSpecification.java create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SelectionClause.java create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SelectionClauseWriter.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SpatialFunctions.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/StreamSQL.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/StreamWrapper.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/SubsetAdapter.java create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/TableAnalyzer.java delete mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/TableSubset.java create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/ValueGetter.java create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/postgis/ExtendedClauseWriter.java create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/postgis/ExtendedInfo.java create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/postgis/Postgres.java copy {core/sis-feature/src/main/java/org/apache/sis/internal/filter => storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/postgis}/package-info.java (83%) create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/stream/BaseStreamWrapper.java create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/stream/DeferredStream.java create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/stream/DoubleStreamWrapper.java create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/stream/PaginedDoubleStream.java create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/stream/PaginedStream.java create mode 100644 storage/sis-sqlstore/src/main/java/org/apache/sis/internal/stream/StreamWrapper.java copy {application/sis-javafx/src/main/java/org/apache/sis/internal/gui/control => storage/sis-sqlstore/src/main/java/org/apache/sis/internal/stream}/package-info.java (81%) copy core/sis-feature/src/main/java/org/apache/sis/internal/feature/j2d/Polygon.java => storage/sis-sqlstore/src/main/java/org/apache/sis/storage/sql/SchemaModifier.java (62%) delete mode 100644 storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/feature/FilterInterpreterTest.java delete mode 100644 storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/feature/PostGISMappingTest.java delete mode 100644 storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/feature/QuerySpliteratorsBench.java create mode 100644 storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/feature/SelectionClauseWriterTest.java copy core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ImageLayoutTest.java => storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/PostgresTest.java (65%)