chore(*): remove content-store

All "content" accesses go through the layerdb now. Content-store crate has been removed. Co-Authored-By: Scott Prutton <[email protected]>
systeminit · Mar 15, 2024 · 469dbe7 · 469dbe7
1 parent 49a3f34
commit 469dbe7
Show file tree

Hide file tree

Showing 63 changed files with 230 additions and 1,038 deletions.
diff --git a/.ci/docker-compose.test-integration.yml b/.ci/docker-compose.test-integration.yml
@@ -29,7 +29,7 @@ services:
       - "PGPASSWORD=bugbear"
       - "POSTGRES_USER=si_test"
       - "POSTGRES_DB=si_test"
-      - "POSTGRES_MULTIPLE_DBS=si_test_content_store,si_test_dal,si_test_sdf_server,si_test_key_value_pairs"
+      - "POSTGRES_MULTIPLE_DBS=si_test_dal,si_test_sdf_server,si_test_layer_db"
     command:
       - "-c"
       - "fsync=off"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,6 @@ members = [
     "lib/buck2-resources",
     "lib/bytes-lines-codec",
     "lib/config-file",
-    "lib/content-store",
     "lib/council-server",
     "lib/cyclone-client",
     "lib/cyclone-core",

diff --git a/bin/sdf/src/main.rs b/bin/sdf/src/main.rs
@@ -101,8 +101,6 @@ async fn async_main() -> Result<()> {
 
     let pg_pool = Server::create_pg_pool(config.pg_pool()).await?;
 
-    let content_store_pg_pool = Server::create_pg_pool(config.content_store_pg_pool()).await?;
-
     let veritech = Server::create_veritech_client(nats_conn.clone());
 
     let symmetric_crypto_service =
@@ -138,7 +136,6 @@ async fn async_main() -> Result<()> {
         Some(module_index_url),
         symmetric_crypto_service,
         rebaser_config,
-        content_store_pg_pool,
         layer_db,
     );
 

diff --git a/component/postgres/BUCK b/component/postgres/BUCK
@@ -30,7 +30,7 @@ docker_image(
         "--env",
         "POSTGRES_DB=si",
         "--env",
-        "POSTGRES_MULTIPLE_DBS=si_content_store,si_auth,si_layer_db,si_test,si_test_content_store,si_test_dal,si_test_sdf_server",
+        "POSTGRES_MULTIPLE_DBS=si_auth,si_layer_db,si_test,si_test_dal,si_test_sdf_server",
         "--publish",
         "5432:5432",
     ],

diff --git a/dev/docker-compose.platform.yml b/dev/docker-compose.platform.yml
@@ -9,7 +9,7 @@ services:
       - "PGPASSWORD=bugbear"
       - "POSTGRES_USER=si"
       - "POSTGRES_DB=si"
-      - "POSTGRES_MULTIPLE_DBS=si_content_store,si_layer_db,si_auth,si_module_index,si_key_value_pairs"
+      - "POSTGRES_MULTIPLE_DBS=si_layer_db,si_auth,si_module_index"
     ports:
       - "5432:5432"
     healthcheck:
@@ -25,7 +25,7 @@ services:
       - "PGPASSWORD=bugbear"
       - "POSTGRES_USER=si_test"
       - "POSTGRES_DB=si_test"
-      - "POSTGRES_MULTIPLE_DBS=si_test_content_store,si_test_dal,si_test_sdf_server,si_test_key_value_pairs"
+      - "POSTGRES_MULTIPLE_DBS=si_test_dal,si_test_sdf_server,si_test_layer_db"
     command:
       - "-c"
       - "fsync=off"

diff --git a/lib/content-store/BUCK b/lib/content-store/BUCK
diff --git a/lib/content-store/Cargo.toml b/lib/content-store/Cargo.toml
diff --git a/lib/content-store/build.rs b/lib/content-store/build.rs
diff --git a/lib/content-store/src/lib.rs b/lib/content-store/src/lib.rs
diff --git a/lib/content-store/src/pair.rs b/lib/content-store/src/pair.rs