Skip to content

Commit

Permalink
Working field, measurement count, and measurement queries
Browse files Browse the repository at this point in the history
  • Loading branch information
bnaecker committed Feb 23, 2024
1 parent 673019f commit f6e6390
Show file tree
Hide file tree
Showing 9 changed files with 484 additions and 91 deletions.
38 changes: 3 additions & 35 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,11 @@ chrono = { version = "0.4", features = [ "serde" ] }
clap = { version = "4.5", features = ["cargo", "derive", "env", "wrap_help"] }
cookie = "0.18"
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
crossbeam = "0.8"
crossterm = { version = "0.27.0", features = ["event-stream"] }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "796dce526dd7ed7b52a0429a486ccba4a9da1ce5" }
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "796dce526dd7ed7b52a0429a486ccba4a9da1ce5" }
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "796dce526dd7ed7b52a0429a486ccba4a9da1ce5" }
csv = "1.3.0"
curve25519-dalek = "4"
datatest-stable = "0.2.3"
display-error-chain = "0.2.0"
ddm-admin-client = { path = "clients/ddm-admin-client" }
Expand Down Expand Up @@ -252,7 +250,6 @@ mockall = "0.12"
newtype_derive = "0.1.6"
mg-admin-client = { path = "clients/mg-admin-client" }
multimap = "0.8.1"
ndarray = { version = "0.15.6", default-features = false, features = ["std", "rayon", "serde"] }
nexus-blueprint-execution = { path = "nexus/blueprint-execution" }
nexus-client = { path = "clients/nexus-client" }
nexus-db-model = { path = "nexus/db-model" }
Expand All @@ -273,7 +270,6 @@ omicron-workspace-hack = "0.1.0"
omicron-common = { path = "common" }
omicron-gateway = { path = "gateway" }
omicron-nexus = { path = "nexus" }
omicron-package = { path = "package" }
omicron-rpaths = { path = "rpaths" }
omicron-sled-agent = { path = "sled-agent" }
omicron-test-utils = { path = "test-utils" }
Expand All @@ -297,7 +293,6 @@ oximeter-collector = { path = "oximeter/collector" }
oximeter-instruments = { path = "oximeter/instruments" }
oximeter-macro-impl = { path = "oximeter/oximeter-macro-impl" }
oximeter-producer = { path = "oximeter/producer" }
p256 = "0.13"
parse-display = "0.9.0"
partial-io = { version = "0.5.4", features = ["proptest1", "tokio1"] }
parse-size = "1.0.0"
Expand Down Expand Up @@ -338,7 +333,6 @@ schemars = "0.8.16"
secrecy = "0.8.0"
semver = { version = "1.0.21", features = ["std", "serde"] }
serde = { version = "1.0", default-features = false, features = [ "derive" ] }
serde_derive = "1.0"
serde_human_bytes = { git = "http://github.com/oxidecomputer/serde_human_bytes", branch = "main" }
serde_json = "1.0.113"
serde_path_to_error = "0.1.15"
Expand Down Expand Up @@ -446,12 +440,6 @@ debug = "line-tables-only"
# times, because it allows target and host dependencies to be unified.
debug = "line-tables-only"

# `lalrpop` is used by `polar-core`'s build script; building it with
# optimizations makes that build script run ~20x faster, more than offsetting
# the additional build time added to `lalrpop` itself.
[profile.dev.package.lalrpop]
opt-level = 3

# Password hashing is expensive by construction. Build the hashing libraries
# with optimizations to significantly speed up tests.
[profile.dev.package.argon2]
Expand Down
6 changes: 1 addition & 5 deletions oximeter/db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ features = [ "serde" ]
workspace = true
optional = true

[dependencies.ndarray]
workspace = true
optional = true

[dependencies.peg]
workspace = true
optional = true
Expand Down Expand Up @@ -97,7 +93,7 @@ sql = [
"dep:sqlparser",
"dep:tabled"
]
oxql = [ "dep:ndarray", "dep:peg", "dep:reedline", "dep:tabled" ]
oxql = ["dep:peg", "dep:reedline", "dep:tabled"]

[[bin]]
name = "oxdb"
Expand Down
Loading

0 comments on commit f6e6390

Please sign in to comment.