From bd87214ceb530e0f8641dba37cbf1686a4d5d65a Mon Sep 17 00:00:00 2001 From: Laurens Kuiper Date: Fri, 15 Nov 2024 14:17:45 +0100 Subject: [PATCH] remove fts --- src/main/extension/extension_helper.cpp | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/src/main/extension/extension_helper.cpp b/src/main/extension/extension_helper.cpp index 18b7cbb2e8a..e6fb885334e 100644 --- a/src/main/extension/extension_helper.cpp +++ b/src/main/extension/extension_helper.cpp @@ -36,10 +36,6 @@ #define DUCKDB_EXTENSION_TPCDS_LINKED false #endif -#ifndef DUCKDB_EXTENSION_FTS_LINKED -#define DUCKDB_EXTENSION_FTS_LINKED false -#endif - #ifndef DUCKDB_EXTENSION_HTTPFS_LINKED #define DUCKDB_EXTENSION_HTTPFS_LINKED false #endif @@ -82,10 +78,6 @@ #include "tpcds_extension.hpp" #endif -#if DUCKDB_EXTENSION_FTS_LINKED -#include "fts_extension.hpp" -#endif - #if DUCKDB_EXTENSION_HTTPFS_LINKED #include "httpfs_extension.hpp" #endif @@ -116,7 +108,6 @@ static const DefaultExtension internal_extensions[] = { {"parquet", "Adds support for reading and writing parquet files", DUCKDB_EXTENSION_PARQUET_LINKED}, {"tpch", "Adds TPC-H data generation and query support", DUCKDB_EXTENSION_TPCH_LINKED}, {"tpcds", "Adds TPC-DS data generation and query support", DUCKDB_EXTENSION_TPCDS_LINKED}, - {"fts", "Adds support for Full-Text Search Indexes", DUCKDB_EXTENSION_FTS_LINKED}, {"httpfs", "Adds support for reading and writing files over a HTTP(S) connection", DUCKDB_EXTENSION_HTTPFS_LINKED}, {"json", "Adds support for JSON operations", DUCKDB_EXTENSION_JSON_LINKED}, {"jemalloc", "Overwrites system allocator with JEMalloc", DUCKDB_EXTENSION_JEMALLOC_LINKED}, @@ -134,6 +125,7 @@ static const DefaultExtension internal_extensions[] = { {"iceberg", "Adds support for Apache Iceberg", false}, {"vss", "Adds indexing support to accelerate Vector Similarity Search", false}, {"delta", "Adds support for Delta Lake", false}, + {"fts", "Adds support for Full-Text Search Indexes", false}, {nullptr, nullptr, false}}; idx_t ExtensionHelper::DefaultExtensionCount() { @@ -414,8 +406,8 @@ void ExtensionHelper::LoadAllExtensions(DuckDB &db) { // The in-tree extensions that we check. Non-cmake builds are currently limited to these for static linking // TODO: rewrite package_build.py to allow also loading out-of-tree extensions in non-cmake builds, after that // these can be removed - vector extensions {"parquet", "icu", "tpch", "tpcds", "fts", "httpfs", - "json", "excel", "inet", "jemalloc", "autocomplete", "core_functions"}; + vector extensions {"parquet", "icu", "tpch", "tpcds", "httpfs", "json", + "excel", "inet", "jemalloc", "autocomplete", "core_functions"}; for (auto &ext : extensions) { LoadExtensionInternal(db, ext, true); } @@ -502,13 +494,6 @@ ExtensionLoadResult ExtensionHelper::LoadExtensionInternal(DuckDB &db, const std #else // icu extension required but not build: skip this test return ExtensionLoadResult::NOT_LOADED; -#endif - } else if (extension == "fts") { -#if DUCKDB_EXTENSION_FTS_LINKED -// db.LoadStaticExtension(); -#else - // fts extension required but not build: skip this test - return ExtensionLoadResult::NOT_LOADED; #endif } else if (extension == "httpfs") { #if DUCKDB_EXTENSION_HTTPFS_LINKED