From baa92f860e92f0ed98ce47ef4fc47783342404de Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Tue, 17 Mar 2020 17:05:34 +0100 Subject: [PATCH] Removing dependency on ironsea_store --- .gitmodules | 12 ------------ Cargo.lock | 5 ----- Cargo.toml | 4 ++-- ironsea_index_sfc_dbc | 2 +- mercator_data_generator | 2 +- mercator_indexer | 2 +- 6 files changed, 5 insertions(+), 22 deletions(-) diff --git a/.gitmodules b/.gitmodules index 938b7a1..369fabd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,18 +7,6 @@ [submodule "ironsea_index_sfc_dbc"] path = ironsea_index_sfc_dbc url = ../ironsea_index_sfc_dbc -[submodule "ironsea_store"] - path = ironsea_store - url = ../ironsea_store -[submodule "ironsea_store_buffered_file"] - path = ironsea_store_buffered_file - url = ../ironsea_store_buffered_file -[submodule "ironsea_store_mapped_file"] - path = ironsea_store_mapped_file - url = ../ironsea_store_mapped_file -[submodule "ironsea_store_file"] - path = ironsea_store_file - url = ../ironsea_store_file [submodule "mercator_data_generator"] path = mercator_data_generator url = ../mercator_data_generator diff --git a/Cargo.lock b/Cargo.lock index 625c17d..440767a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -888,15 +888,10 @@ dependencies = [ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "ironsea_index 0.1.0", - "ironsea_store 0.1.0", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "ironsea_store" -version = "0.1.0" - [[package]] name = "itertools" version = "0.8.2" diff --git a/Cargo.toml b/Cargo.toml index abd99f7..a618cae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ members = [ # Generic Interfaces "ironsea_index", - "ironsea_store", + #"ironsea_store", # Specific implementations "ironsea_index_hashmap", @@ -29,7 +29,7 @@ mercator_db = { path = "mercator_db" } mercator_parser = { path = "mercator_parser" } ironsea_index = { path = "ironsea_index" } -ironsea_store = { path = "ironsea_store" } +#ironsea_store = { path = "ironsea_store" } ironsea_index_hashmap = { path = "ironsea_index_hashmap" } ironsea_index_sfc_dbc = { path = "ironsea_index_sfc_dbc" } diff --git a/ironsea_index_sfc_dbc b/ironsea_index_sfc_dbc index 1dfe8d2..12cfe01 160000 --- a/ironsea_index_sfc_dbc +++ b/ironsea_index_sfc_dbc @@ -1 +1 @@ -Subproject commit 1dfe8d203e52050f2c4624edd54b6eb5626aee2b +Subproject commit 12cfe01a86516e197bf997872980440e2ffe34b4 diff --git a/mercator_data_generator b/mercator_data_generator index 1fc3ed6..76796c6 160000 --- a/mercator_data_generator +++ b/mercator_data_generator @@ -1 +1 @@ -Subproject commit 1fc3ed605ece7dd351ecc3d571d79a4faf51e0e5 +Subproject commit 76796c68a62dee3153d0f409ff05366ae8402a80 diff --git a/mercator_indexer b/mercator_indexer index add0c1d..0ed672e 160000 --- a/mercator_indexer +++ b/mercator_indexer @@ -1 +1 @@ -Subproject commit add0c1dbcab310050c28622f1e32b0863d8abfdf +Subproject commit 0ed672efdea3e2348027dc9beda018d563edab00