From ce62e4e30af58c3f4576b910b4a2f6c7a13b8f09 Mon Sep 17 00:00:00 2001 From: Jonathan Suever <653357+suever@users.noreply.github.com> Date: Wed, 5 Nov 2025 13:11:01 -0500 Subject: [PATCH 1/5] Update dependencies to point to the massive-com GitHub organization --- Cargo.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 63a92f5..7f5e1d0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ version = "0.1.1" edition = "2021" homepage = "https://github.com/datafusion-contrib/datafusion-materialized-views" repository = "https://github.com/datafusion-contrib/datafusion-materialized-views" -authors = ["Matthew Cramerus "] +authors = ["Massive Engineering "] license = "Apache-2.0" description = "Materialized Views & Query Rewriting in DataFusion" keywords = ["arrow", "arrow-rs", "datafusion"] @@ -32,15 +32,15 @@ arrow = { git = "https://github.com/influxdata/arrow-rs", rev = "36685f0" } arrow-schema = { git = "https://github.com/influxdata/arrow-rs", rev = "36685f0" } async-trait = "0.1" dashmap = "6" -datafusion = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "08b3ce0" } -datafusion-common = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "08b3ce0" } -datafusion-expr = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "08b3ce0" } -datafusion-functions = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "08b3ce0" } -datafusion-functions-aggregate = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "08b3ce0" } -datafusion-optimizer = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "08b3ce0" } -datafusion-physical-expr = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "08b3ce0" } -datafusion-physical-plan = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "08b3ce0" } -datafusion-sql = { git = "https://github.com/polygon-io/arrow-datafusion", rev = "08b3ce0" } +datafusion = { git = "https://github.com/massive-com/arrow-datafusion", rev = "08b3ce0" } +datafusion-common = { git = "https://github.com/massive-com/arrow-datafusion", rev = "08b3ce0" } +datafusion-expr = { git = "https://github.com/massive-com/arrow-datafusion", rev = "08b3ce0" } +datafusion-functions = { git = "https://github.com/massive-com/arrow-datafusion", rev = "08b3ce0" } +datafusion-functions-aggregate = { git = "https://github.com/massive-com/arrow-datafusion", rev = "08b3ce0" } +datafusion-optimizer = { git = "https://github.com/massive-com/arrow-datafusion", rev = "08b3ce0" } +datafusion-physical-expr = { git = "https://github.com/massive-com/arrow-datafusion", rev = "08b3ce0" } +datafusion-physical-plan = { git = "https://github.com/massive-com/arrow-datafusion", rev = "08b3ce0" } +datafusion-sql = { git = "https://github.com/massive-com/arrow-datafusion", rev = "08b3ce0" } futures = "0.3" itertools = "0.13" log = "0.4" From 5844b400002435835dea09389b5d6932ac20a391 Mon Sep 17 00:00:00 2001 From: Jonathan Suever <653357+suever@users.noreply.github.com> Date: Wed, 5 Nov 2025 14:39:53 -0500 Subject: [PATCH 2/5] Pin the toolchain --- rust-toolchain.toml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 rust-toolchain.toml diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..d1ee6a9 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "1.80.0" +components = ["rust-analyzer", "rustfmt", "clippy"] + From 6e01befe02ac6cb64ed154c8db37271811f3dc6b Mon Sep 17 00:00:00 2001 From: Jonathan Suever <653357+suever@users.noreply.github.com> Date: Wed, 5 Nov 2025 14:59:01 -0500 Subject: [PATCH 3/5] Bump rust and toolchain to 1.91 --- Cargo.toml | 2 +- rust-toolchain.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index fcdeb41..6373816 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ authors = ["Massive Engineering "] license = "Apache-2.0" description = "Materialized Views & Query Rewriting in DataFusion" keywords = ["arrow", "arrow-rs", "datafusion"] -rust-version = "1.80" +rust-version = "1.91" [dependencies] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index d1ee6a9..067848a 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.80.0" +channel = "1.91.0" components = ["rust-analyzer", "rustfmt", "clippy"] From ecbd8ed05f001cd01262147e30c248bbba4939e2 Mon Sep 17 00:00:00 2001 From: Wyatt Herkamp Date: Wed, 5 Nov 2025 15:07:06 -0500 Subject: [PATCH 4/5] Make Clippy Happy --- tests/materialized_listing_table.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/materialized_listing_table.rs b/tests/materialized_listing_table.rs index 5ad9d25..b4d7272 100644 --- a/tests/materialized_listing_table.rs +++ b/tests/materialized_listing_table.rs @@ -503,7 +503,7 @@ impl TableProvider for MaterializedListingTable { self.inner.get_table_definition() } - fn get_logical_plan(&self) -> Option> { + fn get_logical_plan(&self) -> Option> { // We _could_ return the LogicalPlan here, // but it will cause this table to be treated like a regular view // and the materialized results will not be used. From 06367ab137b5f54433ee4240a19159c3b0985692 Mon Sep 17 00:00:00 2001 From: Wyatt Herkamp Date: Wed, 5 Nov 2025 15:18:32 -0500 Subject: [PATCH 5/5] Fix license --- rust-toolchain.toml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 067848a..992c7b2 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. + [toolchain] channel = "1.91.0" components = ["rust-analyzer", "rustfmt", "clippy"]