MSSQLSpatial Fix BCP performance problem (OSGeo#9112)

szekerest · Jan 21, 2024 · 0101453 · 0101453
1 parent fc0ec2b
commit 0101453
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 6 deletions.
diff --git a/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h b/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h
@@ -666,6 +666,8 @@ class OGRMSSQLSpatialDataSource final : public OGRDataSource
     static char *LaunderName(const char *pszSrcName);
     OGRErr InitializeMetadataTables();
 
+    void AddSRIDToCache(int nId, OGRSpatialReference *poSRS);
+
     OGRSpatialReference *FetchSRS(int nId);
     int FetchSRSId(const OGRSpatialReference *poSRS);
 

diff --git a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp
@@ -1514,17 +1514,33 @@ OGRSpatialReference *OGRMSSQLSpatialDataSource::FetchSRS(int nId)
     /* -------------------------------------------------------------------- */
     if (poSRS)
     {
-        panSRID = (int *)CPLRealloc(panSRID, sizeof(int) * (nKnownSRID + 1));
-        papoSRS = (OGRSpatialReference **)CPLRealloc(
-            papoSRS, sizeof(void *) * (nKnownSRID + 1));
-        panSRID[nKnownSRID] = nId;
-        papoSRS[nKnownSRID] = poSRS;
-        nKnownSRID++;
+        AddSRIDToCache(nId, poSRS);
     }
 
     return poSRS;
 }
 
+/************************************************************************/
+/*                         AddSRIDToCache()                             */
+/*                                                                      */
+/*      Note: this will not add a reference on the poSRS object. Make   */
+/*      sure it is freshly created, or add a reference yourself if not. */
+/************************************************************************/
+
+void OGRMSSQLSpatialDataSource::AddSRIDToCache(int nId,
+                                               OGRSpatialReference *poSRS)
+{
+    /* -------------------------------------------------------------------- */
+    /*      Add to the cache.                                               */
+    /* -------------------------------------------------------------------- */
+    panSRID = (int *)CPLRealloc(panSRID, sizeof(int) * (nKnownSRID + 1));
+    papoSRS = (OGRSpatialReference **)CPLRealloc(papoSRS, sizeof(void *) *
+                                                              (nKnownSRID + 1));
+    panSRID[nKnownSRID] = nId;
+    papoSRS[nKnownSRID] = poSRS;
+    nKnownSRID++;
+}
+
 /************************************************************************/
 /*                             FetchSRSId()                             */
 /*                                                                      */
@@ -1541,6 +1557,19 @@ int OGRMSSQLSpatialDataSource::FetchSRSId(const OGRSpatialReference *poSRS)
 
     if (poSRS == nullptr)
         return 0;
+    /* -------------------------------------------------------------------- */
+    /*      First, we look through our SRID cache, is it there?             */
+    /* -------------------------------------------------------------------- */
+    for (int i = 0; i < nKnownSRID; i++)
+    {
+        if (papoSRS[i] == poSRS)
+            return panSRID[i];
+    }
+    for (int i = 0; i < nKnownSRID; i++)
+    {
+        if (papoSRS[i] != nullptr && papoSRS[i]->IsSame(poSRS))
+            return panSRID[i];
+    }
 
     OGRSpatialReference oSRS(*poSRS);
     // cppcheck-suppress uselessAssignmentPtrArg
@@ -1590,6 +1619,12 @@ int OGRMSSQLSpatialDataSource::FetchSRSId(const OGRSpatialReference *poSRS)
         if (oStmt.ExecuteSQL() && oStmt.Fetch() && oStmt.GetColData(0))
         {
             nSRSId = atoi(oStmt.GetColData(0));
+            if (nSRSId != 0)
+            {
+                auto poCachedSRS = new OGRSpatialReference(oSRS);
+                poCachedSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+                AddSRIDToCache(nSRSId, poCachedSRS);
+            }
             return nSRSId;
         }
     }