make sqld compile

Author: MarinPostma

libsql-server/.dockerignore renamed to .dockerignore

@@ -6,6 +6,13 @@ members = [
   "bindings/wasm",
   "libsql-sys",
   "libsql-shell",
+  "libsql-server",
+  "bottomless",
+  "bottomless-cli",
+  "libsql-sys-tmp",
+
+  "vendored/rusqlite",
+  "vendored/rusqlite/libsqlite3-sys",
 ]
 
 [profile.release]
@@ -14,3 +21,33 @@ panic = "abort"
 
 [patch.crates-io]
 sqlite3-parser = { git = "https://github.com/LucioFranco/lemon-rs" }
+
+[workspace.dependencies]
+rusqlite = { path = "vendored/rusqlite", version = "0.29", default-features = false, features = [
+    "libsql-experimental",
+    "column_decltype",
+    "load_extension",
+    "modern_sqlite"
+] }
+
+# Config for 'cargo dist'
+[workspace.metadata.dist]
+# The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
+cargo-dist-version = "0.2.0-prerelease.6"
+# CI backends to support (see 'cargo dist generate-ci')
+ci = ["github"]
+# The installers to generate for each app
+installers = ["shell", "homebrew"]
+# A GitHub repo to push Homebrew formulas to
+tap = "libsql/homebrew-sqld"
+# Target platforms to build apps for (Rust target-triple syntax)
+targets = ["x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "aarch64-apple-darwin"]
+# Publish jobs to run in CI
+publish-jobs = ["homebrew"]
+# Whether cargo-dist should create a Github Release or use an existing draft
+create-release = false
+
+# The profile that 'cargo dist' will build with
+[profile.dist]
+inherits = "release"
+lto = "thin"

Cargo.lock

@@ -0,0 +1,45 @@
+[workspace]
+
+resolver = "2"
+members = [
+    "bottomless",
+    "bottomless-cli",
+    "sqld",
+    "sqld-libsql-bindings",
+]
+
+[workspace.dependencies]
+rusqlite = { version = "0.29.0", git = "https://github.com/tursodatabase/rusqlite.git", rev = "a72d529", default-features = false, features = [
+    "buildtime_bindgen",
+    "bundled-libsql-experimental",
+    "column_decltype",
+    "load_extension",
+    "modern_sqlite"
+] }
+
+# Config for 'cargo dist'
+[workspace.metadata.dist]
+# The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
+cargo-dist-version = "0.2.0-prerelease.6"
+# CI backends to support (see 'cargo dist generate-ci')
+ci = ["github"]
+# The installers to generate for each app
+installers = ["shell", "homebrew"]
+# A GitHub repo to push Homebrew formulas to
+tap = "libsql/homebrew-sqld"
+# Target platforms to build apps for (Rust target-triple syntax)
+targets = ["x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "aarch64-apple-darwin"]
+# Publish jobs to run in CI
+publish-jobs = ["homebrew"]
+# Whether cargo-dist should create a Github Release or use an existing draft
+create-release = false
+
+[patch.crates-io]
+sqlite3-parser = { git = "https://github.com/LucioFranco/lemon-rs" }
+
+# The profile that 'cargo dist' will build with
+[profile.dist]
+inherits = "release"
+lto = "thin"
+
+

Cargo.toml

@@ -16,7 +16,7 @@ aws-sdk-s3 = { version = "0.28" }
 bytes = "1"
 crc = "3.0.0"
 futures = { version = "0.3.25" }
-sqld-libsql-bindings = { version = "0", path = "../sqld-libsql-bindings" }
+sqld-libsql-bindings = { version = "0", path = "../libsql-sys-tmp" }
 tokio = { version = "1.22.2", features = ["rt-multi-thread", "net", "io-std", "io-util", "time", "macros", "sync", "fs"] }
 tokio-util = "0.7"
 tracing = "0.1.37"

libsql-server/Dockerfile renamed to Dockerfile

@@ -0,0 +1 @@
+0.21.9

libsql-server/Dockerfile.dev renamed to Dockerfile.dev

@@ -0,0 +1 @@
+{"rows_written":0,"rows_read":0,"storage_bytes_used":8192,"write_requests_delegated":0,"current_frame_no":0}

libsql-server/LICENSE.md renamed to LICENSE.md

@@ -1,45 +1,104 @@
-[workspace]
+[package]
+name = "sqld"
+version = "0.21.9"
+edition = "2021"
+default-run = "sqld"
 
-resolver = "2"
-members = [
-    "bottomless",
-    "bottomless-cli",
-    "sqld",
-    "sqld-libsql-bindings",
-]
+[dependencies]
+anyhow = "1.0.66"
+async-lock = "2.6.0"
+async-trait = "0.1.58"
+axum = { version = "0.6.18", features = ["headers"] }
+axum-extra = "0.7"
+base64 = "0.21.0"
+bincode = "1.3.3"
+bottomless = { version = "0", path = "../bottomless", features = ["libsql_linked_statically"] }
+bytemuck = { version = "1.13.0", features = ["derive"] }
+bytes = { version = "1.2.1", features = ["serde"] }
+bytesize = { version = "1.2.0", features = ["serde"] }
+clap = { version = "4.0.23", features = [ "derive", "env", "string" ] }
+# console-subscriber = { version = "0.1.10", optional = true }
+console-subscriber = { git = "https://github.com/tokio-rs/console.git", rev = "5a80b98", optional = true }
+crc = "3.0.0"
+crossbeam = "0.8.2"
+enclose = "1.1"
+fallible-iterator = "0.3.0"
+futures = "0.3.25"
+futures-core = "0.3"
+hmac = "0.12"
+hyper = { version = "0.14.23", features = ["http2"] }
+hyper-tungstenite = "0.10"
+itertools = "0.10.5"
+jsonwebtoken = "8.2.0"
+memmap = "0.7.0"
+mimalloc = { version = "0.1.36", default-features = false }
+nix = { version = "0.26.2", features = ["fs"] }
+once_cell = "1.17.0"
+parking_lot = "0.12.1"
+pin-project-lite = "0.2.13"
+priority-queue = "1.3"
+prost = "0.12"
+rand = "0.8"
+regex = "1.7.0"
+reqwest = { version = "0.11.16", features = ["json", "rustls-tls"], default-features = false }
+rusqlite = { workspace = true }
+semver = "1.0.18"
+serde = { version = "1.0.149", features = ["derive", "rc"] }
+serde_json = { version = "1.0.91", features = ["preserve_order"] }
+sha2 = "0.10"
+sha256 = "1.1.3"
+sqld-libsql-bindings = { version = "0", path = "../libsql-sys-tmp" }
+sqlite3-parser = { version = "0.11.0", default-features = false, features = [ "YYNOERRORRECOVERY" ] }
+tempfile = "3.3.0"
+thiserror = "1.0.38"
+tokio = { version = "1.22.2", features = ["rt-multi-thread", "net", "io-std", "io-util", "time", "macros", "sync", "fs", "signal"] }
+tokio-stream = "0.1.11"
+tokio-tungstenite = "0.19"
+tokio-util = { version = "0.7.8", features = ["io", "io-util"] }
+tonic = { version = "0.10.0", features = ["tls"] }
+tonic-web = "0.10"
+tower = { version = "0.4.13", features = ["make"] }
+tower-http = { version = "0.3.5", features = ["compression-full", "cors", "trace"] }
+tracing = "0.1.37"
+tracing-panic = "0.1"
+tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
+url = { version = "2.3", features = ["serde"] }
+uuid = { version = "1.3", features = ["v4", "serde"] }
+chrono = { version = "0.4.26", features = ["serde"] }
+# hyper-rustls = "0.24.1"
+hyper-rustls = { git = "https://github.com/rustls/hyper-rustls.git", rev = "163b3f5" }
+rustls-pemfile = "1.0.3"
+rustls = "0.21.7"
+async-stream = "0.3.5"
+libsql = { git = "https://github.com/tursodatabase/libsql", rev = "8847ca05c", optional = true }
+metrics = "0.21.1"
+metrics-exporter-prometheus = "0.12.1"
 
-[workspace.dependencies]
-rusqlite = { version = "0.29.0", git = "https://github.com/tursodatabase/rusqlite.git", rev = "a72d529", default-features = false, features = [
-    "buildtime_bindgen",
-    "bundled-libsql-experimental",
-    "column_decltype",
-    "load_extension",
-    "modern_sqlite"
-] }
+[dev-dependencies]
+proptest = "1.0.0"
+rand = "0.8.5"
+tempfile = "3.3.0"
+insta = { version = "1.26.0", features = ["json"] }
+arbitrary = { version = "1.3.0", features = ["derive_arbitrary"] }
+libsql-client = { version = "0.6.5", default-features = false, features = ["reqwest_backend"] }
+url = "2.3"
+env_logger = "0.10"
+aws-config = "0.55"
+aws-sdk-s3 = "0.28"
+turmoil = "0.5.6"
+hyper = { version = "0.14", features = ["client"] }
 
-# Config for 'cargo dist'
-[workspace.metadata.dist]
-# The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
-cargo-dist-version = "0.2.0-prerelease.6"
-# CI backends to support (see 'cargo dist generate-ci')
-ci = ["github"]
-# The installers to generate for each app
-installers = ["shell", "homebrew"]
-# A GitHub repo to push Homebrew formulas to
-tap = "libsql/homebrew-sqld"
-# Target platforms to build apps for (Rust target-triple syntax)
-targets = ["x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "aarch64-apple-darwin"]
-# Publish jobs to run in CI
-publish-jobs = ["homebrew"]
-# Whether cargo-dist should create a Github Release or use an existing draft
-create-release = false
+[build-dependencies]
+prost-build = "0.12.0"
+protobuf-src = "1.1.0"
+tonic-build = "0.10"
+vergen = { version = "8", features = ["build", "git", "gitcl"] }
 
-[patch.crates-io]
-sqlite3-parser = { git = "https://github.com/LucioFranco/lemon-rs" }
-
-# The profile that 'cargo dist' will build with
-[profile.dist]
-inherits = "release"
-lto = "thin"
+[features]
+default = ["wasm-udfs"]
+unix-excl-vfs = ["sqld-libsql-bindings/unix-excl-vfs"]
+debug-tools = ["console-subscriber", "rusqlite/trace", "tokio/tracing"]
+sim-tests = ["libsql"]
+wasm-udfs = ["rusqlite/libsql-wasm-experimental"]
 
 

libsql-server/.github/release-drafter.yml renamed to _libsql-server/.github/release-drafter.yml

@@ -13,7 +13,7 @@ anyhow = "1.0.69"
 base64 = "0.21.0"
 clap = { version = "4.1.8", features = [ "derive", "env"] }
 home = "0.5.4"
-rusqlite = "0.28.0"
+rusqlite = { workspace = true }
 rustyline = "11.0.0"
 rustyline-derive = "0.9.0"
 tabled = "0.12.2"

libsql-server/.github/workflows/pr-images.yml renamed to _libsql-server/.github/workflows/pr-images.yml

@@ -29,8 +29,8 @@ maintenance = { status = "actively-developed" }
 [lib]
 name = "rusqlite"
 
-[workspace]
-members = ["libsqlite3-sys"]
+# [workspace]
+# members = ["libsqlite3-sys"]
 
 [features]
 load_extension = []