Skip to content

Commit 8073869

Browse files
committed
Merge remote-tracking branch 'origin/main' into codex/resolve-pr-210
# Conflicts: # src/storage/git.rs
2 parents 6fdc783 + 5efec13 commit 8073869

41 files changed

Lines changed: 3352 additions & 470 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

Lines changed: 84 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ thiserror = "2.0"
2727
parking_lot = "0.12"
2828
twox-hash = "2.0"
2929
serde_json = "1.0.117"
30-
arrow = "58.1.0"
30+
arrow = "58.3.0"
3131
schemars = "0.8"
3232
parquet = { version = "58.1.0", features = ["arrow"] }
3333
gix = { version = "0.81", features = ["blocking-network-client"], optional = true }
@@ -51,6 +51,7 @@ dirs = { version = "5.0", optional = true }
5151

5252
[dev-dependencies]
5353
assert_cmd = "2.2"
54+
proptest = "1"
5455
bytes = "1.10.1"
5556
criterion = "0.5"
5657
predicates = "3.0"
@@ -66,7 +67,14 @@ digest_base64 = ["dep:base64"]
6667
prolly_balance_max_nodes = []
6768
prolly_balance_rolling_hash = []
6869
git = ["dep:gix", "dep:clap", "dep:lru", "dep:hex", "dep:chrono", "dep:uuid"]
69-
sql = ["dep:gluesql-core", "dep:async-trait", "dep:uuid", "dep:futures", "dep:tokio"]
70+
sql = [
71+
"git",
72+
"dep:gluesql-core",
73+
"dep:async-trait",
74+
"dep:uuid",
75+
"dep:futures",
76+
"dep:tokio",
77+
]
7078
python = ["dep:pyo3"]
7179
rocksdb_storage = ["dep:rocksdb", "dep:lru"]
7280
proximity = []
@@ -97,7 +105,7 @@ harness = false
97105
[[bench]]
98106
name = "sql"
99107
harness = false
100-
required-features = ["sql"]
108+
required-features = ["git", "sql"]
101109

102110
[[bench]]
103111
name = "git"
@@ -115,7 +123,7 @@ path = "examples/proof.rs"
115123
[[example]]
116124
name = "sql"
117125
path = "examples/sql.rs"
118-
required-features = ["sql"]
126+
required-features = ["git", "sql"]
119127

120128
[[example]]
121129
name = "versioning"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Embedder identity (`id` + `version`) is persisted with the index. Reopening with
145145
| Feature | Description | Default |
146146
|---|---|---|
147147
| `git` | Git-backed versioned storage with branching, merging, history | Yes |
148-
| `sql` | SQL query interface via GlueSQL | Yes |
148+
| `sql` | SQL query interface via GlueSQL; enables `git` storage | Yes |
149149
| `proximity` | Vector index + text-search infrastructure (ML-free) | No |
150150
| `proximity_text` | Bundled Candle + all-MiniLM-L6-v2 embedder | No |
151151
| `rocksdb_storage` | RocksDB persistent storage backend | No |

0 commit comments

Comments
 (0)