Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f5974c3
Create general structure for procedural macro
skejserjensen Nov 23, 2025
b9f0baf
Format and fix connection error to Azurite
skejserjensen Jan 8, 2026
ac2b16b
Make parsing of inputs more robust
skejserjensen Jul 31, 2026
ee0e849
Finish first version of the macro
skejserjensen Jul 31, 2026
7e9cde0
Move ObjectStore creation to modelardb_test
skejserjensen Jul 31, 2026
3bd7041
Simpliy object_store_test and generate function
skejserjensen Jul 31, 2026
2b6d997
Make naming of test::table explicit
skejserjensen Jul 31, 2026
7d27d20
Simplify object_store_test by removing dependencies
skejserjensen Aug 1, 2026
01d3103
Add data_folder_test and cleanup shared code
skejserjensen Aug 1, 2026
55a1f2d
Fix clippy warnings
skejserjensen Aug 1, 2026
c106221
Update based on warnings from ast-grep
skejserjensen Aug 1, 2026
faa2118
Fix old timestamps
skejserjensen Aug 1, 2026
961b42d
Update based on comments from @Copilot
skejserjensen Aug 2, 2026
a6830b6
Remove tempfile as cargo machete say it is unused
skejserjensen Aug 2, 2026
28d7e9e
Update based on warnings from ast-grep
skejserjensen Aug 2, 2026
7d08d04
Update based on comments from @Copilot
skejserjensen Aug 2, 2026
d1d7685
Remove tempfile as cargo machete say it is unused
skejserjensen Aug 2, 2026
6ed8309
Update based on comments from @CGodiksen
skejserjensen Aug 3, 2026
1c26136
Update based on comments from @Copilot
skejserjensen Aug 3, 2026
8b63e2a
Fix clippy warnings
skejserjensen Aug 3, 2026
eb184a7
Fix cargo doc warnings
skejserjensen Aug 3, 2026
54a8a7c
Update based on comments from @chrthomsen
skejserjensen Aug 5, 2026
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
1,103 changes: 458 additions & 645 deletions Cargo.lock

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,18 @@ dirs = "6.0.0"
futures = "0.3.32"
http = "1.4.0"
http-body-util = "0.1.3"
itertools = "0.14.0"
log = "0.4.29"
modelardb_auth = { path = "crates/modelardb_auth"}
modelardb_bulkloader = { path = "crates/modelardb_bulkloader"}
modelardb_client = { path = "crates/modelardb_client"}
modelardb_compression = { path = "crates/modelardb_compression"}
modelardb_embedded = { path = "crates/modelardb_embedded"}
modelardb_macros = { path = "crates/modelardb_macros"}
modelardb_server = { path = "crates/modelardb_server"}
modelardb_storage = { path = "crates/modelardb_storage"}
modelardb_test = { path = "crates/modelardb_test"}
modelardb_types = { path = "crates/modelardb_types"}
object_store = "0.13.2"
proptest = "1.11.0"
prost = "0.14.3"
Expand Down
8 changes: 4 additions & 4 deletions crates/modelardb_bulkloader/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ datafusion.workspace = true
delta_kernel.workspace = true
deltalake.workspace = true
futures.workspace = true
modelardb_compression = { path = "../modelardb_compression" }
modelardb_embedded = { path = "../modelardb_embedded" }
modelardb_storage = { path = "../modelardb_storage" }
modelardb_types = { path = "../modelardb_types" }
modelardb_compression.workspace = true
modelardb_embedded.workspace = true
modelardb_storage.workspace = true
modelardb_types.workspace = true
sysinfo.workspace = true
tokio.workspace = true
2 changes: 1 addition & 1 deletion crates/modelardb_client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ arrow = { workspace = true, features = ["prettyprint"] }
bytes.workspace = true
clap.workspace = true
dirs.workspace = true
modelardb_auth = { path = "../modelardb_auth" }
modelardb_auth.workspace = true
rustyline.workspace = true
tokio.workspace = true
tonic.workspace = true
4 changes: 2 additions & 2 deletions crates/modelardb_compression/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ authors = ["Soeren Kejser Jensen <[email protected]>"]

[dependencies]
arrow.workspace = true
modelardb_types = { path = "../modelardb_types" }
modelardb_types.workspace = true

[dev-dependencies]
modelardb_test = { path = "../modelardb_test" }
modelardb_test.workspace = true
proptest.workspace = true
8 changes: 4 additions & 4 deletions crates/modelardb_embedded/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ async-trait.workspace = true
datafusion.workspace = true
deltalake = { workspace = true, features = ["datafusion", "s3"] }
futures.workspace = true
modelardb_auth = { path = "../modelardb_auth" }
modelardb_compression = { path = "../modelardb_compression" }
modelardb_storage = { path = "../modelardb_storage" }
modelardb_types = { path = "../modelardb_types" }
modelardb_auth.workspace = true
modelardb_compression.workspace = true
modelardb_storage.workspace = true
modelardb_types.workspace = true
tokio.workspace = true
tonic.workspace = true

Expand Down
1 change: 1 addition & 0 deletions crates/modelardb_embedded/src/capi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ unsafe fn open_azure(
account_name.to_owned(),
access_key.to_owned(),
container_name.to_owned(),
false,
))?;
let data_sink = Arc::new(DataFolderDataSink::new());
TOKIO_RUNTIME.block_on(data_folder.register_tables(data_sink))?;
Expand Down
26 changes: 26 additions & 0 deletions crates/modelardb_macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# 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.

[package]
name = "modelardb_macros"
version = "0.1.0"
license = "Apache-2.0"
edition = "2024"
authors = ["Soeren Kejser Jensen <[email protected]>"]

[lib]
proc-macro = true

[dependencies]
itertools.workspace = true
47 changes: 47 additions & 0 deletions crates/modelardb_macros/src/error.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/* 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.
*/

//! The [`Error`] and [`Result`] types used throughout `modelardb_macros`.

use std::error::Error;
use std::fmt::{Display, Formatter};
use std::result::Result as StdResult;

/// Result type used throughout `modelardb_macros`.
pub type Result<T> = StdResult<T, ModelarDbMacrosError>;

/// Error type used throughout `modelardb_macros`.
#[derive(Debug)]
pub enum ModelarDbMacrosError {
/// Error returned when parsing fails.
Parse(String),
}

impl Display for ModelarDbMacrosError {
fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
match self {
Self::Parse(reason) => write!(f, "Parse Error: {reason}"),
}
}
}

impl Error for ModelarDbMacrosError {
fn source(&self) -> Option<&(dyn Error + 'static)> {
// Return the error that caused self to occur if one exists.
match self {
Self::Parse(_reason) => None,
}
}
}
Loading
Loading