Remove duckdb object cache (#7739)

We don't use it anyway as the right way is to use MultiFileSession
and get file footers out of it.

Signed-off-by: Mikhail Kot <to@myrrc.dev>

Author: myrrc

vortex-duckdb/build.rs

@@ -20,7 +20,7 @@ const DUCKDB_SOURCE_COMMIT_URL: &str = "https://github.com/duckdb/duckdb/archive
 
 const BUILD_ARTIFACTS: [&str; 3] = ["libduckdb.dylib", "libduckdb.so", "libduckdb_static.a"];
 
-const SOURCE_FILES: [&str; 18] = [
+const SOURCE_FILES: [&str; 17] = [
     "cpp/client_context.cpp",
     "cpp/config.cpp",
     "cpp/copy_function.cpp",
@@ -30,7 +30,6 @@ const SOURCE_FILES: [&str; 18] = [
     "cpp/expr.cpp",
     "cpp/file_system.cpp",
     "cpp/logical_type.cpp",
-    "cpp/object_cache.cpp",
     "cpp/replacement_scan.cpp",
     "cpp/reusable_dict.cpp",
     "cpp/scalar_function.cpp",

vortex-duckdb/cpp/client_context.cpp

@@ -1,13 +1,11 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
-#include "duckdb_vx.h"
-
 #include "duckdb_vx/duckdb_diagnostics.h"
+
 DUCKDB_INCLUDES_BEGIN
 #include <duckdb/main/client_context.hpp>
 #include <duckdb/main/connection.hpp>
-#include <duckdb/storage/object_cache.hpp>
 DUCKDB_INCLUDES_END
 
 extern "C" duckdb_client_context duckdb_vx_connection_get_client_context(duckdb_connection conn) {
@@ -19,16 +17,6 @@ extern "C" duckdb_client_context duckdb_vx_connection_get_client_context(duckdb_
     }
 }
 
-extern "C" duckdb_vx_object_cache duckdb_client_context_get_object_cache(duckdb_client_context ffi_context) {
-    try {
-        auto *context = reinterpret_cast<duckdb::ClientContext *>(ffi_context);
-        // This is okay because this is a ref to the object cache, this lives as long as the database.
-        return reinterpret_cast<duckdb_vx_object_cache>(&duckdb::ObjectCache::GetObjectCache(*context));
-    } catch (...) {
-        return nullptr;
-    }
-}
-
 extern "C" duckdb_value duckdb_client_context_try_get_current_setting(duckdb_client_context context,
                                                                       const char *key) {
     if (!context || !key) {

vortex-duckdb/cpp/include/duckdb_vx.h

@@ -12,7 +12,6 @@
 #include "duckdb_vx/expr.h"
 #include "duckdb_vx/file_system.h"
 #include "duckdb_vx/logical_type.h"
-#include "duckdb_vx/object_cache.h"
 #include "duckdb_vx/reusable_dict.h"
 #include "duckdb_vx/replacement_scan.h"
 #include "duckdb_vx/scalar_function.h"

vortex-duckdb/cpp/include/duckdb_vx/object_cache.h

@@ -3,11 +3,7 @@
 
 use std::ffi::CStr;
 
-use vortex::error::vortex_panic;
-
 use crate::cpp;
-use crate::duckdb::ObjectCache;
-use crate::duckdb::ObjectCacheRef;
 use crate::duckdb::Value;
 use crate::lifetime_wrapper;
 
@@ -36,17 +32,6 @@ impl ClientContextRef {
         unsafe { &*(self as *const Self) }
     }
 
-    /// Get the object cache for this client context.
-    pub fn object_cache(&self) -> &ObjectCacheRef {
-        unsafe {
-            let cache = cpp::duckdb_client_context_get_object_cache(self.as_ptr());
-            if cache.is_null() {
-                vortex_panic!("Failed to get object cache from client context");
-            }
-            ObjectCache::borrow(cache)
-        }
-    }
-
     /// Try to get the current value of a configuration setting.
     /// Returns None if the setting doesn't exist.
     pub fn try_get_current_setting(&self, key: &CStr) -> Option<Value> {

vortex-duckdb/cpp/object_cache.cpp

@@ -273,45 +273,4 @@ mod tests {
         let result = conn.query("DELETE FROM test WHERE id > 1").unwrap();
         assert_eq!(result.row_count(), 2);
     }
-
-    #[derive(Debug, PartialEq)]
-    struct TestCacheEntry {
-        data: String,
-        value: i32,
-    }
-
-    #[test]
-    fn test_object_cache_put_get() {
-        let conn = test_connection().unwrap();
-        let client_context = conn.client_context().unwrap();
-        let cache = client_context.object_cache();
-
-        // Test with a simple struct
-        let test_entry = TestCacheEntry {
-            data: "hello world".to_string(),
-            value: 42,
-        };
-
-        // Store the entry in the cache
-        cache.put("test_key", test_entry);
-
-        // Retrieve it back
-        let retrieved = cache.get::<TestCacheEntry>("test_key");
-        assert!(retrieved.is_some());
-
-        let retrieved_entry = retrieved.unwrap();
-        assert_eq!(retrieved_entry.data, "hello world");
-        assert_eq!(retrieved_entry.value, 42);
-    }
-
-    #[test]
-    fn test_object_cache_get_nonexistent() {
-        let conn = test_connection().unwrap();
-        let client_context = conn.client_context().unwrap();
-        let cache = client_context.object_cache();
-
-        // Try to get a non-existent key
-        let result = cache.get::<TestCacheEntry>("nonexistent_key");
-        assert!(result.is_none());
-    }
 }

vortex-duckdb/src/duckdb/client_context.rs

@@ -13,7 +13,6 @@ mod expr;
 mod file_system;
 mod logical_type;
 mod macro_;
-mod object_cache;
 mod query_result;
 mod reusable_dict;
 mod scalar_function;
@@ -38,7 +37,6 @@ pub use ddb_string::*;
 pub use expr::*;
 pub use file_system::*;
 pub use logical_type::*;
-pub use object_cache::*;
 pub use query_result::*;
 pub use reusable_dict::*;
 pub use scalar_function::*;

vortex-duckdb/src/duckdb/connection.rs

@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
-#[cfg(test)]
-mod object_cache_test;
 #[cfg(test)]
 mod vortex_scan_test;