public: Remove fallback_cache feature

Remove used fallback_cache feature. Release-Note-Core: Removed unused and hidden fallback_cache feature. Change-Id: I5bc35e28a983fffdc38cad141a2713b25c0b5d5a Reviewed-on: https://gerrit.readyset.name/c/readyset/+/5836 Tested-by: Buildkite CI Reviewed-by: Dan Wilbanks <[email protected]>
readysettech · Aug 21, 2023 · c92db77 · c92db77
1 parent 029b019
commit c92db77
Show file tree

Hide file tree

Showing 20 changed files with 31 additions and 1,002 deletions.
diff --git a/benchmarks/src/benchmark.rs b/benchmarks/src/benchmark.rs
@@ -23,7 +23,6 @@ use serde::{Deserialize, Serialize};
 
 use crate::cache_hit_benchmark::CacheHitBenchmark;
 use crate::eviction_benchmark::EvictionBenchmark;
-use crate::fallback_benchmark::FallbackBenchmark;
 use crate::graph::ArgOverride;
 use crate::migration_benchmark::MigrationBenchmark;
 use crate::query_benchmark::QueryBenchmark;
@@ -54,7 +53,6 @@ pub enum Benchmark {
     MigrationBenchmark,
     EvictionBenchmark,
     ReadWriteBenchmark,
-    FallbackBenchmark,
     SingleQueryBenchmark,
     WorkloadEmulator,
 }
@@ -72,7 +70,6 @@ impl Benchmark {
             Self::MigrationBenchmark(_) => "migration_benchmark",
             Self::EvictionBenchmark(_) => "eviction",
             Self::ReadWriteBenchmark(_) => "read_write_benchmark",
-            Self::FallbackBenchmark(_) => "fallback_benchmark",
             Self::SingleQueryBenchmark(_) => "single_query_benchmark",
             Self::WorkloadEmulator(_) => "workload_emulator",
         }
@@ -91,7 +88,6 @@ impl Benchmark {
                 Benchmark::MigrationBenchmark(x) => x.update_from(itr),
                 Benchmark::EvictionBenchmark(x) => x.update_from(itr),
                 Benchmark::ReadWriteBenchmark(x) => x.update_from(itr),
-                Benchmark::FallbackBenchmark(x) => x.update_from(itr),
                 Benchmark::SingleQueryBenchmark(x) => x.update_from(itr),
                 Benchmark::WorkloadEmulator(x) => x.update_from(itr),
             },
@@ -126,9 +122,6 @@ pub struct DeploymentParameters {
     #[clap(long, env = "SETUP_CONN_STR", default_value = "")]
     pub setup_conn_str: String,
 
-    #[clap(long)]
-    pub enable_fallback_cache: bool,
-
     #[clap(long)]
     pub database_type: DatabaseType,
 

diff --git a/benchmarks/src/fallback_benchmark.rs b/benchmarks/src/fallback_benchmark.rs
diff --git a/benchmarks/src/lib.rs b/benchmarks/src/lib.rs
@@ -98,7 +98,6 @@ pub mod utils;
 // Benchmarks
 mod cache_hit_benchmark;
 mod eviction_benchmark;
-mod fallback_benchmark;
 mod migration_benchmark;
 mod query_benchmark;
 mod read_write_benchmark;

diff --git a/benchmarks/src/utils/backend.rs b/benchmarks/src/utils/backend.rs
@@ -26,7 +26,7 @@ impl Backend {
 
         match DatabaseURL::from_str(url)? {
             DatabaseURL::MySQL(_) => {
-                let upstream = MySqlUpstream::connect(UpstreamConfig::from_url(url), None).await?;
+                let upstream = MySqlUpstream::connect(UpstreamConfig::from_url(url)).await?;
 
                 Ok(Self::MySql(
                     BackendBuilder::new()
@@ -36,8 +36,7 @@ impl Backend {
                 ))
             }
             DatabaseURL::PostgreSQL(_) => {
-                let upstream =
-                    PostgreSqlUpstream::connect(UpstreamConfig::from_url(url), None).await?;
+                let upstream = PostgreSqlUpstream::connect(UpstreamConfig::from_url(url)).await?;
 
                 Ok(Self::PostgreSql(
                     BackendBuilder::new()

diff --git a/readyset-adapter/Cargo.toml b/readyset-adapter/Cargo.toml
@@ -74,5 +74,4 @@ harness = false
 
 [features]
 ryw = []
-fallback_cache = ["readyset-client-metrics/fallback_cache"]
-failure_injection = ["fail/failpoints"]
+failure_injection = ["fail/failpoints"]