diff --git a/Cargo.lock b/Cargo.lock index ddb0d95..1e988e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -701,6 +701,11 @@ dependencies = [ "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "h2" version = "0.1.26" @@ -1049,6 +1054,7 @@ dependencies = [ "actix-service 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-web 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "measure_time 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2204,6 +2210,7 @@ dependencies = [ "checksum futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "45dc39533a6cae6da2b56da48edae506bb767ec07370f86f70fc062e9d435869" "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" "checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571" +"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" "checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" "checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353" "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e" diff --git a/README.md b/README.md index dc0799b..0fa1d3e 100644 --- a/README.md +++ b/README.md @@ -45,21 +45,17 @@ This enables the index implementations to be agnostic from the underlying data s cd mercator_indexer for f in ../mercator_data_generator/1*.json do - ln -s $f + ln -s $f done cargo run --release -- 1k 10k 100k ``` - - * Run the Spatial Index, while providing one of the datasets. Currently only one dataset (core) can be loaded at a time. + + * Run the Spatial Index, while providing the path to the datasets. ```sh cd mercator_service - for f in ../mercator_indexer/*.index - do - ln -s $f - done RUST_LOG="warn,actix_web=info,mercator_service=trace" \ - MERCATOR_IMPORT_DATA="100k" \ + MERCATOR_DATA="../mercator_indexer/" \ MERCATOR_ALLOWED_ORIGINS="http://localhost:3200" \ cargo run --release ``` diff --git a/mercator_db b/mercator_db index debd25c..e4a1959 160000 --- a/mercator_db +++ b/mercator_db @@ -1 +1 @@ -Subproject commit debd25c3d87aa95ffd86a24ad91419231d0dd4ac +Subproject commit e4a1959fc737e9a8fa1c956ac5a4677f7d9ce2d3 diff --git a/mercator_indexer b/mercator_indexer index 1912a5f..06f8ca7 160000 --- a/mercator_indexer +++ b/mercator_indexer @@ -1 +1 @@ -Subproject commit 1912a5f09264fd54d010cdb2d40885f2d960edc4 +Subproject commit 06f8ca71f24e6abd3f94252f7c7aefcb8585d9c3 diff --git a/mercator_parser b/mercator_parser index e156b03..b5daa52 160000 --- a/mercator_parser +++ b/mercator_parser @@ -1 +1 @@ -Subproject commit e156b0353881ef32fc9cd115e9d3eec1b0376a80 +Subproject commit b5daa52284a8f1f4ca9852c3d927bc5f4bb2633f diff --git a/mercator_service b/mercator_service index 0239b15..75b3529 160000 --- a/mercator_service +++ b/mercator_service @@ -1 +1 @@ -Subproject commit 0239b15fa3189742e9fd1d7e722332d1d6766543 +Subproject commit 75b3529eb984e83f48eddb80c847872f9723c263