Mercator/mercator_db
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated dependencies and fixed linter warnings

Browse Source
This commit is contained in:
Lionel Sambuc
2024-08-09 18:44:29 +02:00
parent 9cab1916c9
commit 1e884a0c21
11 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Cargo.toml
View File

@@ -35,18 +35,18 @@ ironsea_index = "^0.1"
ironsea_index_sfc_dbc = "^0.1"
ironsea_index_hashmap = "^0.1"
arrayref = "^0.3" # For Positions Objects
lazy_static = "^1.3"
memmap = "^0.7"
arrayref = "0.3" # For Positions Objects
lazy_static = "1.5"
memmap = "0.7"
serde = { version = "^1.0", features = ["derive"] }
serde_json = "^1.0"
bincode = "^1.1"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
bincode = "1.3"
# Logging macros API
#log = { version = "^0.4", features = ["max_level_trace", "release_max_level_info"] }
log = { version = "^0.4", features = ["max_level_trace", "release_max_level_trace"] }
#log = { version = "0.4", features = ["max_level_trace", "release_max_level_info"] }
log = { version = "0.4", features = ["max_level_trace", "release_max_level_trace"] }
# Used for main.rs as integration test
pretty_env_logger = { version = "^0.3", optional = true } # Logger implementation
measure_time = { version = "^0.6", optional = true } # To mesure parsing time, only required by binary
pretty_env_logger = { version = "0.5", optional = true } # Logger implementation
measure_time = { version = "0.8", optional = true } # To mesure parsing time, only required by binary

16
src/database/db_core.rs
View File

