Skip to content
This repository was archived by the owner on Oct 18, 2023. It is now read-only.

Commit 324d394

Browse files
committed
rename sqld to libsql-server
1 parent afe638a commit 324d394

File tree

104 files changed

+368
-271
lines changed

Some content is hidden

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

104 files changed

+368
-271
lines changed

Cargo.lock

+90-90
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
members = [
44
"bottomless",
55
"bottomless-cli",
6-
"sqld",
7-
"sqld-libsql-bindings",
6+
"libsql-server",
7+
"libsql-bindings",
88
"testing/end-to-end",
99
]
1010

Dockerfile

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# build sqld
1+
# build libsql-server
22
FROM rust:slim-bullseye AS chef
33
RUN apt update \
44
&& apt install -y libclang-dev clang \
@@ -23,18 +23,18 @@ FROM chef AS builder
2323
COPY --from=planner /recipe.json recipe.json
2424
RUN cargo chef cook --release --recipe-path recipe.json
2525
COPY . .
26-
RUN cargo build -p sqld --release
26+
RUN cargo build -p libsql-server --release
2727

2828
# runtime
2929
FROM debian:bullseye-slim
30-
COPY --from=builder /target/release/sqld /bin/sqld
31-
RUN groupadd --system --gid 666 sqld
32-
RUN adduser --system --home /var/lib/sqld --uid 666 --gid 666 sqld
30+
COPY --from=builder /target/release/libsql-server /bin/libsql-server
31+
RUN groupadd --system --gid 666 libsql-server
32+
RUN adduser --system --home /var/lib/libsql-server --uid 666 --gid 666 libsql-server
3333
RUN apt-get update && apt-get install -y ca-certificates
3434
COPY docker-entrypoint.sh /usr/local/bin
3535
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
36-
VOLUME [ "/var/lib/sqld" ]
37-
WORKDIR /var/lib/sqld
38-
USER sqld
36+
VOLUME [ "/var/lib/libsql-server" ]
37+
WORKDIR /var/lib/libsql-server
38+
USER libsql-server
3939
EXPOSE 5001 8080
40-
CMD ["/bin/sqld"]
40+
CMD ["/bin/libsql-server"]

Dockerfile.dev

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# build sqld
1+
# build libsql-server
22
FROM rust:slim-bullseye as builder
33
RUN apt update
44

@@ -9,31 +9,31 @@ RUN apt install -y libclang-dev clang \
99
RUN apt clean
1010
RUN update-ca-certificates
1111

12-
WORKDIR /sqld
12+
WORKDIR /libsql-server
1313
COPY . .
1414
RUN --mount=type=cache,target=/usr/local/cargo/registry \
1515
--mount=type=cache,target=/usr/local/cargo/git \
16-
--mount=type=cache,target=/sqld/target \
17-
cargo build -p sqld --release && \
18-
cp target/release/sqld /sqld/bin
16+
--mount=type=cache,target=/libsql-server/target \
17+
cargo build -p libsql-server --release && \
18+
cp target/release/libsql-server /libsql-server/bin
1919

2020

2121
# runtime
2222
FROM debian:bullseye-slim
2323
RUN apt update
2424

25-
COPY --from=builder /sqld/bin /bin/sqld
25+
COPY --from=builder /libsql-server/bin /bin/libsql-server
2626
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
2727
COPY docker-entrypoint.sh /usr/local/bin
2828

29-
VOLUME [ "/var/lib/sqld" ]
29+
VOLUME [ "/var/lib/libsql-server" ]
3030

31-
RUN groupadd --system --gid 666 sqld
32-
RUN adduser --system --home /var/lib/sqld --uid 666 --gid 666 sqld
33-
USER sqld
34-
WORKDIR /var/lib/sqld
31+
RUN groupadd --system --gid 666 libsql-server
32+
RUN adduser --system --home /var/lib/libsql-server --uid 666 --gid 666 libsql-server
33+
USER libsql-server
34+
WORKDIR /var/lib/libsql-server
3535

3636
EXPOSE 5001 8080
3737

3838
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
39-
CMD ["/bin/sqld"]
39+
CMD ["/bin/libsql-server"]

LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright 2023 the sqld authors
3+
Copyright 2023 the libsql-server authors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

README.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# `sqld` - a server mode for libSQL
1+
# `Libsql-server` - a server mode for libSQL
22

3-
The `sqld` ("SQL daemon") project is a server mode for
3+
The `libsql-server` project is a server mode for
44
[libSQL](https://github.com/libsql/libsql/).
55

66
Embedded SQL databases such as libSQL and SQLite are great for a lot of use
77
cases, but sometimes you really do want to consume your database as a server.
88
For example, with apps running on serverless infrastructure, fitting a database
99
engine might be difficult given the limited size of the hardware. And even when
10-
it's _possible_, it might be really inconvenient. We created `sqld` for this use
10+
it's _possible_, it might be really inconvenient. We created `libsql-server` for this use
1111
case.
1212

1313
## Features
@@ -21,12 +21,12 @@ case.
2121

2222
## Build and run
2323

24-
Follow the [instructions](./docs/BUILD-RUN.md) to build and run `sqld`
24+
Follow the [instructions](./docs/BUILD-RUN.md) to build and run `libsql-server`
2525
using Homebrew, Docker, or your own Rust toolchain.
2626

2727
## Client libraries
2828

29-
The following client libraries enable your app to query `sqld` programmatically:
29+
The following client libraries enable your app to query `libsql-server` programmatically:
3030

3131
* [TypeScript and JavaScript](https://github.com/libsql/libsql-client-ts)
3232
* [Rust](https://github.com/libsql/libsql-client-rs)
@@ -60,16 +60,16 @@ extension directory
6060

6161
## Integration with S3 bottomless replication
6262

63-
`sqld` is integrated with [bottomless replication subproject]. With bottomless
63+
`libsql-server` is integrated with [bottomless replication subproject]. With bottomless
6464
replication, the database state is continuously backed up to S3-compatible
6565
storage. Each backup session is called a "generation" and consists of the main
6666
database file snapshot and replicates [SQLite WAL] pages.
6767

68-
In order to enable automatic replication to S3 storage, compile `sqld` with `-F bottomless` flag
69-
and run `sqld` with `--enable-bottomless-replication` parameter:
68+
In order to enable automatic replication to S3 storage, compile `libsql-server` with `-F bottomless` flag
69+
and run `libsql-server` with `--enable-bottomless-replication` parameter:
7070

7171
```bash
72-
sqld --http-listen-addr=127.0.0.1:8000 --enable-bottomless-replication
72+
libsql-server --http-listen-addr=127.0.0.1:8000 --enable-bottomless-replication
7373
```
7474

7575
[bottomless replication subproject]: ./bottomless
@@ -110,4 +110,4 @@ This project is licensed under the MIT license.
110110

111111
### Contribution
112112

113-
Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in `sqld` by you, shall be licensed as MIT, without any additional terms or conditions.
113+
Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in `libsql-server` by you, shall be licensed as MIT, without any additional terms or conditions.

bottomless/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ aws-sdk-s3 = { version = "0.28" }
1616
bytes = "1"
1717
crc = "3.0.0"
1818
futures = { version = "0.3.25" }
19-
sqld-libsql-bindings = { version = "0", path = "../sqld-libsql-bindings" }
19+
libsql-bindings = { version = "0", path = "../libsql-bindings" }
2020
tokio = { version = "1.22.2", features = ["rt-multi-thread", "net", "io-std", "io-util", "time", "macros", "sync", "fs"] }
2121
tokio-util = "0.7"
2222
tracing = "0.1.37"

bottomless/src/ffi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub use sqld_libsql_bindings::ffi::{
1+
pub use libsql_bindings::ffi::{
22
libsql_wal_methods, sqlite3, sqlite3_file, sqlite3_vfs, PageHdrIter, PgHdr, Wal, WalIndexHdr,
33
SQLITE_CANTOPEN, SQLITE_CHECKPOINT_TRUNCATE, SQLITE_IOERR_WRITE, SQLITE_OK,
44
};

0 commit comments

Comments
 (0)