Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6d93a031e6 | |||
| ff96c95dcf | |||
| a545d6b03d | |||
| 8f796b819d | |||
| 136e5b42b6 |
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -19,12 +19,6 @@
|
|||||||
[submodule "ironsea_store_file"]
|
[submodule "ironsea_store_file"]
|
||||||
path = ironsea_store_file
|
path = ironsea_store_file
|
||||||
url = ../ironsea_store_file
|
url = ../ironsea_store_file
|
||||||
[submodule "ironsea_table"]
|
|
||||||
path = ironsea_table
|
|
||||||
url = ../ironsea_table
|
|
||||||
[submodule "ironsea_table_vector"]
|
|
||||||
path = ironsea_table_vector
|
|
||||||
url = ../ironsea_table_vector
|
|
||||||
[submodule "mercator_data_generator"]
|
[submodule "mercator_data_generator"]
|
||||||
path = mercator_data_generator
|
path = mercator_data_generator
|
||||||
url = ../mercator_data_generator
|
url = ../mercator_data_generator
|
||||||
|
|||||||
23
Cargo.lock
generated
23
Cargo.lock
generated
@@ -808,16 +808,12 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "ironsea_index"
|
name = "ironsea_index"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
|
||||||
"ironsea_table 0.1.0",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ironsea_index_hashmap"
|
name = "ironsea_index_hashmap"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ironsea_index 0.1.0",
|
"ironsea_index 0.1.0",
|
||||||
"ironsea_table 0.1.0",
|
|
||||||
"serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
|
"serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
|
"serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
@@ -830,7 +826,6 @@ dependencies = [
|
|||||||
"bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
"bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"ironsea_index 0.1.0",
|
"ironsea_index 0.1.0",
|
||||||
"ironsea_store 0.1.0",
|
"ironsea_store 0.1.0",
|
||||||
"ironsea_table 0.1.0",
|
|
||||||
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
|
"serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
|
"serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@@ -862,22 +857,6 @@ dependencies = [
|
|||||||
"memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ironsea_table"
|
|
||||||
version = "0.1.0"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ironsea_table_vector"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
||||||
"ironsea_store 0.1.0",
|
|
||||||
"ironsea_table 0.1.0",
|
|
||||||
"serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
||||||
"serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
||||||
"serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "itertools"
|
name = "itertools"
|
||||||
version = "0.8.0"
|
version = "0.8.0"
|
||||||
@@ -1018,8 +997,6 @@ dependencies = [
|
|||||||
"ironsea_index 0.1.0",
|
"ironsea_index 0.1.0",
|
||||||
"ironsea_index_hashmap 0.1.0",
|
"ironsea_index_hashmap 0.1.0",
|
||||||
"ironsea_index_sfc_dbc 0.1.0",
|
"ironsea_index_sfc_dbc 0.1.0",
|
||||||
"ironsea_table 0.1.0",
|
|
||||||
"ironsea_table_vector 0.1.0",
|
|
||||||
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"log 0.4.8 (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)",
|
"measure_time 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ members = [
|
|||||||
# Generic Interfaces
|
# Generic Interfaces
|
||||||
"ironsea_index",
|
"ironsea_index",
|
||||||
"ironsea_store",
|
"ironsea_store",
|
||||||
"ironsea_table",
|
|
||||||
|
|
||||||
# Specific implementations
|
# Specific implementations
|
||||||
"ironsea_index_hashmap",
|
"ironsea_index_hashmap",
|
||||||
@@ -19,20 +18,20 @@ members = [
|
|||||||
"ironsea_store_buffered_file",
|
"ironsea_store_buffered_file",
|
||||||
"ironsea_store_file",
|
"ironsea_store_file",
|
||||||
"ironsea_store_mapped_file",
|
"ironsea_store_mapped_file",
|
||||||
"ironsea_table_vector",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[profile.release]
|
||||||
|
lto = true
|
||||||
|
|
||||||
[patch.crates-io]
|
[patch.crates-io]
|
||||||
mercator_db = { path = "mercator_db" }
|
mercator_db = { path = "mercator_db" }
|
||||||
mercator_parser = { path = "mercator_parser" }
|
mercator_parser = { path = "mercator_parser" }
|
||||||
|
|
||||||
ironsea_index = { path = "ironsea_index" }
|
ironsea_index = { path = "ironsea_index" }
|
||||||
ironsea_store = { path = "ironsea_store" }
|
ironsea_store = { path = "ironsea_store" }
|
||||||
ironsea_table = { path = "ironsea_table" }
|
|
||||||
|
|
||||||
ironsea_index_hashmap = { path = "ironsea_index_hashmap" }
|
ironsea_index_hashmap = { path = "ironsea_index_hashmap" }
|
||||||
ironsea_index_sfc_dbc = { path = "ironsea_index_sfc_dbc" }
|
ironsea_index_sfc_dbc = { path = "ironsea_index_sfc_dbc" }
|
||||||
ironsea_store_buffered_file = { path = "ironsea_store_buffered_file" }
|
ironsea_store_buffered_file = { path = "ironsea_store_buffered_file" }
|
||||||
ironsea_store_file = { path = "ironsea_store_file" }
|
ironsea_store_file = { path = "ironsea_store_file" }
|
||||||
ironsea_store_mapped_file = { path = "ironsea_store_mapped_file" }
|
ironsea_store_mapped_file = { path = "ironsea_store_mapped_file" }
|
||||||
ironsea_table_vector = { path = "ironsea_table_vector" }
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ This enables the index implementations to be agnostic from the underlying data s
|
|||||||
* Clone the workspace, which will take care of bringing all the repositories needed.
|
* Clone the workspace, which will take care of bringing all the repositories needed.
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
git clone --recurse git@gitlab.epfl.ch:DIAS/PROJECTS/HBP-SP5/mercator.git
|
git clone --recurse <repository URI>
|
||||||
```
|
```
|
||||||
|
|
||||||
The following steps assume the working directory is the root of the mercator repository.
|
The following steps assume the working directory is the root of the mercator repository.
|
||||||
@@ -45,7 +45,7 @@ This enables the index implementations to be agnostic from the underlying data s
|
|||||||
cd mercator_indexer
|
cd mercator_indexer
|
||||||
for f in ../mercator_data_generator/1*.json
|
for f in ../mercator_data_generator/1*.json
|
||||||
do
|
do
|
||||||
ln -s $f
|
ln -s $f
|
||||||
done
|
done
|
||||||
cargo run --release -- 1k 10k 100k
|
cargo run --release -- 1k 10k 100k
|
||||||
```
|
```
|
||||||
@@ -62,7 +62,7 @@ This enables the index implementations to be agnostic from the underlying data s
|
|||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
For more information, please refer to the [documentation](https://epfl-dias.github.io/PROJECT_NAME/).
|
For more information, please refer to the [documentation](https://epfl-dias.github.io/mercator/).
|
||||||
|
|
||||||
If you want to build the documentation and access it locally, you can use:
|
If you want to build the documentation and access it locally, you can use:
|
||||||
|
|
||||||
|
|||||||
Submodule ironsea_index updated: 1231f42728...05855df2c0
Submodule ironsea_index_hashmap updated: 50d60f58b6...af383a9775
Submodule ironsea_index_sfc_dbc updated: 411a6222a1...857534fd50
Submodule ironsea_store_file updated: 189cc11256...c28e578acf
Submodule ironsea_store_mapped_file updated: 90abe7ab7c...447e0b1c44
Submodule ironsea_table deleted from 277f050873
Submodule ironsea_table_vector deleted from ba883b8469
Submodule mercator_data_generator updated: 1da4f8b28b...edb4267139
Submodule mercator_db updated: 6fc2cc5942...82050d6b75
Submodule mercator_indexer updated: 3272590d24...62b120c0c9
Submodule mercator_parser updated: 8dd9250dbb...926b879426
Submodule mercator_service updated: 5cbd2a0b69...a6865c6cbd
Reference in New Issue
Block a user