Changeset 23945

Timestamp:

Feb 11, 2012, 6:33:34 AM (13 years ago)

Author:

Even Rouault

Message:

SQLite: defered layer definition building for table and view layers

Location:

trunk/gdal/ogr/ogrsf_frmts/sqlite

Files:

• ogr_sqlite.h (modified) (4 diffs)
• ogrsqlitedatasource.cpp (modified) (1 diff)
• ogrsqliteviewlayer.cpp (modified) (11 diffs)

trunk/gdal/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h

@@ -358 +358 @@
     int                 bHasCheckedSpatialIndexTable;
 
+    char               *pszViewName;
     char               *pszEscapedTableName;
     char               *pszEscapedUnderlyingTableName;
 
+    int                 bLayerDefnError;
+
     CPLString           osUnderlyingTableName;
     CPLString           osUnderlyingGeometryColumn;
@@ -368 +371 @@
     OGRErr              ResetStatement();
 
+    CPLErr              EstablishFeatureDefn();
+
   public:
                         OGRSQLiteViewLayer( OGRSQLiteDataSource * );
                         ~OGRSQLiteViewLayer();
+
+    virtual const char* GetName() { return pszViewName; }
+    virtual OGRwkbGeometryType GetGeomType();
 
     CPLErr              Initialize( const char *pszViewName,
@@ -379 +387 @@
                                     int bSpatialiteLoaded);
 
+    virtual OGRFeatureDefn *GetLayerDefn();
+    int                 HasLayerDefnError() { GetLayerDefn(); return bLayerDefnError; }
+
+    virtual OGRFeature *GetNextFeature();
     virtual int         GetFeatureCount( int );
 
@@ -387 +399 @@
 
     virtual int         TestCapability( const char * );
+
+    virtual OGRSpatialReference *GetSpatialRef();
 
     virtual CPLString    GetSpatialWhere(OGRGeometry* poFilterGeom);

trunk/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp

@@ -1089 +1089 @@
     }
 
-    /* If not a slow file, then establish layer definition immediately */
-    /* to check if the table is valid */
-    /* Note: we could do differed table layer definition for all files */
-    /* but it is only worth doing for slow files. */
-    if ( strncmp(pszName, "/vsicurl/", 9) != 0 &&
-         poLayer->HasLayerDefnError() )
-    {
-        delete poLayer;
-        return FALSE;
-    }
-    
     poLayer->SetSpatialite2D ( bForce2D );
 

trunk/gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteviewlayer.cpp

@@ -49 +49 @@
 
     poFeatureDefn = NULL;
+    pszViewName = NULL;
     pszEscapedTableName = NULL;
     pszEscapedUnderlyingTableName = NULL;
 
     bHasCheckedSpatialIndexTable = FALSE;
+
+    bLayerDefnError = FALSE;
 }
 
@@ -63 +66 @@
 {
     ClearStatement();
+    CPLFree(pszViewName);
     CPLFree(pszEscapedTableName);
     CPLFree(pszEscapedUnderlyingTableName);
@@ -79 +83 @@
 
 {
+    this->pszViewName = CPLStrdup(pszViewName);
+
+    osGeomColumn = pszViewGeometry;
+    eGeomFormat = OSGF_SpatiaLite;
+
+    CPLFree( pszFIDColumn );
+    pszFIDColumn = CPLStrdup( pszViewRowid );
+
+    osUnderlyingTableName = pszUnderlyingTableName;
+    osUnderlyingGeometryColumn = pszUnderlyingGeometryColumn;
+
+    this->bSpatialiteLoaded = bSpatialiteLoaded;
+    //this->bHasM = bHasM;
+
+    pszEscapedTableName = CPLStrdup(OGRSQLiteEscape(pszViewName));
+    pszEscapedUnderlyingTableName = CPLStrdup(OGRSQLiteEscape(pszUnderlyingTableName));
+
+    return CE_None;
+}
+
+/************************************************************************/
+/*                           GetLayerDefn()                             */
+/************************************************************************/
+
+OGRFeatureDefn* OGRSQLiteViewLayer::GetLayerDefn()
+{
+    if (poFeatureDefn)
+        return poFeatureDefn;
+
+    EstablishFeatureDefn();
+
+    if (poFeatureDefn == NULL)
+    {
+        bLayerDefnError = TRUE;
+
+        poFeatureDefn = new OGRFeatureDefn( pszViewName );
+        poFeatureDefn->Reference();
+    }
+
+    return poFeatureDefn;
+}
+
+/************************************************************************/
+/*                            GetGeomType()                             */
+/************************************************************************/
+
+OGRwkbGeometryType OGRSQLiteViewLayer::GetGeomType()
+{
+    if (poFeatureDefn)
+        return poFeatureDefn->GetGeomType();
+
+    OGRSQLiteLayer* poUnderlyingLayer = (OGRSQLiteLayer*) poDS->GetLayerByName(osUnderlyingTableName);
+    if (poUnderlyingLayer)
+        return poUnderlyingLayer->GetGeomType();
+
+    return wkbUnknown;
+}
+
+/************************************************************************/
+/*                         EstablishFeatureDefn()                       */
+/************************************************************************/
+
+CPLErr OGRSQLiteViewLayer::EstablishFeatureDefn()
+{
     int rc;
     sqlite3 *hDB = poDS->GetDB();
-
-    OGRSQLiteLayer* poUnderlyingLayer = (OGRSQLiteLayer*) poDS->GetLayerByName(pszUnderlyingTableName);
+    sqlite3_stmt *hColStmt = NULL;
+    const char *pszSQL;
+
+    OGRSQLiteLayer* poUnderlyingLayer = (OGRSQLiteLayer*) poDS->GetLayerByName(osUnderlyingTableName);
     if (poUnderlyingLayer == NULL)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Cannot find underlying layer %s for view %s",
-                 pszUnderlyingTableName, pszViewName);
+                 osUnderlyingTableName.c_str(), pszViewName);
         return CE_Failure;
     }
