Merge pull request OSGeo#12049 from rouault/gpkg_modernize

GPKG: more vector and unique_ptr use

Author: rouault

Diff for: autotest/gdrivers/gpkg.py

@@ -2863,7 +2863,7 @@ def test_gpkg_39():
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL("PRAGMA user_version")
     f = sql_lyr.GetNextFeature()
-    if f["user_version"] != 10200:
+    if f["user_version"] != 10400:
         f.DumpReadable()
         pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
@@ -3389,7 +3389,7 @@ def test_gpkg_40():
     ds.ReleaseResultSet(sql_lyr)
     sql_lyr = ds.ExecuteSQL("PRAGMA user_version")
     f = sql_lyr.GetNextFeature()
-    if f["user_version"] != 10200:
+    if f["user_version"] != 10400:
         f.DumpReadable()
         pytest.fail()
     ds.ReleaseResultSet(sql_lyr)
@@ -3778,11 +3778,12 @@ def test_gpkg_match_overview_factor():
 ###############################################################################
 
 
-def test_gpkg_wkt2():
+@pytest.mark.parametrize("version", ["1.2", "1.4"])
+def test_gpkg_wkt2(version):
 
     # WKT2-only compatible SRS with EPSG code
     filename = "/vsimem/test_gpkg_wkt2.gpkg"
-    ds = gdaltest.gpkg_dr.Create(filename, 1, 1)
+    ds = gdaltest.gpkg_dr.Create(filename, 1, 1, options=["VERSION=" + version])
     sr = osr.SpatialReference()
     sr.ImportFromEPSG(4979)  # WGS 84 3D
     sr.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER)
@@ -3825,7 +3826,7 @@ def test_gpkg_wkt2():
     lyr = ds.ExecuteSQL(
         "SELECT * FROM gpkg_extensions WHERE extension_name = 'gpkg_crs_wkt'"
     )
-    assert lyr.GetFeatureCount() == 1
+    assert lyr.GetFeatureCount() == (1 if version == "1.2" else 0)
     ds.ReleaseResultSet(lyr)
 
     ds = None

Diff for: autotest/ogr/data/gpkg/poly_golden_gpkg_1_4.gpkg

@@ -309,14 +309,14 @@ def test_ogr_gpkg_1(gpkg_ds, tmp_path):
 
 def test_ogr_gpkg_2(gpkg_ds):
 
-    # Should default to GPKG 1.2
+    # Should default to GPKG 1.4
     with gpkg_ds.ExecuteSQL("PRAGMA application_id") as sql_lyr:
         f = sql_lyr.GetNextFeature()
         assert f["application_id"] == 1196444487
 
     with gpkg_ds.ExecuteSQL("PRAGMA user_version") as sql_lyr:
         f = sql_lyr.GetNextFeature()
-        assert f["user_version"] == 10200
+        assert f["user_version"] == 10400
 
 
 ###############################################################################
@@ -4758,6 +4758,30 @@ def test_ogr_gpkg_47c(tmp_vsimem):
     assert gdal.GetLastErrorMsg() == ""
 
 
+def test_ogr_gpkg_47c2(tmp_vsimem):
+
+    dbname = tmp_vsimem / "ogr_gpkg_47.gpkg"
+
+    # Set GPKG 1.4.0
+    gdaltest.gpkg_dr.CreateDataSource(dbname, options={"VERSION": "1.4"})
+    # Check user_version
+    fp = gdal.VSIFOpenL(dbname, "rb")
+    gdal.VSIFSeekL(fp, 60, 0)
+    assert struct.unpack(">I", gdal.VSIFReadL(4, 1, fp))[0] == 10400
+    gdal.VSIFCloseL(fp)
+
+    gdal.ErrorReset()
+    ds = ogr.Open(dbname, update=1)
+    assert ds is not None
+    assert gdal.GetLastErrorMsg() == ""
+    ds = None
+
+    gdal.ErrorReset()
+    with gdal.config_option("GPKG_WARN_UNRECOGNIZED_APPLICATION_ID", "NO"):
+        ogr.Open(dbname)
+    assert gdal.GetLastErrorMsg() == ""
+
+
 def test_ogr_gpkg_47d(tmp_vsimem):
 
     dbname = tmp_vsimem / "ogr_gpkg_47.gpkg"
@@ -5897,7 +5921,9 @@ def test_ogr_gpkg_prelude_statements_after_spatialite_loading(tmp_vsimem):
 def test_ogr_gpkg_datetime_timezones(tmp_vsimem):
 
     filename = tmp_vsimem / "test_ogr_gpkg_datetime_timezones.gpkg"
