move constructor

duckdb · Mar 26, 2024 · 6b4b29c · 6b4b29c
1 parent 7fa72ba
commit 6b4b29c
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/spatial/include/spatial/core/geometry/geometry.hpp b/spatial/include/spatial/core/geometry/geometry.hpp
@@ -235,13 +235,7 @@ class TypedCollectionGeometry : public CollectionGeometry {
 protected:
     TypedCollectionGeometry(GeometryType type, bool has_z, bool has_m)
         : CollectionGeometry(type, has_z, has_m) {}
-    TypedCollectionGeometry(GeometryType type, ArenaAllocator &alloc, uint32_t count, bool has_z, bool has_m)
-        : CollectionGeometry(type, alloc, count, has_z, has_m) {
-        auto ptr = data.part_data;
-        for (uint32_t i = 0; i < count; i++) {
-            new(ptr++) T(has_z, has_m);
-        }
-    }
+    TypedCollectionGeometry(GeometryType type, ArenaAllocator &alloc, uint32_t count, bool has_z, bool has_m);
 
 public:
     T &operator[](uint32_t index);
@@ -489,7 +483,9 @@ class Geometry {
                 new(&collection) GeometryCollection(std::move(other.collection));
                 break;
             default:
-                throw NotImplementedException("Geometry::Geometry(Geometry&&)");
+                D_ASSERT(false);
+                new(&point) Point(std::move(other.point));
+                break;
         }
     }
 
@@ -522,7 +518,9 @@ class Geometry {
                 new(&collection) GeometryCollection(std::move(other.collection));
                 break;
             default:
-                throw NotImplementedException("Geometry::operator=(Geometry&&)");
+                D_ASSERT(false);
+                new(&point) Point(std::move(other.point));
+                break;
         }
         return *this;
     }
@@ -659,6 +657,15 @@ inline GeometryCollection::GeometryCollection(ArenaAllocator &alloc, uint32_t co
     }
 }
 
+template<class T>
+inline TypedCollectionGeometry<T>::TypedCollectionGeometry(GeometryType type, ArenaAllocator &alloc, uint32_t count, bool has_z, bool has_m)
+    : CollectionGeometry(type, alloc, count, has_z, has_m) {
+    auto ptr = data.part_data;
+    for (uint32_t i = 0; i < count; i++) {
+        new(ptr++) T(has_z, has_m);
+    }
+}
+
 //-------------------
 // MultiPartGeometry
 //-------------------