Skip to content

Commit 9f98809

Browse files
committed
Update datafusion
1 parent 0b2718a commit 9f98809

4 files changed

Lines changed: 73 additions & 101 deletions

File tree

Cargo.lock

Lines changed: 37 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,40 @@ sea-query = { git = "https://github.com/spiceai/sea-query.git", rev = "213b6b876
9898
[patch.crates-io]
9999
rusqlite = { git = "https://github.com/spiceai/rusqlite.git", rev = "3d1f5f6f6d6d062676210d095df45eafa6e19fd8" } # spiceai-v0.37.0
100100

101+
# spiceai-52.5 with extract_dml_filters fix (spiceai/datafusion#157)
102+
datafusion = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
103+
datafusion-catalog = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
104+
datafusion-catalog-listing = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
105+
datafusion-common = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
106+
datafusion-common-runtime = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
107+
datafusion-datasource = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
108+
datafusion-datasource-arrow = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
109+
datafusion-datasource-csv = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
110+
datafusion-datasource-json = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
111+
datafusion-datasource-parquet = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
112+
datafusion-execution = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
113+
datafusion-expr = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
114+
datafusion-expr-common = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
115+
datafusion-functions = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
116+
datafusion-functions-aggregate = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
117+
datafusion-functions-aggregate-common = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
118+
datafusion-functions-nested = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
119+
datafusion-functions-table = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
120+
datafusion-functions-window = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
121+
datafusion-functions-window-common = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
122+
datafusion-macros = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
123+
datafusion-optimizer = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
124+
datafusion-physical-expr = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
125+
datafusion-physical-expr-adapter = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
126+
datafusion-physical-expr-common = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
127+
datafusion-physical-optimizer = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
128+
datafusion-physical-plan = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
129+
datafusion-proto = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
130+
datafusion-proto-common = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
131+
datafusion-pruning = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
132+
datafusion-session = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
133+
datafusion-sql = { git = "https://github.com/spiceai/datafusion.git", rev = "3bb97817bb74b1a60a052e2b33335f707f3bd145" }
134+
101135
# spiceai-57.2-patches: ObjectVersionType + new_with_meta support for Azure compatibility
102136
arrow = { git = "https://github.com/spiceai/arrow-rs.git", rev = "ca671dd37d73b730938f77f7a7ad76545280a4a8" }
103137
arrow-array = { git = "https://github.com/spiceai/arrow-rs.git", rev = "ca671dd37d73b730938f77f7a7ad76545280a4a8" }

core/src/mongodb.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,6 @@ impl MongoDBTableFactory {
9090
&self,
9191
table_reference: TableReference,
9292
) -> Result<Arc<dyn TableProvider + 'static>, Box<dyn std::error::Error + Send + Sync>> {
93-
let pool = Arc::clone(&self.pool);
94-
let table_provider = Arc::new(
95-
MongoDBTable::new_writeable(&pool, table_reference)
96-
.await
97-
.map_err(|e| Box::new(e) as Box<dyn std::error::Error + Send + Sync>)?,
98-
);
99-
Ok(table_provider)
93+
self.table_provider(table_reference).await
10094
}
10195
}

0 commit comments

Comments
 (0)