remove dead code

Author: Maxxen

src/spatial/CMakeLists.txt

@@ -8,6 +8,5 @@ set(EXTENSION_SOURCES
     ${EXTENSION_SOURCES}
     ${CMAKE_CURRENT_SOURCE_DIR}/spatial_extension.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/spatial_types.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/spatial_optimizers.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/spatial_geoarrow.cpp
 PARENT_SCOPE)

src/spatial/operators/spatial_join_logical.cpp

@@ -9,19 +9,6 @@
 
 namespace duckdb {
 
-unique_ptr<Expression> SpatialJoinCondition::ToExpr(ClientContext &context) const {
-	auto &catalog = Catalog::GetSystemCatalog(context);
-
-	auto &func_set = catalog.GetEntry(context, CatalogType::SCALAR_FUNCTION_ENTRY, DEFAULT_SCHEMA, predicate)
-	                     .Cast<ScalarFunctionCatalogEntry>();
-
-	auto func = func_set.functions.GetFunctionByArguments(context, {left->return_type, right->return_type});
-	vector<unique_ptr<Expression>> args;
-	args.push_back(left->Copy());
-	args.push_back(right->Copy());
-	return make_uniq_base<Expression, BoundFunctionExpression>(func.return_type, func, std::move(args), nullptr);
-}
-
 LogicalSpatialJoin::LogicalSpatialJoin(JoinType join_type_p) : join_type(join_type_p) {
 }
 

src/spatial/operators/spatial_join_logical.hpp

@@ -4,15 +4,6 @@
 
 namespace duckdb {
 
-struct SpatialJoinCondition {
-	unique_ptr<Expression> left;
-	unique_ptr<Expression> right;
-	string predicate;
-
-	// TODO: Make non-const, destroy children
-	unique_ptr<Expression> ToExpr(ClientContext &context) const;
-};
-
 class LogicalSpatialJoin final : public LogicalExtensionOperator {
 public:
 	static constexpr auto TYPE = LogicalOperatorType::LOGICAL_EXTENSION_OPERATOR;

src/spatial/operators/spatial_join_optimizer.cpp

@@ -148,7 +148,7 @@ static void TryInsertSpatialJoin(OptimizerExtensionInput &input, unique_ptr<Logi
 	}
 }
 
-void SpatialJoinRule::Register(DatabaseInstance &db) {
+void SpatialJoinOptimizer::Register(DatabaseInstance &db) {
 
 	OptimizerExtension optimizer;
 	optimizer.optimize_function = TryInsertSpatialJoin;

src/spatial/operators/spatial_join_optimizer.hpp

@@ -4,7 +4,7 @@ namespace duckdb {
 
 class DatabaseInstance;
 
-struct SpatialJoinRule {
+struct SpatialJoinOptimizer {
 	static void Register(DatabaseInstance &db);
 };
 

src/spatial/spatial_extension.cpp

@@ -11,7 +11,6 @@
 #include "spatial/modules/osm/osm_module.hpp"
 #include "spatial/modules/proj/proj_module.hpp"
 #include "spatial/modules/shapefile/shapefile_module.hpp"
-#include "spatial/spatial_optimizers.hpp"
 #include "spatial/spatial_types.hpp"
 #include "spatial/spatial_geoarrow.hpp"
 #include "spatial/operators/spatial_join_optimizer.hpp"
@@ -27,8 +26,7 @@ static void LoadInternal(DatabaseInstance &instance) {
 	RegisterSpatialScalarFunctions(instance);
 	RegisterSpatialAggregateFunctions(instance);
 	RegisterSpatialTableFunctions(instance);
-	SpatialJoinRule::Register(instance);
-	RegisterSpatialOptimizers(instance);
+	SpatialJoinOptimizer::Register(instance);
 	GeoArrow::Register(instance);
 
 	RegisterProjModule(instance);