Merge pull request duckdb#280 from Maxxen/dev

Support geometries with Z and M values

Author: Maxxen

spatial/include/spatial/common.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "duckdb.hpp"
+#include "duckdb/common/typedefs.hpp"
 #include "duckdb/common/helper.hpp"
 #include "duckdb/main/extension_util.hpp"
 

spatial/include/spatial/core/functions/cast.hpp

@@ -13,7 +13,7 @@ struct CoreVectorOperations {
 	static void LineString2DToVarchar(Vector &source, Vector &result, idx_t count);
 	static void Polygon2DToVarchar(Vector &source, Vector &result, idx_t count);
 	static void Box2DToVarchar(Vector &source, Vector &result, idx_t count);
-	static void GeometryToVarchar(Vector &source, Vector &result, idx_t count, GeometryFactory &factory);
+	static void GeometryToVarchar(Vector &source, Vector &result, idx_t count);
 };
 
 struct CoreCastFunctions {

spatial/include/spatial/core/functions/macros.hpp

@@ -0,0 +1,16 @@
+#pragma once
+#include "spatial/common.hpp"
+#include "spatial/core/geometry/geometry.hpp"
+
+namespace spatial {
+
+namespace core {
+
+struct CoreScalarMacros {
+public:
+    static void Register(DatabaseInstance &db);
+};
+
+} // namespace core
+
+} // namespace spatial

spatial/include/spatial/core/functions/scalar.hpp

@@ -24,8 +24,10 @@ struct CoreScalarFunctions {
 		RegisterStExtent(db);
 		RegisterStExteriorRing(db);
 		RegisterStFlipCoordinates(db);
+		RegisterStForce(db);
 		RegisterStGeometryType(db);
 		RegisterStGeomFromHEXWKB(db);
+        RegisterStGeomFromText(db);
 		RegisterStGeomFromWKB(db);
 		RegisterStIntersects(db);
 		RegisterStIntersectsExtent(db);
@@ -49,6 +51,12 @@ struct CoreScalarFunctions {
 		RegisterStY(db);
 		RegisterStYMax(db);
 		RegisterStYMin(db);
+		RegisterStZ(db);
+		RegisterStZMax(db);
+		RegisterStZMin(db);
+		RegisterStM(db);
+		RegisterStMMax(db);
+		RegisterStMMin(db);
 	}
 
 private:
@@ -100,12 +108,18 @@ struct CoreScalarFunctions {
 	// ST_FlipCoordinates
 	static void RegisterStFlipCoordinates(DatabaseInstance &db);
 
+	// ST_Force(2D/3D)
+	static void RegisterStForce(DatabaseInstance &db);
+
 	// ST_GeometryType
 	static void RegisterStGeometryType(DatabaseInstance &db);
 
 	// ST_GeomFromHEXWKB
 	static void RegisterStGeomFromHEXWKB(DatabaseInstance &db);
 
+    // ST_GeomFromText
+    static void RegisterStGeomFromText(DatabaseInstance &db);
+
 	// ST_GeomFromWKB
 	static void RegisterStGeomFromWKB(DatabaseInstance &db);
 
@@ -174,6 +188,24 @@ struct CoreScalarFunctions {
 
 	// ST_YMin
 	static void RegisterStYMin(DatabaseInstance &db);
+
+	// ST_Z
+	static void RegisterStZ(DatabaseInstance &db);
+
+	// ST_ZMax
+	static void RegisterStZMax(DatabaseInstance &db);
+
+	// ST_ZMin
+	static void RegisterStZMin(DatabaseInstance &db);
+
+	// ST_M
+	static void RegisterStM(DatabaseInstance &db);
+
+	// ST_MMax
+	static void RegisterStMMax(DatabaseInstance &db);
+
+	// ST_MMin
+	static void RegisterStMMin(DatabaseInstance &db);
 };
 
 } // namespace core

spatial/include/spatial/core/functions/table.hpp

@@ -13,12 +13,14 @@ struct CoreTableFunctions {
 		// TODO: Move these
 		RegisterShapefileTableFunction(db);
 		RegisterShapefileMetaTableFunction(db);
+		RegisterTestTableFunctions(db);
 	}
 
 private:
 	static void RegisterOsmTableFunction(DatabaseInstance &db);
 	static void RegisterShapefileTableFunction(DatabaseInstance &db);
 	static void RegisterShapefileMetaTableFunction(DatabaseInstance &db);
+	static void RegisterTestTableFunctions(DatabaseInstance &db);
 };
 
 } // namespace core

spatial/include/spatial/core/geometry/cursor.hpp

@@ -5,6 +5,7 @@ namespace spatial {
 
 namespace core {
 
+// TODO: Split this into a read and write cursor. Get rid of bounds checks in release mode
 class Cursor {
 private:
 	data_ptr_t start;
@@ -17,13 +18,21 @@ class Cursor {
 	explicit Cursor(data_ptr_t start, data_ptr_t end) : start(start), ptr(start), end(end) {
 	}
 
-	explicit Cursor(string_t blob) : start((data_ptr_t)blob.GetDataUnsafe()), ptr(start), end(start + blob.GetSize()) {
+	// Be really careful with passing string_ts here, if we accidentally copy we may end up writing to the inlined data
+	// of a temporary
+	explicit Cursor(const string_t &blob)
+	    : start((data_ptr_t)blob.GetDataWriteable()), ptr(start), end(start + blob.GetSize()) {
 	}
 
 	data_ptr_t GetPtr() {
 		return ptr;
 	}
 
+	uint32_t Remaining() {
+		D_ASSERT(ptr <= end);
+		return end - ptr;
+	}
+
 	void SetPtr(data_ptr_t ptr_p) {
 		if (ptr_p < start || ptr_p > end) {
 			throw SerializationException("Trying to set ptr outside of buffer");
@@ -61,6 +70,12 @@ class Cursor {
 		return Load<T>(ptr);
 	}
 
+	template <class T>
+	void Skip() {
+		static_assert(std::is_trivially_copyable<T>::value, "T must be trivially copyable");
+		Skip(sizeof(T));
+	}
+
 	void Skip(uint32_t bytes) {
 		if (ptr + bytes > end) {
 			throw SerializationException("Trying to read past end of buffer");