Skip to content

Commit 5e6719d

Browse files
committed
Merge branch 'main' into extend-single-ndv-optimization
2 parents a2548c2 + 0143dfe commit 5e6719d

193 files changed

Lines changed: 14030 additions & 3229 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4444
- name: Install cargo-audit
45-
uses: taiki-e/install-action@6ef672efc2b5aabc787a9e94baf4989aa02a97df # v2.70.3
45+
uses: taiki-e/install-action@94cb46f8d6e437890146ffbd78a778b78e623fb2 # v2.74.0
4646
with:
4747
tool: cargo-audit
4848
- name: Run audit check

.github/workflows/rust.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ jobs:
430430
sudo apt-get update -qq
431431
sudo apt-get install -y -qq clang
432432
- name: Setup wasm-pack
433-
uses: taiki-e/install-action@6ef672efc2b5aabc787a9e94baf4989aa02a97df # v2.70.3
433+
uses: taiki-e/install-action@94cb46f8d6e437890146ffbd78a778b78e623fb2 # v2.74.0
434434
with:
435435
tool: wasm-pack
436436
- name: Run tests with headless mode
@@ -770,7 +770,7 @@ jobs:
770770
- name: Setup Rust toolchain
771771
uses: ./.github/actions/setup-builder
772772
- name: Install cargo-msrv
773-
uses: taiki-e/install-action@6ef672efc2b5aabc787a9e94baf4989aa02a97df # v2.70.3
773+
uses: taiki-e/install-action@94cb46f8d6e437890146ffbd78a778b78e623fb2 # v2.74.0
774774
with:
775775
tool: cargo-msrv
776776

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ glob = "0.3.0"
162162
half = { version = "2.7.0", default-features = false }
163163
hashbrown = { version = "0.16.1" }
164164
hex = { version = "0.4.3" }
165-
indexmap = "2.13.0"
165+
indexmap = "2.13.1"
166166
insta = { version = "1.47.2", features = ["glob", "filters"] }
167167
itertools = "0.14"
168168
itoa = "1.0"
@@ -192,7 +192,7 @@ strum = "0.28.0"
192192
strum_macros = "0.28.0"
193193
tempfile = "3"
194194
testcontainers-modules = { version = "0.15" }
195-
tokio = { version = "1.48", features = ["macros", "rt", "sync"] }
195+
tokio = { version = "1.51", features = ["macros", "rt", "sync"] }
196196
tokio-stream = "0.1"
197197
tokio-util = "0.7"
198198
url = "2.5.7"

datafusion-cli/src/catalog.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
use std::any::Any;
1918
use std::sync::{Arc, Weak};
2019

2120
use crate::object_storage::{AwsOptions, GcpOptions, get_object_store};
@@ -50,10 +49,6 @@ impl DynamicObjectStoreCatalog {
5049
}
5150

5251
impl CatalogProviderList for DynamicObjectStoreCatalog {
53-
fn as_any(&self) -> &dyn Any {
54-
self
55-
}
56-
5752
fn register_catalog(
5853
&self,
5954
name: String,
@@ -91,10 +86,6 @@ impl DynamicObjectStoreCatalogProvider {
9186
}
9287

9388
impl CatalogProvider for DynamicObjectStoreCatalogProvider {
94-
fn as_any(&self) -> &dyn Any {
95-
self
96-
}
97-
9889
fn schema_names(&self) -> Vec<String> {
9990
self.inner.schema_names()
10091
}
@@ -134,10 +125,6 @@ impl DynamicObjectStoreSchemaProvider {
134125

135126
#[async_trait]
136127
impl SchemaProvider for DynamicObjectStoreSchemaProvider {
137-
fn as_any(&self) -> &dyn Any {
138-
self
139-
}
140-
141128
fn table_names(&self) -> Vec<String> {
142129
self.inner.table_names()
143130
}

0 commit comments

Comments
 (0)