@@ -174,11 +174,7 @@ impl Core {
// We cannot return less that the total number of individual Ids stored
// in the index for a full-volume query.
let max_elements = if let Some(elem) = max_elements {
Some(elem.max(properties.len()))
} else {
None
};
let max_elements = max_elements.map(|elem| elem.max(properties.len()));
for space in spaces {
// Filter the points of this space, and encode them before creating the index.
@@ -194,7 +190,7 @@ impl Core {
object.set_position(space.encode(&position)?);
}
space_dbs.push(SpaceDB::new(&space, filtered, scales.clone(), max_elements))
space_dbs.push(SpaceDB::new(space, filtered, scales.clone(), max_elements))
}
Ok(Core {
@@ -232,7 +228,7 @@ impl Core {
// Rebase the point to the requested output space before decoding.
for (position, _) in list {
*position = unified
.decode(&Space::change_base(&position, space, unified)?)?
.decode(&Space::change_base(position, space, unified)?)?
.into();
}
} else {
@@ -240,7 +236,7 @@ impl Core {
// respective reference space.
for (position, _) in list {
// Simply decode
*position = space.decode(&position)?.into();
*position = space.decode(position)?.into();
}
}
@@ -278,7 +274,7 @@ impl Core {
// Filter positions based on the view port, if present
let filtered = match parameters.view_port(from) {
None => positions.iter().map(|p| p).collect::<Vec<_>>(),
None => positions.iter().collect::<Vec<_>>(),
Some(view_port) => positions
.iter()
.filter(|&p| view_port.contains(p))
@@ -475,7 +471,7 @@ impl Core {
},
}
})
.flat_map(|v| v);
.flatten();
let search_volume = if let Some(view) = view_port {
search_volume

2
src/database/mod.rs
View File

@@ -109,7 +109,7 @@ impl DataBase {
list.len()
))
} else {
Ok(&list[0])
Ok(list[0])
}
}

8
src/database/space/coordinate.rs
View File

@@ -206,10 +206,10 @@ impl From<u64> for Coordinate {
// Slight syntax hack, as exclusive ranges are not yet available.
// cf: https://github.com/rust-lang/rust/issues/37854
match v {
_ if v <= u64::from(std::u8::MAX) => Coordinate::CoordinateU8(v as u8),
_ if v <= u64::from(std::u16::MAX) => Coordinate::CoordinateU16(v as u16),
_ if v <= u64::from(std::u32::MAX) => Coordinate::CoordinateU32(v as u32),
_ => Coordinate::CoordinateU64(v as u64),
_ if v <= u64::from(u8::MAX) => Coordinate::CoordinateU8(v as u8),
_ if v <= u64::from(u16::MAX) => Coordinate::CoordinateU16(v as u16),
_ if v <= u64::from(u32::MAX) => Coordinate::CoordinateU32(v as u32),
_ => Coordinate::CoordinateU64(v),
/*_ => {
panic!("Out of range {} > {}", v, std::u64::MAX);
} */

4
src/database/space/coordinate_system.rs
View File

@@ -84,8 +84,8 @@ impl CoordinateSystem {
match self {
CoordinateSystem::Universe { .. } => {
for _ in 0..self.dimensions() {
low.push(std::f64::MIN);
high.push(std::f64::MAX);
low.push(f64::MIN);
high.push(f64::MAX);
}
}
CoordinateSystem::AffineSystem { axes, .. } => {

25
src/database/space/position.rs
View File

@@ -19,7 +19,7 @@ use serde::Serialize;
use super::coordinate::Coordinate;
/// Store a position as efficiently as possible in terms of space.
#[derive(Clone, Debug, Deserialize, Eq, Hash, Ord, PartialEq, Serialize)]
#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
pub enum Position {
/// 1 dimension positions.
Position1(Coordinate),
@@ -127,6 +127,11 @@ impl Display for Position {
}
}
impl Ord for Position {
fn cmp(&self, other: &Self) -> Ordering {
self.partial_cmp(other).unwrap()
}
}
impl PartialOrd for Position {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
// Let's restrict for now to same-length vectors.
@@ -143,7 +148,7 @@ impl PartialOrd for Position {
return None;
}
let ordering = ordering.drain().filter_map(|v| v).collect::<Vec<_>>();
let ordering = ordering.drain().flatten().collect::<Vec<_>>();
match ordering.len() {
3 => None,
2 => {
@@ -356,14 +361,14 @@ impl<'s> From<&'s Position> for Vec<&'s Coordinate> {
fn from(position: &'s Position) -> Self {
match position {
Position::Position1(coordinate) => vec![coordinate],
Position::Position2(coordinates) => coordinates.iter().map(|c| c).collect(),
Position::Position3(coordinates) => coordinates.iter().map(|c| c).collect(),
Position::Position4(coordinates) => coordinates.iter().map(|c| c).collect(),
Position::Position5(coordinates) => coordinates.iter().map(|c| c).collect(),
Position::Position6(coordinates) => coordinates.iter().map(|c| c).collect(),
Position::Position7(coordinates) => coordinates.iter().map(|c| c).collect(),
Position::Position8(coordinates) => coordinates.iter().map(|c| c).collect(),
Position::PositionN(coordinates) => coordinates.iter().map(|c| c).collect(),
Position::Position2(coordinates) => coordinates.iter().collect(),
Position::Position3(coordinates) => coordinates.iter().collect(),
Position::Position4(coordinates) => coordinates.iter().collect(),
Position::Position5(coordinates) => coordinates.iter().collect(),
Position::Position6(coordinates) => coordinates.iter().collect(),
Position::Position7(coordinates) => coordinates.iter().collect(),
Position::Position8(coordinates) => coordinates.iter().collect(),
Position::PositionN(coordinates) => coordinates.iter().collect(),
}
}
}

4
src/database/space/shape.rs
View File

@@ -39,7 +39,7 @@ impl Shape {
//FIXME: Is the length properly dealt with? How do we process this for space conversions?
let mut r = Vec::with_capacity(center.dimensions());
for _ in 0..center.dimensions() {
r.push(radius.clone());
r.push(*radius);
}
let r = r.into();
let r = from.absolute_position(&r)?;
@@ -276,7 +276,7 @@ impl Shape {
/// Compute the volume.
pub fn volume(&self) -> f64 {
match self {
Shape::Point(_) => std::f64::EPSILON, // Smallest non-zero volume possible
Shape::Point(_) => f64::EPSILON, // Smallest non-zero volume possible
Shape::BoundingBox(low, high) => {
let mut volume = 1.0;

9
src/database/space_db.rs
View File

@@ -1,6 +1,7 @@
use std::cmp::Ordering;
use std::collections::hash_map::DefaultHasher;
use std::collections::HashMap;
use std::convert::TryInto;
use std::hash::Hash;
use std::hash::Hasher;
@@ -59,8 +60,7 @@ impl SpaceDB {
}
// Apply fixed scales
let mut count = 0;
for power in &powers {
for (count, power) in powers.iter().enumerate() {
space_objects = space_objects
.into_iter()
.map(|mut o| {
@@ -79,8 +79,7 @@ impl SpaceDB {
.collect();
// Make sure we do not shift more position than available
let shift = if count >= 31 { 31 } else { count };
count += 1;
let shift: u32 = if count >= 31 { 31 } else { count.try_into().unwrap() };
indices.push((
SpaceSetIndex::new(space_objects.iter(), DIMENSIONS, CELL_BITS),
vec![power.0, power.0, power.0],
@@ -352,7 +351,7 @@ impl SpaceDB {
let view_port = parameters.view_port(space);
// Select the objects
let results = self.resolutions[index].find_by_shape(&shape, &view_port)?;
let results = self.resolutions[index].find_by_shape(shape, &view_port)?;
Ok(results)
}

2
src/database/space_index.rs
View File

@@ -213,7 +213,7 @@ impl SpaceIndex {
// then add the condition of the radius as we are working within
// a sphere.
let results = self
.find_range(&lower, &higher)
.find_range(lower, higher)
.into_iter()
.filter(|(position, _)| (position - center).norm() <= radius.f64())
.collect();

4
src/storage/model.rs
View File

@@ -115,7 +115,7 @@ pub mod v1 {
for (position, properties) in v {
hashmap
.entry(properties)
.or_insert_with(|| vec![])
.or_insert_with(Vec::new)
.push((space, position));
}
}
@@ -226,7 +226,7 @@ pub mod v2 {
.entry(properties)
.or_insert_with(HashMap::new)
.entry(space)
.or_insert_with(|| vec![])
.or_insert_with(Vec::new)
.push(position.into());
}
}

2
src/storage/xyz.rs
View File

@@ -181,7 +181,7 @@ fn convert(string: &str) -> Result<Vec<SpatialObject>, Error> {
let (x, y, z) = (x * 0.039_062_5, y * 0.039_062_5, z * 0.039_062_5);
oids.entry(oid)
.or_insert_with(|| vec![])
.or_insert_with(Vec::new)
.push(vec![x, y, z]);
}
}