Changeset 3724 for framework

Timestamp:

01/19/11 11:09:43 (16 months ago)

Author:

elemoine

Message:

improve bulk inserts performance, thanks Jorge Gustavo Rocha for reporting the issue, r=bbinet (closes #612)

Location:

framework/server/trunk/mapfish

Files:

• protocol.py (modified) (3 diffs)
• sqlalchemygeom.py (modified) (1 diff)
• tests/test_oracle.py (modified) (1 diff)
• tests/test_protocol.py (modified) (1 diff)

framework/server/trunk/mapfish/protocol.py

@@ -307 +307 @@
                 self.Session.add(obj)
             objects.append(obj)
+        # We call flush, create the feature collection, and then commit. Commit
+        # expires the session, so we create the feature collection before
+        # commit to avoid SELECT queries in toFeature.
+        if execute:
+            self.Session.flush()
+        collection = None
+        if len(objects) > 0:
+            collection = FeatureCollection([o.toFeature() for o in objects])
         if execute:
             self.Session.commit()
         response.status = 201
-        if len(objects) > 0:
-            features = [o.toFeature() for o in objects]
-            return FeatureCollection(features)
-        return
+        return collection
 
     def update(self, request, response, id):
@@ -331 +336 @@
             self.before_update(request, feature, obj)
         self.__copy_attributes(feature, obj)
+        # We call flush, create the feature, and then commit. Commit expires
+        # the session, so we create the feature before commit to avoid SELECT
+        # queries in toFeature.
+        self.Session.flush()
+        feature = obj.toFeature()
         self.Session.commit()
         response.status = 201
-        return obj.toFeature()
+        return feature
 
     def delete(self, request, response, id):
@@ -352 +362 @@
         """Updates the passed-in object with the values
         from the GeoJSON feature."""
-        # create a Shapely geometry from GeoJSON and persist the geometry using WKB
+        # create a Shapely geometry from GeoJSON and persist the geometry
+        # using WKB
         shape = asShape(json_feature.geometry)
         srid = self.mapped_class.geometry_column().type.srid
         obj.geometry = WKBSpatialElement(buffer(shape.wkb), srid=srid)
-        # also store the Shapely geometry so that we can use it to return the geometry as GeoJSON
-        obj.geometry.shape = shape
+        # also store the Shapely geometry so that we can use it to return the
+        # geometry as GeoJSON and avoid a SELECT
+        obj._mf_shape = shape
         for key in json_feature.properties:
             obj[key] = json_feature.properties[key]

framework/server/trunk/mapfish/sqlalchemygeom.py

@@ -209 +209 @@
                 attributes[k] = getattr(self, k)
         
-        if hasattr(self.geometry, 'shape') and self.geometry.shape is not None:
+        if hasattr(self, '_mf_shape') and self._mf_shape is not None:
             # we already have the geometry as Shapely geometry (when updating/inserting)
-            geometry = self.geometry.shape
+            geometry = self._mf_shape
         elif hasattr(self.geometry, 'geom_wkb') and self.geometry.geom_wkb is not None:
             # create a Shapely geometry from the WKB geometry returned from the database

framework/server/trunk/mapfish/tests/test_oracle.py

@@ -58 +58 @@
 
 #engine = create_engine('oracle://gis:gis@localhost:1521/gis', echo=True)
-engine = create_engine('oracle://system:system@172.16.103.134:1521/gis', echo=True)
+engine = create_engine('oracle://system:system@172.16.103.136:1521/gis', echo=True)
 
 metadata = MetaData(engine)

framework/server/trunk/mapfish/tests/test_protocol.py

@@ -330 +330 @@
         for obj in Session.new:
             assert obj["text"] == "foo"
-            assert obj.geometry.shape.x == 45
-            assert obj.geometry.shape.y == 5
+            assert obj._mf_shape.x == 45
+            assert obj._mf_shape.y == 5
         Session.rollback()