This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new e6e1eb2294 Update to `clap` 4.5.16 (#12064)
e6e1eb2294 is described below
commit e6e1eb229440591263c82bb2b913a4d5a16f9b70
Author: Piotr Findeisen <[email protected]>
AuthorDate: Tue Aug 20 20:58:43 2024 +0200
Update to `clap` 4.5.16 (#12064)
---
datafusion-cli/Cargo.lock | 190 +++++++++++++++++++------------------
datafusion-cli/Cargo.toml | 2 +-
datafusion-cli/src/command.rs | 2 +-
datafusion-cli/src/main.rs | 47 ++++-----
datafusion-cli/src/pool_type.rs | 2 +-
datafusion-cli/src/print_format.rs | 4 +-
datafusion/sqllogictest/Cargo.toml | 2 +-
7 files changed, 122 insertions(+), 127 deletions(-)
diff --git a/datafusion-cli/Cargo.lock b/datafusion-cli/Cargo.lock
index b5637f785f..a164b74c55 100644
--- a/datafusion-cli/Cargo.lock
+++ b/datafusion-cli/Cargo.lock
@@ -82,12 +82,55 @@ dependencies = [
"libc",
]
+[[package]]
+name = "anstream"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
[[package]]
name = "anstyle"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+[[package]]
+name = "anstyle-parse"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
[[package]]
name = "apache-avro"
version = "0.16.0"
@@ -177,7 +220,7 @@ dependencies = [
"chrono",
"chrono-tz",
"half",
- "hashbrown 0.14.5",
+ "hashbrown",
"num",
]
@@ -272,7 +315,7 @@ dependencies = [
"arrow-schema",
"chrono",
"half",
- "indexmap 2.4.0",
+ "indexmap",
"lexical-core",
"num",
"serde",
@@ -927,42 +970,43 @@ dependencies = [
[[package]]
name = "clap"
-version = "3.2.25"
+version = "4.5.16"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
+checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
dependencies = [
- "atty",
- "bitflags 1.3.2",
+ "clap_builder",
"clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+dependencies = [
+ "anstream",
+ "anstyle",
"clap_lex",
- "indexmap 1.9.3",
- "once_cell",
"strsim",
- "termcolor",
- "textwrap",
]
[[package]]
name = "clap_derive"
-version = "3.2.25"
+version = "4.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
dependencies = [
- "heck 0.4.1",
- "proc-macro-error",
+ "heck 0.5.0",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.74",
]
[[package]]
name = "clap_lex"
-version = "0.2.4"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
[[package]]
name = "clipboard-win"
@@ -975,6 +1019,12 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "colorchoice"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+
[[package]]
name = "comfy-table"
version = "7.1.1"
@@ -1122,7 +1172,7 @@ checksum =
"804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28"
dependencies = [
"cfg-if",
"crossbeam-utils",
- "hashbrown 0.14.5",
+ "hashbrown",
"lock_api",
"once_cell",
"parking_lot_core",
@@ -1164,8 +1214,8 @@ dependencies = [
"futures",
"glob",
"half",
- "hashbrown 0.14.5",
- "indexmap 2.4.0",
+ "hashbrown",
+ "indexmap",
"itertools 0.12.1",
"log",
"num-traits",
@@ -1237,7 +1287,7 @@ dependencies = [
"arrow-schema",
"chrono",
"half",
- "hashbrown 0.14.5",
+ "hashbrown",
"instant",
"libc",
"num_cpus",
@@ -1264,7 +1314,7 @@ dependencies = [
"datafusion-common",
"datafusion-expr",
"futures",
- "hashbrown 0.14.5",
+ "hashbrown",
"log",
"object_store",
"parking_lot",
@@ -1315,7 +1365,7 @@ dependencies = [
"datafusion-common",
"datafusion-execution",
"datafusion-expr",
- "hashbrown 0.14.5",
+ "hashbrown",
"hex",
"itertools 0.12.1",
"log",
@@ -1398,8 +1448,8 @@ dependencies = [
"datafusion-common",
"datafusion-expr",
"datafusion-physical-expr",
- "hashbrown 0.14.5",
- "indexmap 2.4.0",
+ "hashbrown",
+ "indexmap",
"itertools 0.12.1",
"log",
"paste",
@@ -1426,9 +1476,9 @@ dependencies = [
"datafusion-functions-aggregate-common",
"datafusion-physical-expr-common",
"half",
- "hashbrown 0.14.5",
+ "hashbrown",
"hex",
- "indexmap 2.4.0",
+ "indexmap",
"itertools 0.12.1",
"log",
"paste",
@@ -1444,7 +1494,7 @@ dependencies = [
"arrow",
"datafusion-common",
"datafusion-expr-common",
- "hashbrown 0.14.5",
+ "hashbrown",
"rand",
]
@@ -1496,8 +1546,8 @@ dependencies = [
"datafusion-physical-expr-functions-aggregate",
"futures",
"half",
- "hashbrown 0.14.5",
- "indexmap 2.4.0",
+ "hashbrown",
+ "indexmap",
"itertools 0.12.1",
"log",
"once_cell",
@@ -1862,7 +1912,7 @@ dependencies = [
"futures-sink",
"futures-util",
"http 0.2.12",
- "indexmap 2.4.0",
+ "indexmap",
"slab",
"tokio",
"tokio-util",
@@ -1881,7 +1931,7 @@ dependencies = [
"futures-core",
"futures-sink",
"http 1.1.0",
- "indexmap 2.4.0",
+ "indexmap",
"slab",
"tokio",
"tokio-util",
@@ -1899,12 +1949,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
[[package]]
name = "hashbrown"
version = "0.14.5"
@@ -2161,16 +2205,6 @@ dependencies = [
"unicode-normalization",
]
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
[[package]]
name = "indexmap"
version = "2.4.0"
@@ -2178,7 +2212,7 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
dependencies = [
"equivalent",
- "hashbrown 0.14.5",
+ "hashbrown",
]
[[package]]
@@ -2205,6 +2239,12 @@ version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
[[package]]
name = "itertools"
version = "0.12.1"
@@ -2343,7 +2383,7 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d"
dependencies = [
"core2",
- "hashbrown 0.14.5",
+ "hashbrown",
"rle-decode-fast",
]
@@ -2644,12 +2684,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "os_str_bytes"
-version = "6.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
-
[[package]]
name = "outref"
version = "0.5.1"
@@ -2700,7 +2734,7 @@ dependencies = [
"flate2",
"futures",
"half",
- "hashbrown 0.14.5",
+ "hashbrown",
"lz4_flex",
"num",
"num-bigint",
@@ -2743,7 +2777,7 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
dependencies = [
"fixedbitset",
- "indexmap 2.4.0",
+ "indexmap",
]
[[package]]
@@ -2867,30 +2901,6 @@ dependencies = [
"termtree",
]
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
[[package]]
name = "proc-macro2"
version = "1.0.86"
@@ -3576,9 +3586,9 @@ checksum =
"9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
[[package]]
name = "strsim"
-version = "0.10.0"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "strum"
@@ -3683,12 +3693,6 @@ version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
-[[package]]
-name = "textwrap"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
-
[[package]]
name = "thiserror"
version = "1.0.63"
diff --git a/datafusion-cli/Cargo.toml b/datafusion-cli/Cargo.toml
index 252d056e8b..0a4523a1c0 100644
--- a/datafusion-cli/Cargo.toml
+++ b/datafusion-cli/Cargo.toml
@@ -34,7 +34,7 @@ arrow = { version = "52.2.0" }
async-trait = "0.1.73"
aws-config = "0.55"
aws-credential-types = "0.55"
-clap = { version = "3", features = ["derive", "cargo"] }
+clap = { version = "4.5.16", features = ["derive", "cargo"] }
datafusion = { path = "../datafusion/core", version = "41.0.0", features = [
"avro",
"crypto_expressions",
diff --git a/datafusion-cli/src/command.rs b/datafusion-cli/src/command.rs
index 05c00d634c..f0eb58a233 100644
--- a/datafusion-cli/src/command.rs
+++ b/datafusion-cli/src/command.rs
@@ -22,7 +22,7 @@ use crate::exec::{exec_and_print, exec_from_lines};
use crate::functions::{display_all_functions, Function};
use crate::print_format::PrintFormat;
use crate::print_options::PrintOptions;
-use clap::ArgEnum;
+use clap::ValueEnum;
use datafusion::arrow::array::{ArrayRef, StringArray};
use datafusion::arrow::datatypes::{DataType, Field, Schema};
use datafusion::arrow::record_batch::RecordBatch;
diff --git a/datafusion-cli/src/main.rs b/datafusion-cli/src/main.rs
index 1810d3cef5..6e94e6ea41 100644
--- a/datafusion-cli/src/main.rs
+++ b/datafusion-cli/src/main.rs
@@ -49,7 +49,7 @@ struct Args {
short = 'p',
long,
help = "Path to your data, default to current directory",
- validator(is_valid_data_dir)
+ value_parser(parse_valid_data_dir)
)]
data_path: Option<String>,
@@ -57,16 +57,16 @@ struct Args {
short = 'b',
long,
help = "The batch size of each query, or use DataFusion default",
- validator(is_valid_batch_size)
+ value_parser(parse_batch_size)
)]
batch_size: Option<usize>,
#[clap(
short = 'c',
long,
- multiple_values = true,
+ num_args = 0..,
help = "Execute the given command string(s), then exit. Commands are
expected to be non empty.",
- validator(is_valid_command)
+ value_parser(parse_command)
)]
command: Vec<String>,
@@ -74,30 +74,30 @@ struct Args {
short = 'm',
long,
help = "The memory pool limitation (e.g. '10g'), default to None (no
limit)",
- validator(is_valid_memory_pool_size)
+ value_parser(extract_memory_pool_size)
)]
- memory_limit: Option<String>,
+ memory_limit: Option<usize>,
#[clap(
short,
long,
- multiple_values = true,
+ num_args = 0..,
help = "Execute commands from file(s), then exit",
- validator(is_valid_file)
+ value_parser(parse_valid_file)
)]
file: Vec<String>,
#[clap(
short = 'r',
long,
- multiple_values = true,
+ num_args = 0..,
help = "Run the provided files on startup instead of ~/.datafusionrc",
- validator(is_valid_file),
+ value_parser(parse_valid_file),
conflicts_with = "file"
)]
rc: Option<Vec<String>>,
- #[clap(long, arg_enum, default_value_t = PrintFormat::Automatic)]
+ #[clap(long, value_enum, default_value_t = PrintFormat::Automatic)]
format: PrintFormat,
#[clap(
@@ -160,8 +160,6 @@ async fn main_inner() -> Result<()> {
let rt_config =
// set memory pool size
if let Some(memory_limit) = args.memory_limit {
- // unwrap is safe here because is_valid_memory_pool_size already
checked the value
- let memory_limit =
extract_memory_pool_size(&memory_limit).unwrap();
// set memory pool type
match args.mem_pool_type {
PoolType::Fair => rt_config
@@ -235,39 +233,32 @@ fn create_runtime_env(rn_config: RuntimeConfig) ->
Result<RuntimeEnv> {
RuntimeEnv::new(rn_config)
}
-fn is_valid_file(dir: &str) -> Result<(), String> {
+fn parse_valid_file(dir: &str) -> Result<String, String> {
if Path::new(dir).is_file() {
- Ok(())
+ Ok(dir.to_string())
} else {
Err(format!("Invalid file '{}'", dir))
}
}
-fn is_valid_data_dir(dir: &str) -> Result<(), String> {
+fn parse_valid_data_dir(dir: &str) -> Result<String, String> {
if Path::new(dir).is_dir() {
- Ok(())
+ Ok(dir.to_string())
} else {
Err(format!("Invalid data directory '{}'", dir))
}
}
-fn is_valid_batch_size(size: &str) -> Result<(), String> {
+fn parse_batch_size(size: &str) -> Result<usize, String> {
match size.parse::<usize>() {
- Ok(size) if size > 0 => Ok(()),
+ Ok(size) if size > 0 => Ok(size),
_ => Err(format!("Invalid batch size '{}'", size)),
}
}
-fn is_valid_memory_pool_size(size: &str) -> Result<(), String> {
- match extract_memory_pool_size(size) {
- Ok(_) => Ok(()),
- Err(e) => Err(e),
- }
-}
-
-fn is_valid_command(command: &str) -> Result<(), String> {
+fn parse_command(command: &str) -> Result<String, String> {
if !command.is_empty() {
- Ok(())
+ Ok(command.to_string())
} else {
Err("-c flag expects only non empty commands".to_string())
}
diff --git a/datafusion-cli/src/pool_type.rs b/datafusion-cli/src/pool_type.rs
index 25763eba5c..269790b61f 100644
--- a/datafusion-cli/src/pool_type.rs
+++ b/datafusion-cli/src/pool_type.rs
@@ -20,7 +20,7 @@ use std::{
str::FromStr,
};
-#[derive(PartialEq, Debug)]
+#[derive(PartialEq, Debug, Clone)]
pub enum PoolType {
Greedy,
Fair,
diff --git a/datafusion-cli/src/print_format.rs
b/datafusion-cli/src/print_format.rs
index c95bde7fc6..92cb106d62 100644
--- a/datafusion-cli/src/print_format.rs
+++ b/datafusion-cli/src/print_format.rs
@@ -30,7 +30,7 @@ use datafusion::common::format::DEFAULT_FORMAT_OPTIONS;
use datafusion::error::Result;
/// Allow records to be printed in different formats
-#[derive(Debug, PartialEq, Eq, clap::ArgEnum, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, clap::ValueEnum, Clone, Copy)]
pub enum PrintFormat {
Csv,
Tsv,
@@ -44,7 +44,7 @@ impl FromStr for PrintFormat {
type Err = String;
fn from_str(s: &str) -> Result<Self, Self::Err> {
- clap::ArgEnum::from_str(s, true)
+ clap::ValueEnum::from_str(s, true)
}
}
diff --git a/datafusion/sqllogictest/Cargo.toml
b/datafusion/sqllogictest/Cargo.toml
index 28ef6fe9ad..36aff61396 100644
--- a/datafusion/sqllogictest/Cargo.toml
+++ b/datafusion/sqllogictest/Cargo.toml
@@ -39,7 +39,7 @@ async-trait = { workspace = true }
bigdecimal = { workspace = true }
bytes = { workspace = true, optional = true }
chrono = { workspace = true, optional = true }
-clap = { version = "4.4.8", features = ["derive", "env"] }
+clap = { version = "4.5.16", features = ["derive", "env"] }
datafusion = { workspace = true, default-features = true, features = ["avro"] }
datafusion-common = { workspace = true, default-features = true }
datafusion-common-runtime = { workspace = true, default-features = true }
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
