This is an automated email from the ASF dual-hosted git repository.
liurenjie1024 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg-rust.git
The following commit(s) were added to refs/heads/main by this push:
new 833739ea refactor: Migrate from tera to minijinja (#1798)
833739ea is described below
commit 833739eacf094fed8e33849ab68df0a0937e16da
Author: Xuanwo <[email protected]>
AuthorDate: Thu Oct 30 22:53:18 2025 +0800
refactor: Migrate from tera to minijinja (#1798)
## Which issue does this PR close?
- Closes https://github.com/apache/iceberg-rust/issues/1772
## What changes are included in this PR?
Migrate from tera to minijinja for smaller deps and well-maintain crate.
## Are these changes tested?
---
**This PR was primarily authored with Codex using GPT-5-Codex and then
hand-reviewed by me. I AM responsible for every change made in this PR.
I aimed to keep it aligned with our goals, though I may have missed
minor issues. Please flag anything that feels off, I'll fix it
quickly.**
---------
Signed-off-by: Xuanwo <[email protected]>
Co-authored-by: Renjie Liu <[email protected]>
---
Cargo.lock | 336 ++++------------------------------
Cargo.toml | 2 +-
crates/iceberg/Cargo.toml | 2 +-
crates/iceberg/src/io/object_cache.rs | 22 ++-
crates/iceberg/src/scan/mod.rs | 44 +++--
5 files changed, 75 insertions(+), 331 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index cd187182..1cacc75f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -47,9 +47,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
dependencies = [
"memchr",
]
@@ -242,7 +242,7 @@ dependencies = [
"arrow-data",
"arrow-schema",
"chrono",
- "chrono-tz 0.10.4",
+ "chrono-tz",
"half",
"hashbrown 0.16.0",
"num",
@@ -1242,16 +1242,6 @@ dependencies = [
"alloc-stdlib",
]
-[[package]]
-name = "bstr"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
-dependencies = [
- "memchr",
- "serde",
-]
-
[[package]]
name = "bumpalo"
version = "3.19.0"
@@ -1395,17 +1385,6 @@ dependencies = [
"windows-link",
]
-[[package]]
-name = "chrono-tz"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb"
-dependencies = [
- "chrono",
- "chrono-tz-build",
- "phf 0.11.3",
-]
-
[[package]]
name = "chrono-tz"
version = "0.10.4"
@@ -1413,18 +1392,7 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "a6139a8597ed92cf816dfb33f5dd6cf0bb93a6adc938f11039f371bc5bcd26c3"
dependencies = [
"chrono",
- "phf 0.12.1",
-]
-
-[[package]]
-name = "chrono-tz-build"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1"
-dependencies = [
- "parse-zoneinfo",
- "phf 0.11.3",
- "phf_codegen",
+ "phf",
]
[[package]]
@@ -1663,16 +1631,6 @@ dependencies = [
"crossbeam-utils",
]
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
[[package]]
name = "crossbeam-epoch"
version = "0.9.18"
@@ -2648,12 +2606,6 @@ dependencies = [
"syn 2.0.108",
]
-[[package]]
-name = "deunicode"
-version = "1.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "abd57806937c9cc163efc8ea3910e00a62e2aeb0b8119f1793a978088f8f6b04"
-
[[package]]
name = "diff"
version = "0.1.13"
@@ -3172,30 +3124,6 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
-[[package]]
-name = "globset"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3"
-dependencies = [
- "aho-corasick",
- "bstr",
- "log",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "globwalk"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757"
-dependencies = [
- "bitflags",
- "ignore",
- "walkdir",
-]
-
[[package]]
name = "gloo-timers"
version = "0.3.0"
@@ -3428,15 +3356,6 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-[[package]]
-name = "humansize"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7"
-dependencies = [
- "libm",
-]
-
[[package]]
name = "humantime"
version = "2.3.0"
@@ -3601,6 +3520,7 @@ dependencies = [
"futures",
"iceberg_test_utils",
"itertools 0.13.0",
+ "minijinja",
"mockall",
"moka",
"murmur3",
@@ -3625,7 +3545,6 @@ dependencies = [
"smol",
"strum 0.27.2",
"tempfile",
- "tera",
"thrift",
"tokio",
"typed-builder",
@@ -3849,9 +3768,9 @@ dependencies = [
[[package]]
name = "icu_collections"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f578a71f2bfaf7ceb30b519a645ae48024b45f9eecbe060a31a004d7b4ba9462"
+checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
dependencies = [
"displaydoc",
"potential_utf",
@@ -3862,9 +3781,9 @@ dependencies = [
[[package]]
name = "icu_locale_core"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4c219b62bf5a06801012446193fdfcbd7970e876823aba4c62def2ce957dcb44"
+checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
dependencies = [
"displaydoc",
"litemap",
@@ -3875,9 +3794,9 @@ dependencies = [
[[package]]
name = "icu_normalizer"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "33747cecc725eebb47ac503fab725e395d50cb7889ae490a1359f130611d4cc5"
+checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
dependencies = [
"icu_collections",
"icu_normalizer_data",
@@ -3889,15 +3808,15 @@ dependencies = [
[[package]]
name = "icu_normalizer_data"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d6ce2d23e1b3c45624ba6a23e2c767e01c9680e0c0800b39c7abfff9565175d8"
+checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
[[package]]
name = "icu_properties"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6d70f9b6574c79f7a83ea5ce72cc88d271a3e77355c5f7748a107e751d8617fb"
+checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
dependencies = [
"icu_collections",
"icu_locale_core",
@@ -3909,15 +3828,15 @@ dependencies = [
[[package]]
name = "icu_properties_data"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "17fa55bf868e28e638ed132bcee1e5c21ba2c1e52c15e7c78b781858e7b54342"
+checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
[[package]]
name = "icu_provider"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f64958e359123591ae1f17a27b5fc9ebdb50c98b04e0401146154de1d8fe3e44"
+checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
dependencies = [
"displaydoc",
"icu_locale_core",
@@ -3955,22 +3874,6 @@ dependencies = [
"icu_properties",
]
-[[package]]
-name = "ignore"
-version = "0.4.24"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "81776e6f9464432afcc28d03e52eb101c93b6f0566f52aef2427663e700f0403"
-dependencies = [
- "crossbeam-deque",
- "globset",
- "log",
- "memchr",
- "regex-automata",
- "same-file",
- "walkdir",
- "winapi-util",
-]
-
[[package]]
name = "indexmap"
version = "1.9.3"
@@ -4025,9 +3928,9 @@ checksum =
"8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"
[[package]]
name = "integer-encoding"
-version = "4.0.2"
+version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0d762194228a2f1c11063e46e32e5acb96e66e906382b9eb5441f2e0504bbd5a"
+checksum = "14c00403deb17c3221a1fe4fb571b9ed0370b3dcd116553c77fa294a3d918699"
dependencies = [
"async-trait",
"tokio",
@@ -4402,6 +4305,15 @@ dependencies = [
"libmimalloc-sys",
]
+[[package]]
+name = "minijinja"
+version = "2.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "a9f264d75233323f4b7d2f03aefe8a990690cdebfbfe26ea86bcbaec5e9ac990"
+dependencies = [
+ "serde",
+]
+
[[package]]
name = "minimal-lexical"
version = "0.2.1"
@@ -4950,15 +4862,6 @@ dependencies = [
"zstd",
]
-[[package]]
-name = "parse-zoneinfo"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24"
-dependencies = [
- "regex",
-]
-
[[package]]
name = "paste"
version = "1.0.15"
@@ -5037,49 +4940,6 @@ version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
-[[package]]
-name = "pest"
-version = "2.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "989e7521a040efde50c3ab6bbadafbe15ab6dc042686926be59ac35d74607df4"
-dependencies = [
- "memchr",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "187da9a3030dbafabbbfb20cb323b976dc7b7ce91fcd84f2f74d6e31d378e2de"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "49b401d98f5757ebe97a26085998d6c0eecec4995cad6ab7fc30ffdf4b052843"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn 2.0.108",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "72f27a2cfee9f9039c4d86faa5af122a0ac3851441a34865b8a043b46be0065a"
-dependencies = [
- "pest",
- "sha2",
-]
-
[[package]]
name = "petgraph"
version = "0.7.1"
@@ -5102,51 +4962,13 @@ dependencies = [
"serde",
]
-[[package]]
-name = "phf"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
-dependencies = [
- "phf_shared 0.11.3",
-]
-
[[package]]
name = "phf"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7"
dependencies = [
- "phf_shared 0.12.1",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
-dependencies = [
- "phf_generator",
- "phf_shared 0.11.3",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
-dependencies = [
- "phf_shared 0.11.3",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
-dependencies = [
- "siphasher",
+ "phf_shared",
]
[[package]]
@@ -5169,7 +4991,7 @@ dependencies = [
"async-recursion",
"bytes",
"faststr",
- "integer-encoding 4.0.2",
+ "integer-encoding 4.1.0",
"lazy_static",
"linkedbytes",
"ordered-float 4.6.0",
@@ -6081,7 +5903,7 @@ dependencies = [
"once_cell",
"ring",
"rustls-pki-types",
- "rustls-webpki 0.103.7",
+ "rustls-webpki 0.103.8",
"subtle",
"zeroize",
]
@@ -6150,9 +5972,9 @@ dependencies = [
[[package]]
name = "rustls-webpki"
-version = "0.103.7"
+version = "0.103.8"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf"
+checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
dependencies = [
"aws-lc-rs",
"ring",
@@ -6604,16 +6426,6 @@ version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
-[[package]]
-name = "slug"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "882a80f72ee45de3cc9a5afeb2da0331d58df69e4e7d8eeb5d3c7784ae67e724"
-dependencies = [
- "deunicode",
- "wasm-bindgen",
-]
-
[[package]]
name = "smallvec"
version = "1.15.1"
@@ -7141,28 +6953,6 @@ dependencies = [
"windows-sys 0.61.2",
]
-[[package]]
-name = "tera"
-version = "1.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ab9d851b45e865f178319da0abdbfe6acbc4328759ff18dafc3a41c16b4cd2ee"
-dependencies = [
- "chrono",
- "chrono-tz 0.9.0",
- "globwalk",
- "humansize",
- "lazy_static",
- "percent-encoding",
- "pest",
- "pest_derive",
- "rand 0.8.5",
- "regex",
- "serde",
- "serde_json",
- "slug",
- "unic-segment",
-]
-
[[package]]
name = "termtree"
version = "0.5.1"
@@ -7636,62 +7426,6 @@ dependencies = [
"typify-impl",
]
-[[package]]
-name = "ucd-trie"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
-
-[[package]]
-name = "unic-char-property"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221"
-dependencies = [
- "unic-char-range",
-]
-
-[[package]]
-name = "unic-char-range"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc"
-
-[[package]]
-name = "unic-common"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc"
-
-[[package]]
-name = "unic-segment"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e4ed5d26be57f84f176157270c112ef57b86debac9cd21daaabbe56db0f88f23"
-dependencies = [
- "unic-ucd-segment",
-]
-
-[[package]]
-name = "unic-ucd-segment"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2079c122a62205b421f499da10f3ee0f7697f012f55b675e002483c73ea34700"
-dependencies = [
- "unic-char-property",
- "unic-char-range",
- "unic-ucd-version",
-]
-
-[[package]]
-name = "unic-ucd-version"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4"
-dependencies = [
- "unic-common",
-]
-
[[package]]
name = "unicode-bidi"
version = "0.3.18"
diff --git a/Cargo.toml b/Cargo.toml
index 6f4385cf..5161810b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -91,6 +91,7 @@ linkedbytes = "0.1.8"
log = "0.4.28"
metainfo = "0.7.14"
mimalloc = "0.1.46"
+minijinja = "2.12.0"
mockall = "0.13.1"
mockito = "1"
motore-macros = "0.4.3"
@@ -120,7 +121,6 @@ sqlx = { version = "0.8.1", default-features = false }
stacker = "0.1.20"
strum = "0.27.2"
tempfile = "3.18"
-tera = "1"
thrift = "0.17.0"
tokio = { version = "1.47", default-features = false }
toml = "0.8"
diff --git a/crates/iceberg/Cargo.toml b/crates/iceberg/Cargo.toml
index b831607a..c9b1bb31 100644
--- a/crates/iceberg/Cargo.toml
+++ b/crates/iceberg/Cargo.toml
@@ -102,7 +102,7 @@ pretty_assertions = { workspace = true }
rand = { workspace = true }
regex = { workspace = true }
tempfile = { workspace = true }
-tera = { workspace = true }
+minijinja = { workspace = true }
[package.metadata.cargo-machete]
# These dependencies are added to ensure minimal dependency version
diff --git a/crates/iceberg/src/io/object_cache.rs
b/crates/iceberg/src/io/object_cache.rs
index cb9f03fa..af297beb 100644
--- a/crates/iceberg/src/io/object_cache.rs
+++ b/crates/iceberg/src/io/object_cache.rs
@@ -185,8 +185,9 @@ impl ObjectCache {
mod tests {
use std::fs;
+ use minijinja::value::Value;
+ use minijinja::{AutoEscape, Environment, context};
use tempfile::TempDir;
- use tera::{Context, Tera};
use uuid::Uuid;
use super::*;
@@ -198,6 +199,12 @@ mod tests {
};
use crate::table::Table;
+ fn render_template(template: &str, ctx: Value) -> String {
+ let mut env = Environment::new();
+ env.set_auto_escape_callback(|_| AutoEscape::None);
+ env.render_str(template, ctx).unwrap()
+ }
+
struct TableTestFixture {
table_location: String,
table: Table,
@@ -222,13 +229,12 @@ mod tests {
env!("CARGO_MANIFEST_DIR")
))
.unwrap();
- let mut context = Context::new();
- context.insert("table_location", &table_location);
- context.insert("manifest_list_1_location",
&manifest_list1_location);
- context.insert("manifest_list_2_location",
&manifest_list2_location);
- context.insert("table_metadata_1_location",
&table_metadata1_location);
-
- let metadata_json = Tera::one_off(&template_json_str,
&context, false).unwrap();
+ let metadata_json = render_template(&template_json_str,
context! {
+ table_location => &table_location,
+ manifest_list_1_location => &manifest_list1_location,
+ manifest_list_2_location => &manifest_list2_location,
+ table_metadata_1_location => &table_metadata1_location,
+ });
serde_json::from_str::<TableMetadata>(&metadata_json).unwrap()
};
diff --git a/crates/iceberg/src/scan/mod.rs b/crates/iceberg/src/scan/mod.rs
index 92ee2018..6884e00b 100644
--- a/crates/iceberg/src/scan/mod.rs
+++ b/crates/iceberg/src/scan/mod.rs
@@ -563,11 +563,12 @@ pub mod tests {
ArrayRef, BooleanArray, Float64Array, Int32Array, Int64Array,
RecordBatch, StringArray,
};
use futures::{TryStreamExt, stream};
+ use minijinja::value::Value;
+ use minijinja::{AutoEscape, Environment, context};
use parquet::arrow::{ArrowWriter, PARQUET_FIELD_ID_META_KEY};
use parquet::basic::Compression;
use parquet::file::properties::WriterProperties;
use tempfile::TempDir;
- use tera::{Context, Tera};
use uuid::Uuid;
use crate::TableIdent;
@@ -582,6 +583,12 @@ pub mod tests {
};
use crate::table::Table;
+ fn render_template(template: &str, ctx: Value) -> String {
+ let mut env = Environment::new();
+ env.set_auto_escape_callback(|_| AutoEscape::None);
+ env.render_str(template, ctx).unwrap()
+ }
+
pub struct TableTestFixture {
pub table_location: String,
pub table: Table,
@@ -607,13 +614,12 @@ pub mod tests {
env!("CARGO_MANIFEST_DIR")
))
.unwrap();
- let mut context = Context::new();
- context.insert("table_location", &table_location);
- context.insert("manifest_list_1_location",
&manifest_list1_location);
- context.insert("manifest_list_2_location",
&manifest_list2_location);
- context.insert("table_metadata_1_location",
&table_metadata1_location);
-
- let metadata_json = Tera::one_off(&template_json_str,
&context, false).unwrap();
+ let metadata_json = render_template(&template_json_str,
context! {
+ table_location => &table_location,
+ manifest_list_1_location => &manifest_list1_location,
+ manifest_list_2_location => &manifest_list2_location,
+ table_metadata_1_location => &table_metadata1_location,
+ });
serde_json::from_str::<TableMetadata>(&metadata_json).unwrap()
};
@@ -648,11 +654,10 @@ pub mod tests {
env!("CARGO_MANIFEST_DIR")
))
.unwrap();
- let mut context = Context::new();
- context.insert("table_location", &table_location);
- context.insert("table_metadata_1_location",
&table_metadata1_location);
-
- let metadata_json = Tera::one_off(&template_json_str,
&context, false).unwrap();
+ let metadata_json = render_template(&template_json_str,
context! {
+ table_location => &table_location,
+ table_metadata_1_location => &table_metadata1_location,
+ });
serde_json::from_str::<TableMetadata>(&metadata_json).unwrap()
};
@@ -688,13 +693,12 @@ pub mod tests {
env!("CARGO_MANIFEST_DIR")
))
.unwrap();
- let mut context = Context::new();
- context.insert("table_location", &table_location);
- context.insert("manifest_list_1_location",
&manifest_list1_location);
- context.insert("manifest_list_2_location",
&manifest_list2_location);
- context.insert("table_metadata_1_location",
&table_metadata1_location);
-
- let metadata_json = Tera::one_off(&template_json_str,
&context, false).unwrap();
+ let metadata_json = render_template(&template_json_str,
context! {
+ table_location => &table_location,
+ manifest_list_1_location => &manifest_list1_location,
+ manifest_list_2_location => &manifest_list2_location,
+ table_metadata_1_location => &table_metadata1_location,
+ });
serde_json::from_str::<TableMetadata>(&metadata_json).unwrap()
};
