diff --git a/Cargo.lock b/Cargo.lock index a905a0a4f..b04b15b5a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -181,9 +181,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-compression" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c1f86859c1af3d514fa19e8323147ff10ea98684e6c7b307912509f50e67b2" +checksum = "0e86f6d3dc9dc4352edeea6b8e499e13e3f5dc3b964d7ca5fd411415a3498473" dependencies = [ "compression-codecs", "compression-core", @@ -211,7 +211,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -378,7 +378,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -837,7 +837,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1274,7 +1274,7 @@ version = "0.0.111" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1365,6 +1365,12 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e6b0e42e210b794e14b152c6fe1a55831e30ef4a0f5dc39d73d714fb5f1906c" +[[package]] +name = "byteview" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6e3a2110d267b9881afe689e6eebcc7635534a827928bd69bef59a8f9db644a" + [[package]] name = "castaway" version = "0.2.4" @@ -1474,7 +1480,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1554,9 +1560,9 @@ checksum = "ea0095f6103c2a8b44acd6fd15960c801dafebf02e21940360833e0673f48ba7" [[package]] name = "compression-codecs" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "680dc087785c5230f8e8843e2e57ac7c1c90488b6a91b88caa265410568f441b" +checksum = "302266479cb963552d11bd042013a58ef1adc56768016c8b82b4199488f2d4ad" dependencies = [ "brotli", "compression-core", @@ -1568,9 +1574,9 @@ dependencies = [ [[package]] name = "compression-core" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9b614a5787ef0c8802a55766480563cb3a93b435898c422ed2a359cf811582" +checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d" [[package]] name = "concurrent_lru" @@ -1786,7 +1792,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1797,7 +1803,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1831,7 +1837,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1862,7 +1868,7 @@ checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "unicode-xid", ] @@ -1917,7 +1923,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1992,7 +1998,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2105,14 +2111,16 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" [[package]] name = "fjall" -version = "3.0.0-pre.7" +version = "3.0.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e1ca518f9bb71f845bcd3d8d556c202f9f9c75195deff725cd85b2421aa84a" dependencies = [ "byteorder-lite", - "byteview 0.8.0", + "byteview 0.9.1", "dashmap", "flume", "log", - "lsm-tree 3.0.0-pre.7", + "lsm-tree 3.0.0-rc.0", "lz4_flex", "tempfile", "xxhash-rust", @@ -2214,7 +2222,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2308,7 +2316,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2471,12 +2479,11 @@ checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd" [[package]] name = "http" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", - "fnv", "itoa", ] @@ -2807,7 +2814,7 @@ checksum = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3004,12 +3011,12 @@ dependencies = [ [[package]] name = "lsm-tree" -version = "3.0.0-pre.7" +version = "3.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d54fa339f44103a194d3e7f208a33c666391a9d9ddb2621f956f4d223a407f" +checksum = "f963f5e7b4f8f79fbb28d0fd49ab5f04939b31d1e65cb99577e17805fe25dde2" dependencies = [ "byteorder-lite", - "byteview 0.8.0", + "byteview 0.9.1", "crossbeam-skiplist", "enum_dispatch", "interval-heap", @@ -3233,7 +3240,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3353,7 +3360,7 @@ checksum = "003b4612827f6501183873fb0735da92157e3c7daa71c40921c7d2758fec2229" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3397,7 +3404,7 @@ dependencies = [ "phf", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3617,15 +3624,17 @@ dependencies = [ [[package]] name = "oxc_resolver" -version = "11.13.2" +version = "11.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1af25f894076eedc44509ad0cc33afb829aa06ec3f23e395f47bcbc1c6e964" +checksum = "d4dbede303ffad37b0e3f3e69b9a2cf798e40c5f5f77d43d104bbd54921943f6" dependencies = [ "cfg-if", + "fast-glob", "indexmap", "json-strip-comments", "once_cell", "papaya", + "parking_lot", "pnp", "rustc-hash", "rustix", @@ -3923,7 +3932,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3952,7 +3961,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4239,6 +4248,8 @@ dependencies = [ "memmap2", "parking_lot", "rayon", + "smallvec", + "thiserror 2.0.17", ] [[package]] @@ -4298,7 +4309,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4366,9 +4377,9 @@ dependencies = [ [[package]] name = "rolldown-notify" -version = "8.2.1" +version = "8.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "858a3e78503d89287b47d66fb042b4f04e34b237774506fbb48d7c3e5eb445cf" +checksum = "e9122f313b71e7632260ee45f068ff70239bff876997fe78aecf2eabaf4fd709" dependencies = [ "bitflags 2.10.0", "inotify", @@ -4498,7 +4509,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4603,7 +4614,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4614,7 +4625,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4841,7 +4852,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4866,9 +4877,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.110" +version = "2.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" dependencies = [ "proc-macro2", "quote", @@ -4889,7 +4900,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4951,7 +4962,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4962,7 +4973,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5026,7 +5037,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5122,9 +5133,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +checksum = "9cf146f99d442e8e68e585f5d798ccd3cad9a7835b917e09728880a862706456" dependencies = [ "async-compression", "bitflags 2.10.0", @@ -5172,7 +5183,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5262,7 +5273,7 @@ checksum = "ee6ff59666c9cbaec3533964505d39154dc4e0a56151fdea30a09ed0301f62e2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "termcolor", ] @@ -5434,8 +5445,8 @@ dependencies = [ "rawdb", "serde", "serde_json", + "thiserror 2.0.17", "vecdb_derive", - "zerocopy", ] [[package]] @@ -5443,7 +5454,7 @@ name = "vecdb_derive" version = "0.3.20" dependencies = [ "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5530,7 +5541,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "wasm-bindgen-shared", ] @@ -5649,7 +5660,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5660,7 +5671,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5934,28 +5945,28 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "synstructure", ] [[package]] name = "zerocopy" -version = "0.8.28" +version = "0.8.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43fa6694ed34d6e57407afbccdeecfa268c470a7d2a5b0cf49ce9fcc345afb90" +checksum = "4ea879c944afe8a2b25fef16bb4ba234f47c694565e97383b36f3a878219065c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.28" +version = "0.8.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c640b22cd9817fae95be82f0d2f90b11f7605f6c319d16705c459b27ac2cbc26" +checksum = "cf955aa904d6040f70dc8e9384444cb1030aed272ba3cb09bbc4ab9e7c1f34f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5975,7 +5986,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "synstructure", ] @@ -6009,7 +6020,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 4b2490d28..e8158b45a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,8 +64,8 @@ derive_deref = "1.1.1" fjall2 = { version = "2.11.8", package = "brk_fjall" } # fjall2 = { path = "../fjall2", package = "brk_fjall" } # fjall2 = { version = "2.11.2", package = "fjall" } -# fjall3 = { version = "=3.0.0-pre.5", package = "fjall" } -fjall3 = { path = "../fjall3", package = "fjall" } +fjall3 = { version = "3.0.0-rc.0", package = "fjall" } +# fjall3 = { path = "../fjall3", package = "fjall" } # fjall3 = { git = "https://github.com/fjall-rs/fjall.git", rev = "f0bf96c2017b3543eb176012b8eff69c639dff1d", package = "fjall" } jiff = "0.2.16" log = "0.4.28" @@ -79,9 +79,9 @@ serde_bytes = "0.11.19" serde_derive = "1.0.228" serde_json = { version = "1.0.145", features = ["float_roundtrip"] } tokio = { version = "1.48.0", features = ["rt-multi-thread"] } -vecdb = { path = "../anydb/crates/vecdb", features = ["derive", "serde_json"] } +vecdb = { path = "../anydb/crates/vecdb", features = ["derive", "serde_json", "pco"] } # vecdb = { version = "0.3.20", features = ["derive"] } -zerocopy = { version = "0.8.28", features = ["derive"] } +zerocopy = { version = "0.8.30", features = ["derive"] } [workspace.metadata.release] shared-version = true diff --git a/crates/brk_computer/examples/computer.rs b/crates/brk_computer/examples/computer.rs index 1451e1a46..35a8c942e 100644 --- a/crates/brk_computer/examples/computer.rs +++ b/crates/brk_computer/examples/computer.rs @@ -17,7 +17,7 @@ use vecdb::Exit; pub fn main() -> Result<()> { // Can't increase main thread's stack size, thus we need to use another thread thread::Builder::new() - .stack_size(1024 * 1024 * 1024) + .stack_size(512 * 1024 * 1024) .spawn(run)? .join() .unwrap() diff --git a/crates/brk_computer/src/grouped/builder_eager.rs b/crates/brk_computer/src/grouped/builder_eager.rs index 5106cf917..9cf7a4af5 100644 --- a/crates/brk_computer/src/grouped/builder_eager.rs +++ b/crates/brk_computer/src/grouped/builder_eager.rs @@ -8,13 +8,13 @@ use vecdb::{ use crate::utils::get_percentile; -use super::ComputedType; +use super::ComputedVecValue; #[derive(Clone, Debug, Traversable)] pub struct EagerVecsBuilder where I: VecIndex, - T: ComputedType, + T: ComputedVecValue, { pub first: Option>>, pub average: Option>>, @@ -35,7 +35,7 @@ const VERSION: Version = Version::ZERO; impl EagerVecsBuilder where I: VecIndex, - T: ComputedType, + T: ComputedVecValue, { pub fn forced_import_compressed( db: &Database, diff --git a/crates/brk_computer/src/grouped/builder_lazy.rs b/crates/brk_computer/src/grouped/builder_lazy.rs index 61e975510..0ce5fbad9 100644 --- a/crates/brk_computer/src/grouped/builder_lazy.rs +++ b/crates/brk_computer/src/grouped/builder_lazy.rs @@ -4,16 +4,16 @@ use vecdb::{FromCoarserIndex, IterableBoxedVec, IterableCloneableVec, LazyVecFro use crate::grouped::{EagerVecsBuilder, VecBuilderOptions}; -use super::ComputedType; +use super::ComputedVecValue; #[allow(clippy::type_complexity)] #[derive(Clone, Traversable)] pub struct LazyVecsBuilder where I: VecIndex, - T: ComputedType, + T: ComputedVecValue, S1I: VecIndex, - S2T: ComputedType, + S2T: ComputedVecValue, { pub first: Option>>, pub average: Option>>, @@ -29,9 +29,9 @@ const VERSION: Version = Version::ZERO; impl LazyVecsBuilder where I: VecIndex, - T: ComputedType + 'static, + T: ComputedVecValue + 'static, S1I: VecIndex + 'static + FromCoarserIndex, - S2T: ComputedType, + S2T: ComputedVecValue, { #[allow(clippy::too_many_arguments)] pub fn forced_import( diff --git a/crates/brk_computer/src/grouped/computed.rs b/crates/brk_computer/src/grouped/computed.rs index aeff1a3ac..564e35039 100644 --- a/crates/brk_computer/src/grouped/computed.rs +++ b/crates/brk_computer/src/grouped/computed.rs @@ -1,10 +1,10 @@ use std::ops::{Add, AddAssign, Div}; -use vecdb::{Compressable, Formattable}; +use vecdb::{Formattable, Pco}; -pub trait ComputedType +pub trait ComputedVecValue where - Self: Compressable + Self: Pco + From + Div + Add @@ -13,8 +13,8 @@ where + Formattable, { } -impl ComputedType for T where - T: Compressable +impl ComputedVecValue for T where + T: Pco + From + Div + Add diff --git a/crates/brk_computer/src/grouped/from_dateindex.rs b/crates/brk_computer/src/grouped/from_dateindex.rs index 893b6b681..1109e6ae6 100644 --- a/crates/brk_computer/src/grouped/from_dateindex.rs +++ b/crates/brk_computer/src/grouped/from_dateindex.rs @@ -8,12 +8,12 @@ use vecdb::{AnyWritableVec, Database, EagerVec, Exit, IterableCloneableVec, Iter use crate::{Indexes, grouped::LazyVecsBuilder, indexes}; -use super::{ComputedType, EagerVecsBuilder, Source, VecBuilderOptions}; +use super::{ComputedVecValue, EagerVecsBuilder, Source, VecBuilderOptions}; #[derive(Clone)] pub struct ComputedVecsFromDateIndex where - T: ComputedType + PartialOrd, + T: ComputedVecValue + PartialOrd, { pub dateindex: Option>, pub dateindex_extra: EagerVecsBuilder, @@ -29,7 +29,7 @@ const VERSION: Version = Version::ZERO; impl ComputedVecsFromDateIndex where - T: ComputedType + 'static, + T: ComputedVecValue + 'static, { #[allow(clippy::too_many_arguments)] pub fn forced_import( @@ -146,7 +146,7 @@ where impl Traversable for ComputedVecsFromDateIndex where - T: ComputedType, + T: ComputedVecValue, { fn to_tree_node(&self) -> brk_traversable::TreeNode { let dateindex_extra_node = self.dateindex_extra.to_tree_node(); diff --git a/crates/brk_computer/src/grouped/from_height.rs b/crates/brk_computer/src/grouped/from_height.rs index abadc5691..7a96c69a7 100644 --- a/crates/brk_computer/src/grouped/from_height.rs +++ b/crates/brk_computer/src/grouped/from_height.rs @@ -13,12 +13,12 @@ use crate::{ indexes, }; -use super::{ComputedType, EagerVecsBuilder, VecBuilderOptions}; +use super::{ComputedVecValue, EagerVecsBuilder, VecBuilderOptions}; #[derive(Clone)] pub struct ComputedVecsFromHeight where - T: ComputedType + PartialOrd, + T: ComputedVecValue + PartialOrd, { pub height: Option>, pub height_extra: EagerVecsBuilder, @@ -37,7 +37,7 @@ const VERSION: Version = Version::ZERO; impl ComputedVecsFromHeight where - T: ComputedType + Ord + From + 'static, + T: ComputedVecValue + Ord + From + 'static, f64: From, { #[allow(clippy::too_many_arguments)] @@ -202,7 +202,7 @@ where impl Traversable for ComputedVecsFromHeight where - T: ComputedType, + T: ComputedVecValue, { fn to_tree_node(&self) -> brk_traversable::TreeNode { let height_extra_node = self.height_extra.to_tree_node(); diff --git a/crates/brk_computer/src/grouped/from_height_strict.rs b/crates/brk_computer/src/grouped/from_height_strict.rs index 01933c3d2..d3989cbe3 100644 --- a/crates/brk_computer/src/grouped/from_height_strict.rs +++ b/crates/brk_computer/src/grouped/from_height_strict.rs @@ -6,12 +6,12 @@ use vecdb::{AnyWritableVec, Database, EagerVec, Exit}; use crate::{Indexes, indexes}; -use super::{ComputedType, EagerVecsBuilder, VecBuilderOptions}; +use super::{ComputedVecValue, EagerVecsBuilder, VecBuilderOptions}; #[derive(Clone)] pub struct ComputedVecsFromHeightStrict where - T: ComputedType + PartialOrd, + T: ComputedVecValue + PartialOrd, { pub height: EagerVec, pub height_extra: EagerVecsBuilder, @@ -23,7 +23,7 @@ const VERSION: Version = Version::ZERO; impl ComputedVecsFromHeightStrict where - T: ComputedType + Ord + From, + T: ComputedVecValue + Ord + From, f64: From, { pub fn forced_import( @@ -86,7 +86,7 @@ where impl Traversable for ComputedVecsFromHeightStrict where - T: ComputedType, + T: ComputedVecValue, { fn to_tree_node(&self) -> brk_traversable::TreeNode { let height_extra_node = self.height_extra.to_tree_node(); diff --git a/crates/brk_computer/src/grouped/from_txindex.rs b/crates/brk_computer/src/grouped/from_txindex.rs index 58bc445dc..40cc0a2c1 100644 --- a/crates/brk_computer/src/grouped/from_txindex.rs +++ b/crates/brk_computer/src/grouped/from_txindex.rs @@ -16,12 +16,12 @@ use crate::{ indexes, price, }; -use super::{ComputedType, EagerVecsBuilder, VecBuilderOptions}; +use super::{ComputedVecValue, EagerVecsBuilder, VecBuilderOptions}; #[derive(Clone)] pub struct ComputedVecsFromTxindex where - T: ComputedType + PartialOrd, + T: ComputedVecValue + PartialOrd, { pub txindex: Option>>, pub height: EagerVecsBuilder, @@ -40,7 +40,7 @@ const VERSION: Version = Version::ZERO; impl ComputedVecsFromTxindex where - T: ComputedType + Ord + From + 'static, + T: ComputedVecValue + Ord + From + 'static, f64: From, { #[allow(clippy::too_many_arguments)] @@ -465,7 +465,7 @@ impl ComputedVecsFromTxindex { impl Traversable for ComputedVecsFromTxindex where - T: ComputedType, + T: ComputedVecValue, { fn to_tree_node(&self) -> brk_traversable::TreeNode { brk_traversable::TreeNode::Branch( diff --git a/crates/brk_computer/src/stateful/range_map.rs b/crates/brk_computer/src/stateful/range_map.rs index f9e800a36..379ace61e 100644 --- a/crates/brk_computer/src/stateful/range_map.rs +++ b/crates/brk_computer/src/stateful/range_map.rs @@ -1,6 +1,6 @@ use std::collections::BTreeMap; -use vecdb::{Compressable, CompressedVec, RawVec, VecIndex, VecValue}; +use vecdb::{CompressedVec, Pco, RawVec, VecIndex, VecValue}; #[derive(Debug)] pub struct RangeMap(BTreeMap); @@ -39,7 +39,7 @@ where impl From<&CompressedVec> for RangeMap where I: VecIndex, - T: VecIndex + Compressable, + T: VecIndex + Pco, { #[inline] fn from(vec: &CompressedVec) -> Self { diff --git a/crates/brk_server/Cargo.toml b/crates/brk_server/Cargo.toml index 0ae4e0952..2fd44c873 100644 --- a/crates/brk_server/Cargo.toml +++ b/crates/brk_server/Cargo.toml @@ -32,5 +32,5 @@ schemars = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } tokio = { workspace = true } -tower-http = { version = "0.6.6", features = ["compression-full", "trace"] } +tower-http = { version = "0.6.7", features = ["compression-full", "trace"] } tracing = "0.1.41" diff --git a/crates/brk_store/src/any.rs b/crates/brk_store/src/any.rs index a43312bb6..e8016420f 100644 --- a/crates/brk_store/src/any.rs +++ b/crates/brk_store/src/any.rs @@ -11,6 +11,6 @@ pub trait AnyStore: Send + Sync { fn keyspace(&self) -> &fjall3::Keyspace; fn partition(&self) -> &fjall2::PartitionHandle; fn take_all_f2(&mut self) -> Vec; - fn take_all_f3(&mut self) -> Vec; + // fn take_all_f3(&mut self) -> Vec; // fn take_all_f3(&mut self) -> Box>; } diff --git a/crates/brk_store/src/fjall_v2/mod.rs b/crates/brk_store/src/fjall_v2/mod.rs index 5af5f7ecb..c028395ff 100644 --- a/crates/brk_store/src/fjall_v2/mod.rs +++ b/crates/brk_store/src/fjall_v2/mod.rs @@ -197,9 +197,9 @@ where items.into_iter().map(InnerItem::from).collect() } - fn take_all_f3(&mut self) -> Vec { - panic!() - } + // fn take_all_f3(&mut self) -> Vec { + // panic!() + // } fn export_meta_if_needed(&mut self, height: Height) -> Result<()> { if self.has(height) { diff --git a/crates/brk_store/src/lib.rs b/crates/brk_store/src/lib.rs index 83c3c4af0..42b6f474f 100644 --- a/crates/brk_store/src/lib.rs +++ b/crates/brk_store/src/lib.rs @@ -2,8 +2,8 @@ mod any; mod fjall_v2; -mod fjall_v3; +// mod fjall_v3; pub use any::*; pub use fjall_v2::*; -pub use fjall_v3::*; +// pub use fjall_v3::*; diff --git a/crates/brk_traversable/src/lib.rs b/crates/brk_traversable/src/lib.rs index 2c59b6bd9..c9b198839 100644 --- a/crates/brk_traversable/src/lib.rs +++ b/crates/brk_traversable/src/lib.rs @@ -5,8 +5,8 @@ pub use brk_types::TreeNode; #[cfg(feature = "derive")] pub use brk_traversable_derive::Traversable; use vecdb::{ - AnyVec, AnyWritableVec, Compressable, CompressedVec, ComputedVec, EagerVec, Formattable, - LazyVecFrom1, LazyVecFrom2, LazyVecFrom3, RawVec, StoredVec, VecIndex, VecValue, + AnyVec, AnyWritableVec, CompressedVec, ComputedVec, EagerVec, Formattable, LazyVecFrom1, + LazyVecFrom2, LazyVecFrom3, Pco, RawVec, StoredVec, VecIndex, VecValue, }; pub trait Traversable { @@ -31,7 +31,7 @@ where impl Traversable for CompressedVec where I: VecIndex, - T: Compressable + Formattable, + T: Pco + Formattable, { fn iter_any_writable(&self) -> impl Iterator { std::iter::once(self as &dyn AnyWritableVec) @@ -45,7 +45,7 @@ where impl Traversable for StoredVec where I: VecIndex, - T: Compressable + Formattable, + T: Pco + Formattable, { fn iter_any_writable(&self) -> impl Iterator { std::iter::once(self as &dyn AnyWritableVec) @@ -59,7 +59,7 @@ where impl Traversable for EagerVec where I: VecIndex, - T: Compressable + Formattable, + T: Pco + Formattable, { fn iter_any_writable(&self) -> impl Iterator { std::iter::once(self as &dyn AnyWritableVec) @@ -129,13 +129,13 @@ impl Traversable for ComputedVec where I: VecIndex, - T: Compressable + Formattable, + T: Pco + Formattable, S1I: VecIndex, - S1T: Compressable, + S1T: Pco, S2I: VecIndex, - S2T: Compressable, + S2T: Pco, S3I: VecIndex, - S3T: Compressable, + S3T: Pco, { fn iter_any_writable(&self) -> impl Iterator { std::iter::once(self as &dyn AnyWritableVec) diff --git a/crates/brk_types/README.md b/crates/brk_types/README.md index 15ba96d60..2a08b9996 100644 --- a/crates/brk_types/README.md +++ b/crates/brk_types/README.md @@ -244,7 +244,7 @@ Storage types provide space optimization: **Financial Types**: Multi-denomination OHLC support with automatic conversions \ **Address System**: Complete Bitcoin script type classification with 280 enum variants \ **Time Indexing**: Hierarchical calendar system from daily to decade-level granularity \ -**Storage Integration**: `vecdb::Compressable` traits for efficient database operations \ +**Storage Integration**: `vecdb::Pco` traits for efficient database operations \ **Architecture**: Type-driven design prioritizing memory efficiency and domain correctness --- diff --git a/crates/brk_types/src/bitcoin.rs b/crates/brk_types/src/bitcoin.rs index bb11e6048..b20b23314 100644 --- a/crates/brk_types/src/bitcoin.rs +++ b/crates/brk_types/src/bitcoin.rs @@ -4,22 +4,13 @@ use std::{ }; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable}; +use vecdb::{CheckedSub, Formattable, Pco}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::{Sats, StoredF64}; #[derive( - Debug, - Default, - Clone, - Copy, - FromBytes, - Immutable, - IntoBytes, - KnownLayout, - Serialize, - Compressable, + Debug, Default, Clone, Copy, FromBytes, Immutable, IntoBytes, KnownLayout, Serialize, Pco, )] pub struct Bitcoin(f64); diff --git a/crates/brk_types/src/blkposition.rs b/crates/brk_types/src/blkposition.rs index a84ed1535..06a1bb7c7 100644 --- a/crates/brk_types/src/blkposition.rs +++ b/crates/brk_types/src/blkposition.rs @@ -1,12 +1,10 @@ use std::ops::Add; use serde::Serialize; -use vecdb::{Compressable, Formattable}; +use vecdb::{Formattable, Pco}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; -#[derive( - Debug, Clone, Copy, Serialize, FromBytes, Immutable, IntoBytes, KnownLayout, Compressable, -)] +#[derive(Debug, Clone, Copy, Serialize, FromBytes, Immutable, IntoBytes, KnownLayout, Pco)] pub struct BlkPosition(u64); impl BlkPosition { diff --git a/crates/brk_types/src/cents.rs b/crates/brk_types/src/cents.rs index 6b9a47515..d15b1dd86 100644 --- a/crates/brk_types/src/cents.rs +++ b/crates/brk_types/src/cents.rs @@ -1,7 +1,7 @@ use std::ops::{Add, Div, Mul}; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable}; +use vecdb::{CheckedSub, Formattable, Pco}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::Dollars; @@ -20,7 +20,7 @@ use super::Dollars; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct Cents(i64); diff --git a/crates/brk_types/src/date.rs b/crates/brk_types/src/date.rs index 70ac3180b..576463d6c 100644 --- a/crates/brk_types/src/date.rs +++ b/crates/brk_types/src/date.rs @@ -1,6 +1,6 @@ use jiff::{Span, Zoned, civil::Date as Date_, tz::TimeZone}; use serde::{Serialize, Serializer}; -use vecdb::{Compressable, Formattable}; +use vecdb::{Formattable, Pco}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::ONE_DAY_IN_SEC_F64; @@ -19,7 +19,7 @@ use super::{DateIndex, Timestamp}; Immutable, IntoBytes, KnownLayout, - Compressable, + Pco, )] pub struct Date(u32); diff --git a/crates/brk_types/src/dateindex.rs b/crates/brk_types/src/dateindex.rs index ea707e116..e24a19158 100644 --- a/crates/brk_types/src/dateindex.rs +++ b/crates/brk_types/src/dateindex.rs @@ -3,7 +3,7 @@ use std::ops::{Add, Rem}; use brk_error::Error; use jiff::Span; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, FromCoarserIndex, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, FromCoarserIndex, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::{DecadeIndex, MonthIndex, QuarterIndex, SemesterIndex, WeekIndex, YearIndex}; @@ -24,7 +24,7 @@ use super::Date; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct DateIndex(u16); diff --git a/crates/brk_types/src/decadeindex.rs b/crates/brk_types/src/decadeindex.rs index b93ee7069..941037f52 100644 --- a/crates/brk_types/src/decadeindex.rs +++ b/crates/brk_types/src/decadeindex.rs @@ -4,7 +4,7 @@ use std::{ }; use serde::{Deserialize, Serialize}; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::{Date, DateIndex, YearIndex}; @@ -24,7 +24,7 @@ use super::{Date, DateIndex, YearIndex}; Immutable, IntoBytes, KnownLayout, - Compressable, + Pco, )] pub struct DecadeIndex(u16); diff --git a/crates/brk_types/src/difficultyepoch.rs b/crates/brk_types/src/difficultyepoch.rs index 82522cf8e..05dffbc56 100644 --- a/crates/brk_types/src/difficultyepoch.rs +++ b/crates/brk_types/src/difficultyepoch.rs @@ -4,7 +4,7 @@ use std::{ }; use serde::{Deserialize, Serialize}; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::Height; @@ -26,7 +26,7 @@ pub const BLOCKS_PER_DIFF_EPOCHS: u32 = 2016; Immutable, IntoBytes, KnownLayout, - Compressable, + Pco, )] pub struct DifficultyEpoch(u16); diff --git a/crates/brk_types/src/dollars.rs b/crates/brk_types/src/dollars.rs index f4265ddd3..754cd9f49 100644 --- a/crates/brk_types/src/dollars.rs +++ b/crates/brk_types/src/dollars.rs @@ -8,7 +8,7 @@ use std::{ use derive_deref::Deref; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; -use vecdb::{CheckedSub, Compressable, Formattable}; +use vecdb::{CheckedSub, Formattable, Pco}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::{Low, Open}; @@ -27,7 +27,7 @@ use super::{Bitcoin, Cents, Close, High, Sats, StoredF32, StoredF64}; KnownLayout, Serialize, Deserialize, - Compressable, + Pco, JsonSchema, )] pub struct Dollars(f64); diff --git a/crates/brk_types/src/emptyaddressindex.rs b/crates/brk_types/src/emptyaddressindex.rs index 2d1fcbabc..cda0f06be 100644 --- a/crates/brk_types/src/emptyaddressindex.rs +++ b/crates/brk_types/src/emptyaddressindex.rs @@ -2,7 +2,7 @@ use std::ops::Add; use derive_deref::Deref; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::TypeIndex; @@ -22,7 +22,7 @@ use crate::TypeIndex; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct EmptyAddressIndex(TypeIndex); diff --git a/crates/brk_types/src/emptyoutputindex.rs b/crates/brk_types/src/emptyoutputindex.rs index cb7c71215..3b11f23df 100644 --- a/crates/brk_types/src/emptyoutputindex.rs +++ b/crates/brk_types/src/emptyoutputindex.rs @@ -2,7 +2,7 @@ use std::ops::Add; use derive_deref::{Deref, DerefMut}; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::TypeIndex; @@ -23,7 +23,7 @@ use crate::TypeIndex; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct EmptyOutputIndex(TypeIndex); impl From for EmptyOutputIndex { diff --git a/crates/brk_types/src/feerate.rs b/crates/brk_types/src/feerate.rs index a549baac1..bcdedc049 100644 --- a/crates/brk_types/src/feerate.rs +++ b/crates/brk_types/src/feerate.rs @@ -4,14 +4,12 @@ use std::{ }; use serde::Serialize; -use vecdb::{Compressable, Formattable}; +use vecdb::{Formattable, Pco}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::{Sats, StoredU64}; -#[derive( - Debug, Clone, Copy, Serialize, FromBytes, Immutable, IntoBytes, KnownLayout, Compressable, -)] +#[derive(Debug, Clone, Copy, Serialize, FromBytes, Immutable, IntoBytes, KnownLayout, Pco)] pub struct FeeRate(f64); impl From<(Sats, StoredU64)> for FeeRate { diff --git a/crates/brk_types/src/halvingepoch.rs b/crates/brk_types/src/halvingepoch.rs index 8db87ed8e..a73bcc3e3 100644 --- a/crates/brk_types/src/halvingepoch.rs +++ b/crates/brk_types/src/halvingepoch.rs @@ -4,7 +4,7 @@ use std::{ }; use serde::{Deserialize, Serialize}; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::Height; @@ -26,7 +26,7 @@ pub const BLOCKS_PER_HALVING: u32 = 210_000; Immutable, IntoBytes, KnownLayout, - Compressable, + Pco, )] pub struct HalvingEpoch(u16); diff --git a/crates/brk_types/src/height.rs b/crates/brk_types/src/height.rs index 91174ca00..179f7ce3f 100644 --- a/crates/brk_types/src/height.rs +++ b/crates/brk_types/src/height.rs @@ -7,7 +7,7 @@ use byteview::ByteView; use derive_deref::Deref; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex, Stamp}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex, Stamp}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::{BLOCKS_PER_DIFF_EPOCHS, BLOCKS_PER_HALVING, copy_first_4bytes}; @@ -31,7 +31,7 @@ use super::StoredU64; Immutable, IntoBytes, KnownLayout, - Compressable, + Pco, JsonSchema, Hash, )] diff --git a/crates/brk_types/src/loadedaddressindex.rs b/crates/brk_types/src/loadedaddressindex.rs index 13e351bcd..a1cf0170f 100644 --- a/crates/brk_types/src/loadedaddressindex.rs +++ b/crates/brk_types/src/loadedaddressindex.rs @@ -2,7 +2,7 @@ use std::ops::Add; use derive_deref::Deref; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::TypeIndex; @@ -22,7 +22,7 @@ use crate::TypeIndex; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct LoadedAddressIndex(TypeIndex); diff --git a/crates/brk_types/src/monthindex.rs b/crates/brk_types/src/monthindex.rs index a52d0e6c0..b7d820690 100644 --- a/crates/brk_types/src/monthindex.rs +++ b/crates/brk_types/src/monthindex.rs @@ -4,7 +4,7 @@ use std::{ }; use serde::{Deserialize, Serialize}; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::{Date, DateIndex, YearIndex}; @@ -24,7 +24,7 @@ use super::{Date, DateIndex, YearIndex}; Immutable, IntoBytes, KnownLayout, - Compressable, + Pco, )] pub struct MonthIndex(u16); diff --git a/crates/brk_types/src/ohlc.rs b/crates/brk_types/src/ohlc.rs index cb1eeb0c8..9d51a32bb 100644 --- a/crates/brk_types/src/ohlc.rs +++ b/crates/brk_types/src/ohlc.rs @@ -6,7 +6,7 @@ use std::{ use derive_deref::{Deref, DerefMut}; use serde::{Serialize, Serializer, ser::SerializeTuple}; -use vecdb::{Compressable, Formattable, TransparentCompressable}; +use vecdb::{Formattable, Pco, TransparentPco}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::StoredF64; @@ -88,10 +88,10 @@ pub struct OHLCDollars { // This is FAKE, just to be able to use EagerVec // Need to find a better way -impl Compressable for OHLCDollars { +impl Pco for OHLCDollars { type NumberType = u64; } -impl TransparentCompressable for OHLCDollars {} +impl TransparentPco for OHLCDollars {} impl Serialize for OHLCDollars { fn serialize(&self, serializer: S) -> Result @@ -178,10 +178,10 @@ pub struct OHLCSats { // This is FAKE, just to be able to use EagerVec // Need to find a better way -impl Compressable for OHLCSats { +impl Pco for OHLCSats { type NumberType = u64; } -impl TransparentCompressable for OHLCSats {} +impl TransparentPco for OHLCSats {} impl Serialize for OHLCSats { fn serialize(&self, serializer: S) -> Result @@ -254,7 +254,7 @@ impl Formattable for OHLCSats { Deref, DerefMut, Serialize, - Compressable, + Pco, )] #[repr(transparent)] pub struct Open(T); @@ -386,7 +386,7 @@ where Deref, DerefMut, Serialize, - Compressable, + Pco, )] #[repr(transparent)] pub struct High(T); @@ -518,7 +518,7 @@ where Deref, DerefMut, Serialize, - Compressable, + Pco, )] #[repr(transparent)] pub struct Low(T); @@ -650,7 +650,7 @@ where Deref, DerefMut, Serialize, - Compressable, + Pco, )] #[repr(transparent)] pub struct Close(T); diff --git a/crates/brk_types/src/opreturnindex.rs b/crates/brk_types/src/opreturnindex.rs index 09dcf02e9..39ba741c7 100644 --- a/crates/brk_types/src/opreturnindex.rs +++ b/crates/brk_types/src/opreturnindex.rs @@ -2,7 +2,7 @@ use std::ops::Add; use derive_deref::{Deref, DerefMut}; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::TypeIndex; @@ -23,7 +23,7 @@ use crate::TypeIndex; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct OpReturnIndex(TypeIndex); diff --git a/crates/brk_types/src/outpoint.rs b/crates/brk_types/src/outpoint.rs index a76d892eb..08c93693f 100644 --- a/crates/brk_types/src/outpoint.rs +++ b/crates/brk_types/src/outpoint.rs @@ -1,6 +1,6 @@ use schemars::JsonSchema; use serde::Serialize; -use vecdb::{Compressable, Formattable}; +use vecdb::{Formattable, Pco}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::{TxIndex, Vout}; @@ -21,7 +21,7 @@ use crate::{TxIndex, Vout}; Serialize, JsonSchema, Hash, - Compressable, + Pco, )] pub struct OutPoint(u64); diff --git a/crates/brk_types/src/p2aaddressindex.rs b/crates/brk_types/src/p2aaddressindex.rs index 6cbab2897..422ce6cd5 100644 --- a/crates/brk_types/src/p2aaddressindex.rs +++ b/crates/brk_types/src/p2aaddressindex.rs @@ -2,7 +2,7 @@ use std::ops::Add; use derive_deref::{Deref, DerefMut}; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::TypeIndex; @@ -23,7 +23,7 @@ use crate::TypeIndex; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct P2AAddressIndex(TypeIndex); impl From for P2AAddressIndex { diff --git a/crates/brk_types/src/p2msoutputindex.rs b/crates/brk_types/src/p2msoutputindex.rs index 28b34ec78..b5028711e 100644 --- a/crates/brk_types/src/p2msoutputindex.rs +++ b/crates/brk_types/src/p2msoutputindex.rs @@ -2,7 +2,7 @@ use std::ops::Add; use derive_deref::{Deref, DerefMut}; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::TypeIndex; @@ -23,7 +23,7 @@ use crate::TypeIndex; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct P2MSOutputIndex(TypeIndex); impl From for P2MSOutputIndex { diff --git a/crates/brk_types/src/p2pk33addressindex.rs b/crates/brk_types/src/p2pk33addressindex.rs index 98f35a69b..d5fde8f31 100644 --- a/crates/brk_types/src/p2pk33addressindex.rs +++ b/crates/brk_types/src/p2pk33addressindex.rs @@ -2,7 +2,7 @@ use std::ops::Add; use derive_deref::{Deref, DerefMut}; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::TypeIndex; @@ -23,7 +23,7 @@ use crate::TypeIndex; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct P2PK33AddressIndex(TypeIndex); impl From for P2PK33AddressIndex { diff --git a/crates/brk_types/src/p2pk65addressindex.rs b/crates/brk_types/src/p2pk65addressindex.rs index d5bafd4b6..650e3f4f4 100644 --- a/crates/brk_types/src/p2pk65addressindex.rs +++ b/crates/brk_types/src/p2pk65addressindex.rs @@ -2,7 +2,7 @@ use std::ops::Add; use derive_deref::{Deref, DerefMut}; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::TypeIndex; @@ -23,7 +23,7 @@ use crate::TypeIndex; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct P2PK65AddressIndex(TypeIndex); impl From for P2PK65AddressIndex { diff --git a/crates/brk_types/src/p2pkhaddressindex.rs b/crates/brk_types/src/p2pkhaddressindex.rs index 6fe97991e..d6c0dbf1a 100644 --- a/crates/brk_types/src/p2pkhaddressindex.rs +++ b/crates/brk_types/src/p2pkhaddressindex.rs @@ -2,7 +2,7 @@ use std::ops::Add; use derive_deref::{Deref, DerefMut}; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::TypeIndex; @@ -23,7 +23,7 @@ use crate::TypeIndex; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct P2PKHAddressIndex(TypeIndex); impl From for P2PKHAddressIndex { diff --git a/crates/brk_types/src/p2shaddressindex.rs b/crates/brk_types/src/p2shaddressindex.rs index 71bdd11ee..19934fc74 100644 --- a/crates/brk_types/src/p2shaddressindex.rs +++ b/crates/brk_types/src/p2shaddressindex.rs @@ -2,7 +2,7 @@ use std::ops::Add; use derive_deref::{Deref, DerefMut}; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::TypeIndex; @@ -23,7 +23,7 @@ use crate::TypeIndex; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct P2SHAddressIndex(TypeIndex); impl From for P2SHAddressIndex { diff --git a/crates/brk_types/src/p2traddressindex.rs b/crates/brk_types/src/p2traddressindex.rs index 96e3a5810..51c013724 100644 --- a/crates/brk_types/src/p2traddressindex.rs +++ b/crates/brk_types/src/p2traddressindex.rs @@ -2,7 +2,7 @@ use std::ops::Add; use derive_deref::{Deref, DerefMut}; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::TypeIndex; @@ -23,7 +23,7 @@ use crate::TypeIndex; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct P2TRAddressIndex(TypeIndex); impl From for P2TRAddressIndex { diff --git a/crates/brk_types/src/p2wpkhaddressindex.rs b/crates/brk_types/src/p2wpkhaddressindex.rs index feb3e4782..f1f13ae1e 100644 --- a/crates/brk_types/src/p2wpkhaddressindex.rs +++ b/crates/brk_types/src/p2wpkhaddressindex.rs @@ -2,7 +2,7 @@ use std::ops::Add; use derive_deref::{Deref, DerefMut}; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::TypeIndex; @@ -23,7 +23,7 @@ use crate::TypeIndex; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct P2WPKHAddressIndex(TypeIndex); impl From for P2WPKHAddressIndex { diff --git a/crates/brk_types/src/p2wshaddressindex.rs b/crates/brk_types/src/p2wshaddressindex.rs index ec40625f7..15c77a014 100644 --- a/crates/brk_types/src/p2wshaddressindex.rs +++ b/crates/brk_types/src/p2wshaddressindex.rs @@ -2,7 +2,7 @@ use std::ops::Add; use derive_deref::{Deref, DerefMut}; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::TypeIndex; @@ -23,7 +23,7 @@ use crate::TypeIndex; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct P2WSHAddressIndex(TypeIndex); impl From for P2WSHAddressIndex { diff --git a/crates/brk_types/src/quarterindex.rs b/crates/brk_types/src/quarterindex.rs index 61b77beef..042eb8b8c 100644 --- a/crates/brk_types/src/quarterindex.rs +++ b/crates/brk_types/src/quarterindex.rs @@ -4,7 +4,7 @@ use std::{ }; use serde::{Deserialize, Serialize}; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::MonthIndex; @@ -24,7 +24,7 @@ use super::MonthIndex; Immutable, IntoBytes, KnownLayout, - Compressable, + Pco, )] pub struct QuarterIndex(u16); diff --git a/crates/brk_types/src/rawlocktime.rs b/crates/brk_types/src/rawlocktime.rs index 64ab2c3f8..f9c0efd23 100644 --- a/crates/brk_types/src/rawlocktime.rs +++ b/crates/brk_types/src/rawlocktime.rs @@ -1,21 +1,12 @@ use bitcoin::{absolute::LockTime, locktime::absolute::LOCK_TIME_THRESHOLD}; use schemars::JsonSchema; use serde::Serialize; -use vecdb::{Compressable, Formattable}; +use vecdb::{Formattable, Pco}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; /// Transaction locktime #[derive( - Debug, - Immutable, - Clone, - Copy, - IntoBytes, - KnownLayout, - FromBytes, - Serialize, - Compressable, - JsonSchema, + Debug, Immutable, Clone, Copy, IntoBytes, KnownLayout, FromBytes, Serialize, Pco, JsonSchema, )] pub struct RawLockTime(u32); diff --git a/crates/brk_types/src/sats.rs b/crates/brk_types/src/sats.rs index 26a035aae..20bda82e4 100644 --- a/crates/brk_types/src/sats.rs +++ b/crates/brk_types/src/sats.rs @@ -7,7 +7,7 @@ use bitcoin::Amount; use derive_deref::Deref; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; -use vecdb::{CheckedSub, Compressable, Formattable, SaturatingAdd}; +use vecdb::{CheckedSub, Formattable, Pco, SaturatingAdd}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::StoredF64; @@ -31,7 +31,7 @@ use super::{Bitcoin, Cents, Dollars, Height}; KnownLayout, Serialize, Deserialize, - Compressable, + Pco, JsonSchema, )] pub struct Sats(u64); diff --git a/crates/brk_types/src/semesterindex.rs b/crates/brk_types/src/semesterindex.rs index 6ede617f5..cd3d0ccc2 100644 --- a/crates/brk_types/src/semesterindex.rs +++ b/crates/brk_types/src/semesterindex.rs @@ -4,7 +4,7 @@ use std::{ }; use serde::{Deserialize, Serialize}; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::MonthIndex; @@ -24,7 +24,7 @@ use super::MonthIndex; Immutable, IntoBytes, KnownLayout, - Compressable, + Pco, )] pub struct SemesterIndex(u16); diff --git a/crates/brk_types/src/stored_bool.rs b/crates/brk_types/src/stored_bool.rs index 4d2595465..494507cbf 100644 --- a/crates/brk_types/src/stored_bool.rs +++ b/crates/brk_types/src/stored_bool.rs @@ -1,6 +1,6 @@ use derive_deref::Deref; use serde::Serialize; -use vecdb::{Compressable, Formattable, PrintableIndex}; +use vecdb::{Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; #[derive( @@ -18,7 +18,7 @@ use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct StoredBool(u16); diff --git a/crates/brk_types/src/stored_f32.rs b/crates/brk_types/src/stored_f32.rs index 2a0f8ccb0..3db8021b5 100644 --- a/crates/brk_types/src/stored_f32.rs +++ b/crates/brk_types/src/stored_f32.rs @@ -8,7 +8,7 @@ use std::{ use derive_deref::Deref; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::{Close, StoredU32}; @@ -16,17 +16,7 @@ use crate::{Close, StoredU32}; use super::{Dollars, StoredF64}; #[derive( - Debug, - Deref, - Default, - Clone, - Copy, - FromBytes, - Immutable, - IntoBytes, - KnownLayout, - Serialize, - Compressable, + Debug, Deref, Default, Clone, Copy, FromBytes, Immutable, IntoBytes, KnownLayout, Serialize, Pco, )] pub struct StoredF32(f32); diff --git a/crates/brk_types/src/stored_f64.rs b/crates/brk_types/src/stored_f64.rs index e480c0f8a..2e7cd3433 100644 --- a/crates/brk_types/src/stored_f64.rs +++ b/crates/brk_types/src/stored_f64.rs @@ -7,23 +7,13 @@ use std::{ use derive_deref::Deref; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::{Bitcoin, Dollars}; #[derive( - Debug, - Deref, - Default, - Clone, - Copy, - FromBytes, - Immutable, - IntoBytes, - KnownLayout, - Serialize, - Compressable, + Debug, Deref, Default, Clone, Copy, FromBytes, Immutable, IntoBytes, KnownLayout, Serialize, Pco, )] pub struct StoredF64(f64); diff --git a/crates/brk_types/src/stored_i16.rs b/crates/brk_types/src/stored_i16.rs index 4571e1a59..0a2cfaaff 100644 --- a/crates/brk_types/src/stored_i16.rs +++ b/crates/brk_types/src/stored_i16.rs @@ -2,7 +2,7 @@ use std::ops::{Add, AddAssign, Div}; use derive_deref::Deref; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; #[derive( @@ -20,7 +20,7 @@ use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct StoredI16(i16); diff --git a/crates/brk_types/src/stored_u16.rs b/crates/brk_types/src/stored_u16.rs index f1b06a106..67bf151d2 100644 --- a/crates/brk_types/src/stored_u16.rs +++ b/crates/brk_types/src/stored_u16.rs @@ -2,7 +2,7 @@ use std::ops::{Add, AddAssign, Div}; use derive_deref::Deref; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::{ @@ -26,7 +26,7 @@ use super::{ IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct StoredU16(u16); diff --git a/crates/brk_types/src/stored_u32.rs b/crates/brk_types/src/stored_u32.rs index bbd758b25..fb9b249b4 100644 --- a/crates/brk_types/src/stored_u32.rs +++ b/crates/brk_types/src/stored_u32.rs @@ -2,7 +2,7 @@ use std::ops::{Add, AddAssign, Div, Mul}; use derive_deref::Deref; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::{ @@ -26,7 +26,7 @@ use super::{ IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct StoredU32(u32); diff --git a/crates/brk_types/src/stored_u64.rs b/crates/brk_types/src/stored_u64.rs index b7e547731..ac3a1987a 100644 --- a/crates/brk_types/src/stored_u64.rs +++ b/crates/brk_types/src/stored_u64.rs @@ -2,7 +2,7 @@ use std::ops::{Add, AddAssign, Div}; use derive_deref::Deref; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::{ @@ -27,7 +27,7 @@ use super::{ IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct StoredU64(u64); diff --git a/crates/brk_types/src/timestamp.rs b/crates/brk_types/src/timestamp.rs index 59e742499..ce912d335 100644 --- a/crates/brk_types/src/timestamp.rs +++ b/crates/brk_types/src/timestamp.rs @@ -4,7 +4,7 @@ use derive_deref::Deref; use jiff::{civil::date, tz::TimeZone}; use schemars::JsonSchema; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable}; +use vecdb::{CheckedSub, Formattable, Pco}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::Date; @@ -24,7 +24,7 @@ use super::Date; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, JsonSchema, )] pub struct Timestamp(u32); diff --git a/crates/brk_types/src/txindex.rs b/crates/brk_types/src/txindex.rs index b0c49c26e..eb17fe04d 100644 --- a/crates/brk_types/src/txindex.rs +++ b/crates/brk_types/src/txindex.rs @@ -4,7 +4,7 @@ use byteview::ByteView; use derive_deref::{Deref, DerefMut}; use schemars::JsonSchema; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::copy_first_4bytes; @@ -27,7 +27,7 @@ use super::StoredU32; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, JsonSchema, Hash, )] diff --git a/crates/brk_types/src/txinindex.rs b/crates/brk_types/src/txinindex.rs index add22d564..b087743b6 100644 --- a/crates/brk_types/src/txinindex.rs +++ b/crates/brk_types/src/txinindex.rs @@ -2,7 +2,7 @@ use std::ops::{Add, AddAssign}; use derive_deref::{Deref, DerefMut}; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::Vin; @@ -23,7 +23,7 @@ use super::Vin; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct TxInIndex(u64); diff --git a/crates/brk_types/src/txoutindex.rs b/crates/brk_types/src/txoutindex.rs index 49f1837ca..92116bbd2 100644 --- a/crates/brk_types/src/txoutindex.rs +++ b/crates/brk_types/src/txoutindex.rs @@ -2,7 +2,7 @@ use std::ops::{Add, AddAssign}; use derive_deref::{Deref, DerefMut}; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::copy_first_8bytes; @@ -25,7 +25,7 @@ use super::Vout; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct TxOutIndex(u64); diff --git a/crates/brk_types/src/txversion.rs b/crates/brk_types/src/txversion.rs index 0051f4fa5..e9aaacc13 100644 --- a/crates/brk_types/src/txversion.rs +++ b/crates/brk_types/src/txversion.rs @@ -1,7 +1,7 @@ use derive_deref::Deref; use schemars::JsonSchema; use serde::Serialize; -use vecdb::{Compressable, Formattable}; +use vecdb::{Formattable, Pco}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::StoredU16; @@ -21,7 +21,7 @@ use super::StoredU16; KnownLayout, FromBytes, Serialize, - Compressable, + Pco, JsonSchema, )] pub struct TxVersion(u16); diff --git a/crates/brk_types/src/typeindex.rs b/crates/brk_types/src/typeindex.rs index 38992646f..c6e10fb73 100644 --- a/crates/brk_types/src/typeindex.rs +++ b/crates/brk_types/src/typeindex.rs @@ -3,7 +3,7 @@ use std::ops::Add; use byteview::ByteView; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; -use vecdb::{CheckedSub, Compressable, Formattable}; +use vecdb::{CheckedSub, Formattable, Pco}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::copy_first_4bytes; @@ -24,7 +24,7 @@ use crate::copy_first_4bytes; KnownLayout, Serialize, Deserialize, - Compressable, + Pco, JsonSchema, Hash, )] diff --git a/crates/brk_types/src/unknownoutputindex.rs b/crates/brk_types/src/unknownoutputindex.rs index e3806c538..b0383ab1b 100644 --- a/crates/brk_types/src/unknownoutputindex.rs +++ b/crates/brk_types/src/unknownoutputindex.rs @@ -2,7 +2,7 @@ use std::ops::Add; use derive_deref::{Deref, DerefMut}; use serde::Serialize; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use crate::TypeIndex; @@ -23,7 +23,7 @@ use crate::TypeIndex; IntoBytes, KnownLayout, Serialize, - Compressable, + Pco, )] pub struct UnknownOutputIndex(TypeIndex); diff --git a/crates/brk_types/src/weekindex.rs b/crates/brk_types/src/weekindex.rs index e078fdbb4..6ff531604 100644 --- a/crates/brk_types/src/weekindex.rs +++ b/crates/brk_types/src/weekindex.rs @@ -4,7 +4,7 @@ use std::{ }; use serde::{Deserialize, Serialize}; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::{Date, DateIndex}; @@ -24,7 +24,7 @@ use super::{Date, DateIndex}; Immutable, IntoBytes, KnownLayout, - Compressable, + Pco, )] pub struct WeekIndex(u16); diff --git a/crates/brk_types/src/weight.rs b/crates/brk_types/src/weight.rs index 7b024ba01..2ff3eaf09 100644 --- a/crates/brk_types/src/weight.rs +++ b/crates/brk_types/src/weight.rs @@ -3,7 +3,7 @@ use std::ops::{Add, AddAssign, Div}; use derive_deref::Deref; use schemars::JsonSchema; use serde::Serialize; -use vecdb::{Compressable, Formattable}; +use vecdb::{Formattable, Pco}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; #[derive( @@ -20,7 +20,7 @@ use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; KnownLayout, FromBytes, Serialize, - Compressable, + Pco, JsonSchema, )] pub struct Weight(u64); diff --git a/crates/brk_types/src/yearindex.rs b/crates/brk_types/src/yearindex.rs index e5731b6c3..095454f5d 100644 --- a/crates/brk_types/src/yearindex.rs +++ b/crates/brk_types/src/yearindex.rs @@ -4,7 +4,7 @@ use std::{ }; use serde::{Deserialize, Serialize}; -use vecdb::{CheckedSub, Compressable, Formattable, PrintableIndex}; +use vecdb::{CheckedSub, Formattable, Pco, PrintableIndex}; use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout}; use super::{Date, DateIndex, MonthIndex}; @@ -24,7 +24,7 @@ use super::{Date, DateIndex, MonthIndex}; Immutable, IntoBytes, KnownLayout, - Compressable, + Pco, )] pub struct YearIndex(u16);