Merge remote-tracking branch 'apache/main' into alamb/unpin_deps

Author: alamb

.github/workflows/dev.yml

@@ -28,7 +28,7 @@ jobs:
     name: Check License Header
     steps:
       - uses: actions/checkout@v4
-      - uses: korandoru/hawkeye@v5
+      - uses: korandoru/hawkeye@v6
 
   prettier:
     name: Use prettier to check formatting of documents

.github/workflows/rust.yml

@@ -45,7 +45,7 @@ jobs:
     name: Check License Header
     steps:
       - uses: actions/checkout@v4
-      - uses: korandoru/hawkeye@v5
+      - uses: korandoru/hawkeye@v6
 
   # Check crate compiles and base cargo check passes
   linux-build-lib:

datafusion-cli/Cargo.lock

@@ -30,10 +30,10 @@ readme = "README.md"
 
 [dependencies]
 arrow = { version = "54.0.0" }
-async-trait = "0.1.73"
-aws-config = "1.5.15"
-aws-credential-types = "1.2.1"
-aws-sdk-sso = "1.56.0"
+async-trait = "0.1.0"
+aws-config = "1.5.0"
+aws-credential-types = "1.2.0"
+aws-sdk-sso = "1.57.0"
 aws-sdk-ssooidc = "1.57.0"
 aws-sdk-sts = "1.57.0"
 clap = { version = "4.5.27", features = ["derive", "cargo"] }
@@ -59,7 +59,7 @@ object_store = { version = "0.11.0", features = ["aws", "gcp", "http"] }
 parking_lot = { version = "0.12" }
 parquet = { version = "54.0.0", default-features = false }
 regex = "1.8"
-rustyline = "14.0"
+rustyline = "15.0"
 tokio = { version = "1.24", features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot", "signal"] }
 url = "2.5.4"
 

datafusion-cli/Cargo.toml

@@ -30,7 +30,7 @@ use datafusion::sql::sqlparser::parser::ParserError;
 
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
 use rustyline::error::ReadlineError;
-use rustyline::highlight::Highlighter;
+use rustyline::highlight::{CmdKind, Highlighter};
 use rustyline::hint::Hinter;
 use rustyline::validate::{ValidationContext, ValidationResult, Validator};
 use rustyline::{Context, Helper, Result};
@@ -118,8 +118,8 @@ impl Highlighter for CliHelper {
         self.highlighter.highlight(line, pos)
     }
 
-    fn highlight_char(&self, line: &str, pos: usize, forced: bool) -> bool {
-        self.highlighter.highlight_char(line, pos, forced)
+    fn highlight_char(&self, line: &str, pos: usize, kind: CmdKind) -> bool {
+        self.highlighter.highlight_char(line, pos, kind)
     }
 }
 

datafusion-cli/src/helper.rs

@@ -27,7 +27,7 @@ use datafusion::sql::sqlparser::{
     keywords::Keyword,
     tokenizer::{Token, Tokenizer},
 };
-use rustyline::highlight::Highlighter;
+use rustyline::highlight::{CmdKind, Highlighter};
 
 /// The syntax highlighter.
 #[derive(Debug)]
@@ -73,7 +73,7 @@ impl Highlighter for SyntaxHighlighter {
         }
     }
 
-    fn highlight_char(&self, line: &str, _pos: usize, _forced: bool) -> bool {
+    fn highlight_char(&self, line: &str, _pos: usize, _cmd: CmdKind) -> bool {
         !line.is_empty()
     }
 }

datafusion-cli/src/highlighter.rs

@@ -28,15 +28,19 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-arrow-schema = { workspace = true }
+arrow = { workspace = true }
 async-trait = { workspace = true }
 dashmap = { workspace = true }
 datafusion-common = { workspace = true }
 datafusion-execution = { workspace = true }
 datafusion-expr = { workspace = true }
 datafusion-physical-plan = { workspace = true }
+datafusion-sql = { workspace = true }
+futures = { workspace = true }
 itertools = { workspace = true }
+log = { workspace = true }
 parking_lot = { workspace = true }
+sqlparser = { workspace = true }
 
 [dev-dependencies]
 tokio = { workspace = true }

datafusion/catalog/Cargo.toml

@@ -430,7 +430,7 @@ mod tests {
         },
     };
 
-    use arrow_schema::SchemaRef;
+    use arrow::datatypes::SchemaRef;
     use async_trait::async_trait;
     use datafusion_common::{error::Result, Statistics, TableReference};
     use datafusion_execution::config::SessionConfig;

datafusion/catalog/src/async.rs

@@ -19,31 +19,29 @@
 //!
 //! [Information Schema]: https://en.wikipedia.org/wiki/Information_schema
 
-use crate::catalog::{CatalogProviderList, SchemaProvider, TableProvider};
-use crate::datasource::streaming::StreamingTable;
-use crate::execution::context::TaskContext;
-use crate::logical_expr::{TableType, Volatility};
-use crate::physical_plan::stream::RecordBatchStreamAdapter;
-use crate::physical_plan::SendableRecordBatchStream;
-use crate::{
-    config::{ConfigEntry, ConfigOptions},
-    physical_plan::streaming::PartitionStream,
-};
+use crate::streaming::StreamingTable;
+use crate::{CatalogProviderList, SchemaProvider, TableProvider};
+use arrow::array::builder::{BooleanBuilder, UInt8Builder};
 use arrow::{
     array::{StringBuilder, UInt64Builder},
     datatypes::{DataType, Field, Schema, SchemaRef},
     record_batch::RecordBatch,
 };
-use arrow_array::builder::{BooleanBuilder, UInt8Builder};
 use async_trait::async_trait;
+use datafusion_common::config::{ConfigEntry, ConfigOptions};
 use datafusion_common::error::Result;
 use datafusion_common::DataFusionError;
+use datafusion_execution::TaskContext;
 use datafusion_expr::{AggregateUDF, ScalarUDF, Signature, TypeSignature, WindowUDF};
+use datafusion_expr::{TableType, Volatility};
+use datafusion_physical_plan::stream::RecordBatchStreamAdapter;
+use datafusion_physical_plan::streaming::PartitionStream;
+use datafusion_physical_plan::SendableRecordBatchStream;
 use std::collections::{HashMap, HashSet};
 use std::fmt::Debug;
 use std::{any::Any, sync::Arc};
 
-pub(crate) const INFORMATION_SCHEMA: &str = "information_schema";
+pub const INFORMATION_SCHEMA: &str = "information_schema";
 pub(crate) const TABLES: &str = "tables";
 pub(crate) const VIEWS: &str = "views";
 pub(crate) const COLUMNS: &str = "columns";