Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .github/workflows/build-lint-test-and-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,6 @@ jobs:
sleep 5 # Ensure azurite has fully finished creating the endpoint.
az storage container create -n modelardb --connection-string 'DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;'

# Setup Protobuf Compiler.
- name: Install Protoc
uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

# Update Rust.
- name: Rustup Update
run: rustup update
Expand Down Expand Up @@ -150,12 +144,6 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

# Setup Protobuf Compiler.
- name: Install Protoc
uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

# Update Rust.
- name: Rustup Update
run: rustup update
Expand Down
144 changes: 142 additions & 2 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ object_store = "0.13.2"
proptest = "1.11.0"
prost = "0.14.3"
prost-build = "0.14.3"
protox = "0.9.1"
rand = "0.10.1"
rustyline = "18.0.0"
serde = { version = "1.0.228", features = ["derive"] }
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ WORKDIR /usr/src/app

COPY . .

RUN apt-get update && apt-get install -y protobuf-compiler

RUN cargo build --profile $BUILD_PROFILE

CMD ["target/release/modelardbd", "edge", "data"]
2 changes: 1 addition & 1 deletion crates/modelardb_embedded/bindings/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def build_extension(self, ext):

:param ext: Information about the extension setuptools expects.
"""
dependencies = ["cargo", "rustc", "protoc"]
dependencies = ["cargo", "rustc"]
for dependency in dependencies:
if not shutil.which(dependency):
raise FileNotFoundError(
Expand Down
3 changes: 2 additions & 1 deletion crates/modelardb_types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ prost.workspace = true

[build-dependencies]
prost-build.workspace = true
protox.workspace = true

[dev-dependencies]
modelardb_test = { path = "../modelardb_test" }
proptest.workspace = true

[package.metadata.cargo-machete]
ignored = ["prost-build"]
ignored = ["prost-build", "protox"]
27 changes: 23 additions & 4 deletions crates/modelardb_types/build.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,28 @@
use std::io::Result as StdIoResult;
/* Copyright 2026 The ModelarDB Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

fn main() -> StdIoResult<()> {
// Tell Cargo to rerun the build script if the proto definition changes.
use std::error::Error;

fn main() -> Result<(), Box<dyn Error>> {
// Rerun the build script if the proto definition changes.
println!("cargo::rerun-if-changed=src/flight/protocol.proto");
Comment thread
CGodiksen marked this conversation as resolved.

prost_build::compile_protos(&["src/flight/protocol.proto"], &["src/"])?;
// Compile with the pure Rust protox compiler instead of protoc, then let prost-build generate
// Rust from the resulting FileDescriptorSet.
let file_descriptors = protox::compile(["src/flight/protocol.proto"], ["src/"])?;
prost_build::compile_fds(file_descriptors)?;

Ok(())
}
9 changes: 4 additions & 5 deletions docs/user/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,15 @@ The following commands are for Ubuntu Server. However, equivalent commands shoul

### All
2. Install the latest stable [Rust Toolchain](https://rustup.rs/).
3. Install the [Protocol Buffer Compiler](https://protobuf.dev/installation/).
4. Clone the repository: `git clone https://github.com/ModelarData/ModelarDB-RS`
5. Build, test, and run the system using Cargo:
3. Clone the repository: `git clone https://github.com/ModelarData/ModelarDB-RS`
4. Build, test, and run the system using Cargo:
- Debug Build: `cargo build`
- Release Build: `cargo build --release`
- Run Tests: `cargo test`
- Run DBMS Server: `cargo run --bin modelardbd edge path_to_local_data_folder`
- Run Client: `cargo run --bin modelardb [options] [query_file]`
6. Move `modelardbd`, `modelardb`, and `modelardbb` from the `target` directory to any directory.
7. Install and test the Python bindings for `modelardb_embedded` using Python:
5. Move `modelardbd`, `modelardb`, and `modelardbb` from the `target` directory to any directory.
6. Install and test the Python bindings for `modelardb_embedded` using Python:
- Install: `python3 -m pip install .`
- Run Tests: `python3 -m unittest`

Expand Down
Loading