@@ -94 +164 @@
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Underlying layer %s for view %s is not a regular table",
-                 pszUnderlyingTableName, pszViewName);
+                 osUnderlyingTableName.c_str(), pszViewName);
         return CE_Failure;
     }
@@ -100 +170 @@
     const char* pszRealUnderlyingGeometryColumn = poUnderlyingLayer->GetGeometryColumn();
     if ( pszRealUnderlyingGeometryColumn == NULL ||
-         !EQUAL(pszRealUnderlyingGeometryColumn, pszUnderlyingGeometryColumn) )
+         !EQUAL(pszRealUnderlyingGeometryColumn, osUnderlyingGeometryColumn.c_str()) )
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Underlying layer %s for view %s has not expected geometry column name (%s instead of %s)",
-                 pszUnderlyingTableName, pszViewName,
+                 osUnderlyingTableName.c_str(), pszViewName,
                  pszRealUnderlyingGeometryColumn ? pszRealUnderlyingGeometryColumn : "(null)",
-                 pszUnderlyingGeometryColumn);
+                 osUnderlyingGeometryColumn.c_str());
         return CE_Failure;
     }
-
-    osGeomColumn = pszViewGeometry;
-    eGeomFormat = OSGF_SpatiaLite;
-
-    CPLFree( pszFIDColumn );
-    pszFIDColumn = CPLStrdup( pszViewRowid );
-
-    osUnderlyingTableName = pszUnderlyingTableName;
-    osUnderlyingGeometryColumn = pszUnderlyingGeometryColumn;
 
     poSRS = poUnderlyingLayer->GetSpatialRef();
@@ -124 +185 @@
 
     this->bHasSpatialIndex = poUnderlyingLayer->HasSpatialIndex();
-    this->bSpatialiteLoaded = bSpatialiteLoaded;
-    //this->bHasM = bHasM;
-
-    pszEscapedTableName = CPLStrdup(OGRSQLiteEscape(pszViewName));
-    pszEscapedUnderlyingTableName = CPLStrdup(OGRSQLiteEscape(pszUnderlyingTableName));
-
-    sqlite3_stmt *hColStmt = NULL;
-    const char *pszSQL;
 
 /* -------------------------------------------------------------------- */
@@ -209 +262 @@
 }
 
+/************************************************************************/
+/*                           GetSpatialRef()                            */
+/************************************************************************/
+
+OGRSpatialReference *OGRSQLiteViewLayer::GetSpatialRef()
+
+{
+    if (HasLayerDefnError())
+        return NULL;
+
+    return poSRS;
+}
+
+/************************************************************************/
+/*                           GetNextFeature()                           */
+/************************************************************************/
+
+OGRFeature *OGRSQLiteViewLayer::GetNextFeature()
+
+{
+    if (HasLayerDefnError())
+        return NULL;
+
+    return OGRSQLiteLayer::GetNextFeature();
+}
 
 /************************************************************************/
@@ -217 +295 @@
 
 {
+    if (HasLayerDefnError())
+        return NULL;
+
 /* -------------------------------------------------------------------- */
 /*      If we don't have an explicit FID column, just read through      */
@@ -305 +386 @@
 {
     CPLString osSpatialWHERE;
+
+    if (HasLayerDefnError())
+        return "";
 
     if( poFilterGeom != NULL && bHasSpatialIndex )
@@ -422 +506 @@
 
 {
+    if (HasLayerDefnError())
+        return FALSE;
+
     if (EQUAL(pszCap,OLCFastFeatureCount))
         return m_poFilterGeom == NULL || osGeomColumn.size() == 0 ||
@@ -445 +532 @@
 
 {
+    if (HasLayerDefnError())
+        return 0;
+
     if( !TestCapability(OLCFastFeatureCount) )
         return OGRSQLiteLayer::GetFeatureCount( bForce );