From e0770bbe5509b9d87f19a8e3a9f875d359383c10 Mon Sep 17 00:00:00 2001 From: Ziyang Hu Date: Thu, 8 Jun 2023 21:03:30 +0800 Subject: [PATCH] bump version --- Cargo.lock | 49 +++++++++++++++----------- VERSION | 2 +- cozo-bin/Cargo.toml | 4 +-- cozo-core/Cargo.toml | 2 +- cozo-core/src/parse/mod.rs | 11 +++++- cozo-lib-c/Cargo.toml | 4 +-- cozo-lib-java/Cargo.toml | 4 +-- cozo-lib-nodejs/Cargo.toml | 4 +-- cozo-lib-nodejs/package.json | 2 +- cozo-lib-python/Cargo.toml | 6 ++-- cozo-lib-swift/Cargo.toml | 4 +-- cozo-lib-swift/CozoSwiftBridge.podspec | 4 +-- cozo-lib-wasm/Cargo.toml | 4 +-- 13 files changed, 59 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index abd1853e..162c4f7b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -694,7 +694,7 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cozo" -version = "0.7.2" +version = "0.7.3" dependencies = [ "aho-corasick", "approx", @@ -755,7 +755,7 @@ dependencies = [ [[package]] name = "cozo-bin" -version = "0.7.2" +version = "0.7.3" dependencies = [ "async-stream", "axum", @@ -784,7 +784,7 @@ dependencies = [ [[package]] name = "cozo-lib-wasm" -version = "0.7.2" +version = "0.7.3" dependencies = [ "console_error_panic_hook", "cozo", @@ -795,7 +795,7 @@ dependencies = [ [[package]] name = "cozo-node" -version = "0.7.2" +version = "0.7.3" dependencies = [ "cozo", "crossbeam", @@ -807,7 +807,7 @@ dependencies = [ [[package]] name = "cozo-swift" -version = "0.7.2" +version = "0.7.3" dependencies = [ "cozo", "swift-bridge", @@ -816,7 +816,7 @@ dependencies = [ [[package]] name = "cozo_c" -version = "0.7.2" +version = "0.7.3" dependencies = [ "cbindgen", "cozo", @@ -825,7 +825,7 @@ dependencies = [ [[package]] name = "cozo_java" -version = "0.7.2" +version = "0.7.3" dependencies = [ "cozo", "jni", @@ -834,7 +834,7 @@ dependencies = [ [[package]] name = "cozo_py" -version = "0.7.2" +version = "0.7.3" dependencies = [ "cozo", "miette", @@ -919,7 +919,7 @@ dependencies = [ "autocfg", "cfg-if 1.0.0", "crossbeam-utils", - "memoffset", + "memoffset 0.8.0", "scopeguard", ] @@ -2076,6 +2076,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + [[package]] name = "memory_units" version = "0.4.0" @@ -2908,14 +2917,14 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.18.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b1ac5b3731ba34fdaa9785f8d74d17448cd18f30cf19e0c7e7b1fdb5272109" +checksum = "cffef52f74ec3b1a1baf295d9b8fcc3070327aefc39a6d00656b13c1d0b8885c" dependencies = [ "cfg-if 1.0.0", "indoc", "libc", - "memoffset", + "memoffset 0.9.0", "parking_lot 0.12.1", "pyo3-build-config", "pyo3-ffi", @@ -2925,9 +2934,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.18.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cb946f5ac61bb61a5014924910d936ebd2b23b705f7a4a3c40b05c720b079a3" +checksum = "713eccf888fb05f1a96eb78c0dbc51907fee42b3377272dc902eb38985f418d5" dependencies = [ "once_cell", "target-lexicon", @@ -2935,9 +2944,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.18.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4d7c5337821916ea2a1d21d1092e8443cf34879e53a0ac653fbb98f44ff65c" +checksum = "5b2ecbdcfb01cbbf56e179ce969a048fd7305a66d4cdf3303e0da09d69afe4c3" dependencies = [ "libc", "pyo3-build-config", @@ -2945,9 +2954,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.18.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d39c55dab3fc5a4b25bbd1ac10a2da452c4aca13bb450f22818a002e29648d" +checksum = "b78fdc0899f2ea781c463679b20cb08af9247febc8d052de941951024cd8aea0" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -2957,9 +2966,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.18.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97daff08a4c48320587b5224cc98d609e3c27b6d437315bd40b605c98eeb5918" +checksum = "60da7b84f1227c3e2fe7593505de274dcf4c8928b4e0a1c23d551a14e4e80a0f" dependencies = [ "proc-macro2", "quote", diff --git a/VERSION b/VERSION index d5cc44d1..b09a54cb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.7.2 \ No newline at end of file +0.7.3 \ No newline at end of file diff --git a/cozo-bin/Cargo.toml b/cozo-bin/Cargo.toml index 6123c001..1c5cc811 100644 --- a/cozo-bin/Cargo.toml +++ b/cozo-bin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cozo-bin" -version = "0.7.2" +version = "0.7.3" edition = "2021" license = "MPL-2.0" description = "Standalone Cozo database" @@ -42,7 +42,7 @@ storage-tikv = ["cozo/storage-tikv"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -cozo = { version = "0.7.2", path = "../cozo-core", default-features = false } +cozo = { version = "0.7.3", path = "../cozo-core", default-features = false } clap = { version = "4.0.26", features = ["derive"] } env_logger = "0.10.0" log = "0.4.17" diff --git a/cozo-core/Cargo.toml b/cozo-core/Cargo.toml index 94e31d06..d80f845e 100644 --- a/cozo-core/Cargo.toml +++ b/cozo-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cozo" -version = "0.7.2" +version = "0.7.3" edition = "2021" description = "A general-purpose, transactional, relational database that uses Datalog and focuses on graph data and algorithms" authors = ["Ziyang Hu"] diff --git a/cozo-core/src/parse/mod.rs b/cozo-core/src/parse/mod.rs index 78069c97..c55ab722 100644 --- a/cozo-core/src/parse/mod.rs +++ b/cozo-core/src/parse/mod.rs @@ -54,6 +54,12 @@ pub(crate) struct ImperativeStmtClause { pub(crate) store_as: Option>, } +#[derive(Debug)] +pub(crate) struct ImperativeSysop { + pub(crate) sysop: SysOp, + pub(crate) store_as: Option>, +} + #[derive(Debug)] pub(crate) enum ImperativeStmt { Break { @@ -70,6 +76,9 @@ pub(crate) enum ImperativeStmt { Program { prog: ImperativeStmtClause, }, + SysOp { + sysop: ImperativeSysop, + }, IgnoreErrorProgram { prog: ImperativeStmtClause, }, @@ -139,6 +148,7 @@ impl ImperativeStmt { | ImperativeStmt::Break { .. } | ImperativeStmt::Continue { .. } | ImperativeStmt::TempSwap { .. } => {} + ImperativeStmt::SysOp { .. } => {} } } } @@ -276,4 +286,3 @@ impl ExtractSpan for Pair<'_> { SourceSpan(start, end - start) } } - diff --git a/cozo-lib-c/Cargo.toml b/cozo-lib-c/Cargo.toml index 53c0e707..daa51fd8 100644 --- a/cozo-lib-c/Cargo.toml +++ b/cozo-lib-c/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cozo_c" -version = "0.7.2" +version = "0.7.3" edition = "2021" license = "MPL-2.0" homepage = "https://www.cozodb.org" @@ -38,7 +38,7 @@ io-uring = ["cozo/io-uring"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -cozo = { version = "0.7.2", path = "../cozo-core", default_features = false } +cozo = { version = "0.7.3", path = "../cozo-core", default_features = false } lazy_static = "1.4.0" [build-dependencies] diff --git a/cozo-lib-java/Cargo.toml b/cozo-lib-java/Cargo.toml index 3eb16e7a..eb878aa6 100644 --- a/cozo-lib-java/Cargo.toml +++ b/cozo-lib-java/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cozo_java" -version = "0.7.2" +version = "0.7.3" edition = "2021" license = "MPL-2.0" homepage = "https://www.cozodb.org" @@ -40,5 +40,5 @@ io-uring = ["cozo/io-uring"] [dependencies] jni = "0.21.0" # , features = ["compact"] -cozo = { version = "0.7.2", path = "../cozo-core", default_features = false, features = ["compact"] } +cozo = { version = "0.7.3", path = "../cozo-core", default_features = false, features = ["compact"] } lazy_static = "1.4.0" diff --git a/cozo-lib-nodejs/Cargo.toml b/cozo-lib-nodejs/Cargo.toml index 97f47b70..65cb0641 100644 --- a/cozo-lib-nodejs/Cargo.toml +++ b/cozo-lib-nodejs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cozo-node" -version = "0.7.2" +version = "0.7.3" description = "Cozo database for NodeJS" authors = ["Ziyang Hu"] license = "MPL-2.0" @@ -40,7 +40,7 @@ io-uring = ["cozo/io-uring"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -cozo = { version = "0.7.2", path = "../cozo-core", default-features = false } +cozo = { version = "0.7.3", path = "../cozo-core", default-features = false } lazy_static = "1.4.0" crossbeam = "0.8.2" miette = "5.5.0" diff --git a/cozo-lib-nodejs/package.json b/cozo-lib-nodejs/package.json index 4e89dccb..07ac56d7 100644 --- a/cozo-lib-nodejs/package.json +++ b/cozo-lib-nodejs/package.json @@ -1,6 +1,6 @@ { "name": "cozo-node", - "version": "0.7.2", + "version": "0.7.3", "description": "Cozo database for NodeJS", "main": "index", "types": "index.d.ts", diff --git a/cozo-lib-python/Cargo.toml b/cozo-lib-python/Cargo.toml index 3537ccda..46c6800b 100644 --- a/cozo-lib-python/Cargo.toml +++ b/cozo-lib-python/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cozo_py" -version = "0.7.2" +version = "0.7.3" edition = "2021" description = "Cozo database for python" authors = ["Ziyang Hu"] @@ -41,7 +41,7 @@ io-uring = ["cozo/io-uring"] [dependencies] -cozo = { version = "0.7.2", path = "../cozo-core", default-features = false } -pyo3 = { version = "0.18.0", features = ["extension-module", "abi3", "abi3-py37"] } +cozo = { version = "0.7.3", path = "../cozo-core", default-features = false } +pyo3 = { version = "0.19.0", features = ["extension-module", "abi3", "abi3-py37"] } miette = "5.5.0" serde_json = "1.0.96" \ No newline at end of file diff --git a/cozo-lib-swift/Cargo.toml b/cozo-lib-swift/Cargo.toml index 0c010148..4a7db3aa 100644 --- a/cozo-lib-swift/Cargo.toml +++ b/cozo-lib-swift/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cozo-swift" -version = "0.7.2" +version = "0.7.3" edition = "2021" description = "Cozo database for Swift" authors = ["Ziyang Hu"] @@ -40,5 +40,5 @@ io-uring = ["cozo/io-uring"] swift-bridge-build = "0.1.41" [dependencies] -cozo = { version = "0.7.2", path = "../cozo-core", default-features = false } +cozo = { version = "0.7.3", path = "../cozo-core", default-features = false } swift-bridge = "0.1.41" diff --git a/cozo-lib-swift/CozoSwiftBridge.podspec b/cozo-lib-swift/CozoSwiftBridge.podspec index 8dbf1f65..09bc4209 100644 --- a/cozo-lib-swift/CozoSwiftBridge.podspec +++ b/cozo-lib-swift/CozoSwiftBridge.podspec @@ -1,12 +1,12 @@ Pod::Spec.new do |spec| spec.name = "CozoSwiftBridge" - spec.version = "0.7.2" + spec.version = "0.7.3" spec.summary = "CozoDB for Swift" spec.description = "This library allows you to use CozoDB embedded in your Swift application" spec.homepage = "https://github.com/cozodb/cozo/" spec.license = "MPL-2.0" spec.author = { "Ziyang Hu" => "hu.ziyang@cantab.net" } - spec.source = { :http => "https://github.com/cozodb/cozo/releases/download/v0.7.2/CozoSwiftBridge-0.7.2.tgz" } + spec.source = { :http => "https://github.com/cozodb/cozo/releases/download/v0.7.3/CozoSwiftBridge-0.7.3.tgz" } spec.source_files = "Sources/CozoSwiftBridge/*" spec.vendored_frameworks = "RustXcframework.xcframework" spec.requires_arc = true diff --git a/cozo-lib-wasm/Cargo.toml b/cozo-lib-wasm/Cargo.toml index af1c515a..4e4dc316 100644 --- a/cozo-lib-wasm/Cargo.toml +++ b/cozo-lib-wasm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cozo-lib-wasm" -version = "0.7.2" +version = "0.7.3" edition = "2021" description = "Cozo database for WASM" authors = ["Ziyang Hu"] @@ -17,7 +17,7 @@ default = ["console_error_panic_hook"] [dependencies] wasm-bindgen = "0.2.63" -cozo = { version = "0.7.2", path = "../cozo-core", default-features = false, features = ["wasm"] } +cozo = { version = "0.7.3", path = "../cozo-core", default-features = false, features = ["wasm"] } # The `console_error_panic_hook` crate provides better debugging of panics by # logging them with `console.error`. This is great for development, but requires