clear cache if we are over limit

Signed-off-by: Somtochi Onyekwere <[email protected]>

Author: somtochiama

core/rs/core/src/c.rs

@@ -271,7 +271,7 @@ fn bindgen_test_layout_crsql_ExtData() {
     let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::core::mem::size_of::<crsql_ExtData>(),
-        176usize,
+        168usize,
         concat!("Size of: ", stringify!(crsql_ExtData))
     );
     assert_eq!(

core/rs/core/src/lib.rs

@@ -74,10 +74,12 @@ use sqlite::{Destructor, ResultCode};
 use sqlite_nostd as sqlite;
 use sqlite_nostd::{Connection, Context, Value};
 use tableinfo::{
-    crsql_ensure_table_infos_are_up_to_date, is_table_compatible, pull_table_info, TableInfo,
+    crsql_ensure_table_infos_are_up_to_date, is_table_compatible, pull_table_info,
 };
 use teardown::*;
 use triggers::create_triggers;
+#[cfg(feature = "test")]
+use tableinfo::TableInfo;
 
 pub use debug::debug_log;
 
@@ -469,6 +471,7 @@ pub extern "C" fn sqlite3_crsqlcore_init(
         return null_mut();
     }
 
+    #[cfg(feature = "test")]
     if let Err(_) = db.create_function_v2(
         "crsql_cache_pk_cl",
         2,
@@ -992,6 +995,7 @@ unsafe extern "C" fn x_crsql_cache_site_ordinal(
  * Get the pk cl cached in the ext data for the current transaction.
  * only used for test to inspect the cl cache.
  */
+#[cfg(feature = "test")]
 unsafe extern "C" fn x_crsql_cache_pk_cl(
     ctx: *mut sqlite::context,
     argc: i32,

core/rs/core/src/tableinfo.rs

@@ -28,6 +28,7 @@ use sqlite_nostd::ResultCode;
 use sqlite_nostd::Stmt;
 use sqlite_nostd::StrRef;
 
+const MAX_CL_CACHE_SIZE: usize = 1500;
 pub struct TableInfo {
     pub tbl_name: String,
     pub pks: Vec<ColumnInfo>,
@@ -76,6 +77,10 @@ impl TableInfo {
     }
 
     pub fn set_cl(&mut self, key: i64, cl: i64) {
+        // clear the cache if we are over limit
+        if self.cl_cache.len() >= MAX_CL_CACHE_SIZE {
+            self.cl_cache.clear();
+        }
         self.cl_cache.insert(key, cl);
     }
 

core/src/ext-data.c

@@ -12,8 +12,6 @@ void crsql_drop_ordinal_map(crsql_ExtData *pExtData);
 void crsql_drop_table_info_vec(crsql_ExtData *pExtData);
 void crsql_init_last_db_versions_map(crsql_ExtData *pExtData);
 void crsql_drop_last_db_versions_map(crsql_ExtData *pExtData);
-void crsql_init_cl_cache(crsql_ExtData *pExtData);
-void crsql_drop_cl_cache(crsql_ExtData *pExtData);
 // void crsql_init_table_info_vec(crsql_ExtData *pExtData);
 // void crsql_drop_table_info_vec(crsql_ExtData *pExtData);
 
@@ -77,7 +75,6 @@ crsql_ExtData *crsql_newExtData(sqlite3 *db) {
   crsql_init_table_info_vec(pExtData);
   crsql_init_last_db_versions_map(pExtData);
   crsql_init_ordinal_map(pExtData);
-  crsql_init_cl_cache(pExtData);
 
   sqlite3_stmt *pStmt;
 
@@ -170,7 +167,6 @@ void crsql_freeExtData(crsql_ExtData *pExtData) {
   crsql_drop_table_info_vec(pExtData);
   crsql_drop_last_db_versions_map(pExtData);
   crsql_drop_ordinal_map(pExtData);
-  crsql_drop_cl_cache(pExtData);
   sqlite3_free(pExtData);
 }
 

core/src/ext-data.h

@@ -49,7 +49,6 @@ struct crsql_ExtData {
   int mergeEqualValues;
   unsigned long long timestamp;
   void *ordinalMap;
-  void *clCache;
 };
 
 crsql_ExtData *crsql_newExtData(sqlite3 *db);
@@ -62,7 +61,5 @@ int crsql_recreate_db_version_stmt(sqlite3 *db, crsql_ExtData *pExtData);
 void crsql_finalize(crsql_ExtData *pExtData);
 void crsql_init_ordinal_map(crsql_ExtData *pExtData);
 void crsql_drop_ordinal_map(crsql_ExtData *pExtData);
-void crsql_init_cl_cache(crsql_ExtData *pExtData);
-void crsql_drop_cl_cache(crsql_ExtData *pExtData);
 
 #endif