-    ds = gdaltest.gpkg_dr.CreateDataSource(filename, options=["DATETIME_FORMAT=UTC"])
+    ds = gdaltest.gpkg_dr.CreateDataSource(
+        filename, options=["DATETIME_FORMAT=UTC", "VERSION=1.2"]
+    )
     lyr = ds.CreateLayer("test")
     lyr.CreateField(ogr.FieldDefn("dt", ogr.OFTDateTime))
     for val in [
@@ -5926,6 +5952,44 @@ def test_ogr_gpkg_datetime_timezones(tmp_vsimem):
     ds = None
 
 
+###############################################################################
+# Test DATETIME_FORMAT
+
+
+def test_ogr_gpkg_datetime_timezones_gpkg_1_4(tmp_vsimem):
+
+    filename = tmp_vsimem / "test_ogr_gpkg_datetime_timezones.gpkg"
+    ds = gdaltest.gpkg_dr.CreateDataSource(
+        filename, options=["DATETIME_FORMAT=UTC", "VERSION=1.4"]
+    )
+    lyr = ds.CreateLayer("test")
+    lyr.CreateField(ogr.FieldDefn("dt", ogr.OFTDateTime))
+    for val in [
+        "2020/01/01 01:34:56",
+        "2020/01/01 01:34:56+00",
+        "2020/01/01 01:34:56.789+02",
+    ]:
+        f = ogr.Feature(lyr.GetLayerDefn())
+        f.SetField("dt", val)
+        lyr.CreateFeature(f)
+    ds = None
+
+    ds = ogr.Open(filename)
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    assert f.GetField("dt") == "2020/01/01 01:34:56+00"
+    f = lyr.GetNextFeature()
+    assert f.GetField("dt") == "2020/01/01 01:34:56+00"
+    f = lyr.GetNextFeature()
+    assert f.GetField("dt") == "2019/12/31 23:34:56.789+00"
+
+    with ds.ExecuteSQL("SELECT dt || '' FROM test") as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        # check that milliseconds are not written, since it is not required since GPKG 1.4
+        assert f.GetField(0) == "2020-01-01T01:34:56Z"
+    ds = None
+
+
 ###############################################################################
 # Test AbortSQL
 
@@ -10825,17 +10889,19 @@ def test_gpkg_secure_delete(tmp_vsimem):
 
 
 @pytest.mark.parametrize(
-    "src_filename",
+    "src_filename,options",
     [
-        # Generated with: ogr2ogr autotest/ogr/data/gpkg/poly_golden.gpkg autotest/ogr/data/poly.shp --config OGR_CURRENT_DATE="2000-01-01T:00:00:00.000Z" -nomd
-        "data/gpkg/poly_golden.gpkg",
+        # Generated with: ogr2ogr autotest/ogr/data/gpkg/poly_golden.gpkg autotest/ogr/data/poly.shp --config OGR_CURRENT_DATE="2000-01-01T:00:00:00.000Z" -nomd -dsco VERSION=1.2
+        ("data/gpkg/poly_golden.gpkg", ["VERSION=1.2"]),
+        # Generated with: ogr2ogr autotest/ogr/data/gpkg/poly_golden_gpkg_1_4.gpkg autotest/ogr/data/poly.shp --config OGR_CURRENT_DATE="2000-01-01T:00:00:00.000Z" -nomd -dsco VERSION=1.4
+        ("data/gpkg/poly_golden_gpkg_1_4.gpkg", ["VERSION=1.4"]),
     ],
 )
-def test_ogr_gpkg_write_check_golden_file(tmp_path, src_filename):
+def test_ogr_gpkg_write_check_golden_file(tmp_path, src_filename, options):
 
     out_filename = str(tmp_path / "test.gpkg")
     with gdal.config_option("OGR_CURRENT_DATE", "2000-01-01T:00:00:00.000Z"):
-        gdal.VectorTranslate(out_filename, src_filename)
+        gdal.VectorTranslate(out_filename, src_filename, datasetCreationOptions=options)
 
     # Compare first sqlite3 dump if sqlite3 binary available
     import subprocess
@@ -10902,8 +10968,8 @@ def test_ogr_gpkg_arrow_stream_numpy_datetime_as_string(tmp_vsimem):
     assert len(batch["datetime"]) == 4
     assert batch["datetime"][0] == b""
     assert batch["datetime"][1] == b"2022-05-31T12:34:56.789Z"
-    assert batch["datetime"][2] == b"2022-05-31T12:34:56.000"
-    assert batch["datetime"][3] == b"2022-05-31T12:34:56.000+12:30"
+    assert batch["datetime"][2] == b"2022-05-31T12:34:56"
+    assert batch["datetime"][3] == b"2022-05-31T12:34:56+12:30"
 
     # Setting a filer tests the use of the less optimized
     # OGRGeoPackageTableLayer::GetNextArray() implementation
@@ -10918,8 +10984,8 @@ def test_ogr_gpkg_arrow_stream_numpy_datetime_as_string(tmp_vsimem):
     assert len(batch["datetime"]) == 4
     assert batch["datetime"][0] == b""
     assert batch["datetime"][1] == b"2022-05-31T12:34:56.789Z"
-    assert batch["datetime"][2] == b"2022-05-31T12:34:56.000"
-    assert batch["datetime"][3] == b"2022-05-31T12:34:56.000+12:30"
+    assert batch["datetime"][2] == b"2022-05-31T12:34:56"
+    assert batch["datetime"][3] == b"2022-05-31T12:34:56+12:30"
 
     with ds.ExecuteSQL("SELECT * FROM test") as sql_lyr:
         stream = sql_lyr.GetArrowStreamAsNumPy(
@@ -10931,8 +10997,8 @@ def test_ogr_gpkg_arrow_stream_numpy_datetime_as_string(tmp_vsimem):
         assert len(batch["datetime"]) == 4
         assert batch["datetime"][0] == b""
         assert batch["datetime"][1] == b"2022-05-31T12:34:56.789Z"
-        assert batch["datetime"][2] == b"2022-05-31T12:34:56.000"
-        assert batch["datetime"][3] == b"2022-05-31T12:34:56.000+12:30"
+        assert batch["datetime"][2] == b"2022-05-31T12:34:56"
+        assert batch["datetime"][3] == b"2022-05-31T12:34:56+12:30"
 
 
 ###############################################################################

Diff for: autotest/ogr/ogr_gpkg.py

@@ -573,13 +573,14 @@ The following creation options are available:
       when AREA_OR_POINT metadata item is not set.
 
 -  .. co:: VERSION
-      :choices: AUTO, 1.0, 1.1, 1.2, 1.3
+      :choices: AUTO, 1.0, 1.1, 1.2, 1.3, 1.4
       :since: 2.2
 
       Set GeoPackage version
       (for application_id and user_version fields). In AUTO mode, this will
-      be equivalent to 1.2 starting with GDAL 2.3.
+      be equivalent to 1.4 starting with GDAL 3.11 (1.2 in prior versions)
       1.3 is available starting with GDAL 3.3
+      1.4 is available starting with GDAL 3.7.1
 
 -  .. co:: ADD_GPKG_OGR_CONTENTS
       :choices: YES, NO

Diff for: doc/source/drivers/raster/gpkg.rst

@@ -44,12 +44,9 @@ Driver capabilities
 Specification version
 ---------------------
 
-Starting with GDAL 2.2, the driver is able to create GeoPackage
-databases following the 1.0/1.0.1, 1.1 or 1.2 versions. For GDAL 2.2, it
-will automatically adjust to the minimum version required for the
-features of GeoPackage used. For GDAL 2.3 or later, it will default to
-1.2. Explicit version choice can be done by specifying the VERSION
-dataset creation option.
+GeoPackage version 1.0, 1.1, 1.2, 1.3 or 1.4 can be specified through the
+VERSION dataset creation option. Starting with GDAL 3.11, it defaults to 1.4.
+For earlier versions, it defaults to 1.2.
 
 Limitations
 -----------
@@ -281,11 +278,11 @@ raster) are available:
 
 -  .. dsco:: VERSION
       :choices: AUTO, 1.0, 1.1, 1.2, 1.3, 1.4
-      :Since: 2.2
+      :since: 2.2
 
       Set GeoPackage version
       (for application_id and user_version fields). In AUTO mode, this will
-      be equivalent to 1.2 starting with GDAL 2.3.
+      be equivalent to 1.4 starting with GDAL 3.11 (1.2 in prior versions)
       1.3 is available starting with GDAL 3.3
       1.4 is available starting with GDAL 3.7.1
 

Diff for: doc/source/drivers/vector/gpkg.rst

@@ -3669,7 +3669,7 @@ int GDALGeoPackageRasterBand::GetOverviewCount()
 {
     GDALGeoPackageDataset *poGDS =
         cpl::down_cast<GDALGeoPackageDataset *>(poDS);
-    return poGDS->m_nOverviewCount;
+    return static_cast<int>(poGDS->m_apoOverviewDS.size());
 }
 
 /************************************************************************/
@@ -3680,9 +3680,9 @@ GDALRasterBand *GDALGeoPackageRasterBand::GetOverview(int nIdx)
 {
     GDALGeoPackageDataset *poGDS =
         reinterpret_cast<GDALGeoPackageDataset *>(poDS);
-    if (nIdx < 0 || nIdx >= poGDS->m_nOverviewCount)
+    if (nIdx < 0 || nIdx >= static_cast<int>(poGDS->m_apoOverviewDS.size()))
         return nullptr;
-    return poGDS->m_papoOverviewDS[nIdx]->GetRasterBand(nBand);
+    return poGDS->m_apoOverviewDS[nIdx]->GetRasterBand(nBand);
 }
 
 /************************************************************************/

Diff for: ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp

@@ -22,6 +22,7 @@
 #include "ogr_p.h"
 #include "ogr_wkb.h"
 
+#include <array>
 #include <condition_variable>
 #include <limits>
 #include <mutex>
@@ -128,9 +129,8 @@ class GDALGeoPackageDataset final : public OGRSQLiteBaseDataSource,
     std::string m_osFilenameInZip{};
     void *m_pSQLFunctionData = nullptr;
     GUInt32 m_nApplicationId = GPKG_APPLICATION_ID;
-    GUInt32 m_nUserVersion = GPKG_1_2_VERSION;
-    OGRGeoPackageTableLayer **m_papoLayers = nullptr;
-    int m_nLayers = 0;
+    GUInt32 m_nUserVersion = GPKG_1_4_VERSION;
+    std::vector<std::unique_ptr<OGRGeoPackageTableLayer>> m_apoLayers{};
     void CheckUnknownExtensions(bool bCheckRasterTable = false);
 #ifdef ENABLE_GPKG_OGR_CONTENTS
     bool m_bHasGPKGOGRContents = false;
@@ -157,7 +157,7 @@ class GDALGeoPackageDataset final : public OGRSQLiteBaseDataSource,
     OGRSpatialReference m_oSRS{};
     bool m_bRecordInsertedInGPKGContent = false;
     bool m_bGeoTransformValid = false;
-    double m_adfGeoTransform[6];
+    std::array<double, 6> m_adfGeoTransform = {0, 0, 0, 0, 0, 0};
     int m_nSRID = -1;  // Unknown Cartesain
     double m_dfTMSMinX = 0.0;
     double m_dfTMSMaxY = 0.0;
@@ -173,8 +173,7 @@ class GDALGeoPackageDataset final : public OGRSQLiteBaseDataSource,
     OGRWKBTransformCache m_oWKBTransformCache{};
     std::vector<GByte> m_abyWKBTransformCache{};
 
-    int m_nOverviewCount = 0;
-    GDALGeoPackageDataset **m_papoOverviewDS = nullptr;
+    std::vector<std::unique_ptr<GDALGeoPackageDataset>> m_apoOverviewDS{};
     bool m_bZoomOther = false;
 
     bool m_bInFlushCache = false;
@@ -293,7 +292,7 @@ class GDALGeoPackageDataset final : public OGRSQLiteBaseDataSource,
     CPL_DISALLOW_COPY_ASSIGN(GDALGeoPackageDataset)
 
   public:
-    GDALGeoPackageDataset();
+    GDALGeoPackageDataset() = default;
     virtual ~GDALGeoPackageDataset();
 
     char **GetFileList(void) override;
@@ -320,7 +319,7 @@ class GDALGeoPackageDataset final : public OGRSQLiteBaseDataSource,
 
     virtual int GetLayerCount() override
     {
-        return m_nLayers;
+        return static_cast<int>(m_apoLayers.size());
     }
 
     int Open(GDALOpenInfo *poOpenInfo, const std::string &osFilenameInZip);
@@ -670,7 +669,7 @@ class OGRGeoPackageTableLayer final : public OGRGeoPackageLayer
     int m_nZFlag = 0;
     int m_nMFlag = 0;
     OGRGeomCoordinateBinaryPrecision m_sBinaryPrecision{};
-    OGREnvelope *m_poExtent = nullptr;
+    std::unique_ptr<OGREnvelope> m_poExtent{};
 #ifdef ENABLE_GPKG_OGR_CONTENTS
     GIntBig m_nTotalFeatureCount = -1;
     bool m_bOGRFeatureCountTriggersEnabled = false;