Don't cache failed blocks

Address review
rouault · Feb 5, 2024 · a09b3d0 · a09b3d0
1 parent 9ea3725
commit a09b3d0
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/python/PyQt6/core/auto_generated/pointcloud/qgspointcloudblock.sip.in b/python/PyQt6/core/auto_generated/pointcloud/qgspointcloudblock.sip.in
@@ -34,10 +34,12 @@ Ctor
 %End
     virtual ~QgsPointCloudBlock();
 
-    QgsPointCloudBlock *clone() const;
+    QgsPointCloudBlock *clone() const /Factory/;
 %Docstring
 Clones the QgsPointCloudBlock returning a new copy.
 Caller takes ownership of the returned object.
+
+.. versionadded:: 3.36
 %End
 
     const char *data() const;

diff --git a/python/core/auto_generated/pointcloud/qgspointcloudblock.sip.in b/python/core/auto_generated/pointcloud/qgspointcloudblock.sip.in
@@ -34,10 +34,12 @@ Ctor
 %End
     virtual ~QgsPointCloudBlock();
 
-    QgsPointCloudBlock *clone() const;
+    QgsPointCloudBlock *clone() const /Factory/;
 %Docstring
 Clones the QgsPointCloudBlock returning a new copy.
 Caller takes ownership of the returned object.
+
+.. versionadded:: 3.36
 %End
 
     const char *data() const;

diff --git a/src/core/pointcloud/qgspointcloudblock.h b/src/core/pointcloud/qgspointcloudblock.h
@@ -48,8 +48,9 @@ class CORE_EXPORT QgsPointCloudBlock
     /**
      * Clones the QgsPointCloudBlock returning a new copy.
      * Caller takes ownership of the returned object.
+     * \since QGIS 3.36
      */
-    QgsPointCloudBlock *clone() const;
+    QgsPointCloudBlock *clone() const SIP_FACTORY;
 
     //! Returns raw pointer to data
     const char *data() const;

diff --git a/src/core/pointcloud/qgspointcloudindex.cpp b/src/core/pointcloud/qgspointcloudindex.cpp
@@ -410,6 +410,9 @@ void QgsPointCloudIndex::storeNodeDataToCache( QgsPointCloudBlock *data, const I
 
 void QgsPointCloudIndex::storeNodeDataToCacheStatic( QgsPointCloudBlock *data, const IndexedPointCloudNode &node, const QgsPointCloudRequest &request, const QgsPointCloudExpression &expression, const QString &uri )
 {
+  if ( !data )
+    return;
+
   QgsPointCloudCacheKey key( node, request, expression, uri );
 
   const int cost = data->pointCount() * data->pointRecordSize();

diff --git a/src/core/pointcloud/qgspointcloudrequest.cpp b/src/core/pointcloud/qgspointcloudrequest.cpp
@@ -24,7 +24,7 @@ QgsPointCloudRequest::QgsPointCloudRequest() = default;
 bool QgsPointCloudRequest::operator==( const QgsPointCloudRequest &other ) const
 {
   return mFilterRect == other.filterRect() &&
-         mAttributes.toFields() == other.attributes().toFields(); //todo: QgsPointCloudAttributeCollection::operator==
+         mAttributes.toFields() == other.attributes().toFields();
 }
 
 QgsPointCloudAttributeCollection QgsPointCloudRequest::attributes() const