Skip to content

Commit

Permalink
Merge branch 'develop' into adamg/vortex-datafusion-disk-provider
Browse files Browse the repository at this point in the history
  • Loading branch information
AdamGS authored Aug 6, 2024
2 parents 825101e + 31198a0 commit 9054a29
Show file tree
Hide file tree
Showing 31 changed files with 854 additions and 159 deletions.
664 changes: 664 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

78 changes: 39 additions & 39 deletions Cargo.lock

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

29 changes: 27 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
[workspace]
members = [
"bench-vortex",
"build-vortex",
"encodings/*",
"pyvortex",
"vortex-array",
"vortex-build",
"vortex-buffer",
"vortex-datafusion",
"vortex-dtype",
"vortex-error",
"vortex-expr",
"vortex-flatbuffers",
"vortex-sampling-compressor",
"vortex-scalar",
"vortex-serde",
]
resolver = "2"

[workspace.package]
version = "0.1.0"
version = "0.2.0"
homepage = "https://github.com/spiraldb/vortex"
repository = "https://github.com/spiraldb/vortex"
authors = [
Expand Down Expand Up @@ -110,6 +111,30 @@ thiserror = "1.0.58"
tokio = "1.37.0"
uninit = "0.6.2"
uuid = "1.8.0"

# BEGIN crates published by this project
vortex-alp = { version = "0.2.0", path = "./encodings/alp" }
vortex-array = { version = "0.2.0", path = "./vortex-array" }
vortex-buffer = { version = "0.2.0", path = "./vortex-buffer" }
vortex-build = { version = "0.2.0", path = "./vortex-build" }
vortex-byte-bool = { version = "0.2.0", path = "./encodings/byte-bool" }
vortex-datafusion = { version = "0.2.0", path = "./vortex-datafusion" }
vortex-datetime-parts = { version = "0.2.0", path = "./encodings/datetime-parts" }
vortex-dict = { version = "0.2.0", path = "./encodings/dict" }
vortex-dtype = { version = "0.2.0", path = "./vortex-dtype" }
vortex-error = { version = "0.2.0", path = "./vortex-error" }
vortex-expr = { version = "0.2.0", path = "./vortex-expr" }
vortex-flatbuffers = { version = "0.2.0", path = "./vortex-flatbuffers" }
vortex-fastlanes = { version = "0.2.0", path = "./encodings/fastlanes" }
vortex-roaring = { version = "0.2.0", path = "./encodings/roaring" }
vortex-runend = { version = "0.2.0", path = "./encodings/runend" }
vortex-runend-bool = { version = "0.2.0", path = "./encodings/runend-bool" }
vortex-scalar = { version = "0.2.0", path = "./vortex-scalar" }
vortex-serde = { version = "0.2.0", path = "./vortex-serde" }
vortex-sampling-compressor = { version = "0.2.0", path = "./vortex-sampling-compressor" }
vortex-zigzag = { version = "0.2.0", path = "./encodings/zigzag" }
# END crates published by this project

walkdir = "2.5.0"
worker = "0.3.0"
xshell = "0.2.6"
Expand Down
26 changes: 13 additions & 13 deletions bench-vortex/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,19 @@ simplelog = { workspace = true }
tar = { workspace = true }
tokio = { workspace = true, features = ["full"] }
uuid = { workspace = true, features = ["v4"] }
vortex-alp = { path = "../encodings/alp" }
vortex-array = { path = "../vortex-array" }
vortex-buffer = { path = "../vortex-buffer" }
vortex-datafusion = { path = "../vortex-datafusion" }
vortex-datetime-parts = { path = "../encodings/datetime-parts" }
vortex-dict = { path = "../encodings/dict" }
vortex-dtype = { path = "../vortex-dtype" }
vortex-error = { path = "../vortex-error", features = ["parquet"] }
vortex-fastlanes = { path = "../encodings/fastlanes" }
vortex-roaring = { path = "../encodings/roaring" }
vortex-runend = { path = "../encodings/runend" }
vortex-sampling-compressor = { path = "../vortex-sampling-compressor" }
vortex-serde = { path = "../vortex-serde", features = ["object_store"] }
vortex-alp = { workspace = true }
vortex-array = { workspace = true }
vortex-buffer = { workspace = true }
vortex-datafusion = { workspace = true }
vortex-datetime-parts = { workspace = true }
vortex-dict = { workspace = true }
vortex-dtype = { workspace = true }
vortex-error = { workspace = true, features = ["parquet"] }
vortex-fastlanes = { workspace = true }
vortex-roaring = { workspace = true }
vortex-runend = { workspace = true }
vortex-sampling-compressor = { workspace = true }
vortex-serde = { workspace = true, features = ["object_store"] }
xshell = { workspace = true }

[dev-dependencies]
Expand Down
Loading

0 comments on commit 9054a29

Please sign in to comment.