diff --git a/Cargo.lock b/Cargo.lock index 8a5559f636756..030facb244f79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -56,6 +56,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -71,6 +77,55 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse 0.2.1", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse 0.2.1", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + [[package]] name = "anyhow" version = "1.0.66" @@ -112,7 +167,7 @@ dependencies = [ "arrow-format", "base64 0.13.1", "bytemuck", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "dyn-clone", "either", "ethnum", @@ -1008,9 +1063,23 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" -source = "git+https://github.com/chronotope/chrono.git?branch=0.4.x#ada0629bb45cf08e9ff72f0ac18fe5eb43d628cb" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "serde", + "winapi", +] + +[[package]] +name = "chrono" +version = "0.4.26" +source = "git+https://github.com/chronotope/chrono.git?branch=0.4.x#c1c272a575061990014b53abad4ff363040b585f" +dependencies = [ + "android-tzdata", "iana-time-zone", "num-traits", "serde", @@ -1023,7 +1092,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa48fa079165080f11d7753fd0bc175b7d391f276b965fe4b55bfad67856e463" dependencies = [ - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "chrono-tz-build", "phf", "serde", @@ -1088,33 +1157,51 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.24" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eef2b3ded6a26dfaec672a742c93c8cf6b689220324da509ec5caa20de55dc83" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ - "atty", "bitflags", - "clap_derive", - "clap_lex", + "clap_lex 0.2.2", "indexmap", + "textwrap", +] + +[[package]] +name = "clap" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ed2379f8603fa2b7509891660e802b88c70a79a6427a70abb5968054de2c28" +dependencies = [ + "clap_builder", + "clap_derive", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex 0.5.0", "strsim", - "termcolor", "terminal_size", - "textwrap", ] [[package]] name = "clap_derive" -version = "3.2.24" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d756c5824fc5c0c1ee8e36000f576968dbcb2081def956c83fad6f40acd46f96" +checksum = "59e9ef9a08ee1c0e1f2e162121665ac45ac3783b0f897db7244ae75ad9a8f65b" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.12", ] [[package]] @@ -1126,6 +1213,12 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + [[package]] name = "cmake" version = "0.1.48" @@ -1145,6 +1238,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "columnation" version = "0.1.0" @@ -1307,7 +1406,7 @@ dependencies = [ "atty", "cast", "ciborium", - "clap", + "clap 3.2.25", "criterion-plot", "futures", "itertools", @@ -2666,6 +2765,18 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -2757,7 +2868,7 @@ checksum = "6d9455388f4977de4d0934efa9f7d36296295537d774574113a20f6082de03da" dependencies = [ "base64 0.13.1", "bytes", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "http", "percent-encoding", "serde", @@ -2787,7 +2898,7 @@ checksum = "e80db3ca107e89da5f7eae37ea5274e06cefdcf9689d0ebd5ec3575a6f983e4e" dependencies = [ "base64 0.13.1", "bytes", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "dirs-next", "either", "futures", @@ -2822,7 +2933,7 @@ version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fce686d2fbdaf6cb18d19cdb0692e9485dd9945f79f944b8772bdb2a07e8d39d" dependencies = [ - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "form_urlencoded", "http", "json-patch", @@ -2877,7 +2988,7 @@ version = "1.0.0" source = "git+https://github.com/MaterializeInc/rust-server-sdk#5c36592edc75b620482a92e6991147aee7baf2d8" dependencies = [ "built", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel", "data-encoding", "eventsource-client", @@ -2906,7 +3017,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c27dd31ce69c55fca526d1c22c2dcca96fd0c98e496529d37eeef6c41652173" dependencies = [ "base16ct", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "itertools", "lazy_static", "log", @@ -3349,7 +3460,7 @@ version = "0.1.0" dependencies = [ "anyhow", "axum", - "clap", + "clap 4.3.1", "dirs", "indicatif", "mz-build-info", @@ -3376,7 +3487,7 @@ dependencies = [ "anyhow", "bytes", "bytesize", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "criterion", "datadriven", "dec", @@ -3469,7 +3580,7 @@ version = "0.7.0" dependencies = [ "anyhow", "byteorder", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "crc32fast", "digest", "enum-kinds", @@ -3584,7 +3695,7 @@ dependencies = [ "anyhow", "async-trait", "bytesize", - "clap", + "clap 4.3.1", "crossbeam-channel", "dec", "differential-dataflow", @@ -3621,7 +3732,7 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "futures", "http", "itertools", @@ -3653,7 +3764,7 @@ version = "0.56.0-dev" dependencies = [ "anyhow", "axum", - "clap", + "clap 4.3.1", "fail", "futures", "mz-alloc", @@ -3686,7 +3797,7 @@ dependencies = [ "anyhow", "async-trait", "bytesize", - "clap", + "clap 4.3.1", "crossbeam-channel", "dec", "differential-dataflow", @@ -3726,7 +3837,7 @@ dependencies = [ "async-stream", "async-trait", "bytesize", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "columnation", "differential-dataflow", "futures", @@ -3771,7 +3882,7 @@ name = "mz-controller" version = "0.0.0" dependencies = [ "anyhow", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "differential-dataflow", "futures", "mz-build-info", @@ -3810,8 +3921,8 @@ dependencies = [ "bytes", "bytesize", "cc", - "chrono", - "clap", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.3.1", "datadriven", "fail", "fallible-iterator", @@ -3905,7 +4016,7 @@ dependencies = [ "anyhow", "bytes", "bytesize", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "criterion", "csv", "datadriven", @@ -4029,8 +4140,8 @@ version = "0.0.0" dependencies = [ "anyhow", "byteorder", - "chrono", - "clap", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.3.1", "criterion", "differential-dataflow", "itertools", @@ -4059,8 +4170,8 @@ name = "mz-kafka-util" version = "0.0.0" dependencies = [ "anyhow", - "chrono", - "clap", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.3.1", "crossbeam", "mz-avro", "mz-ccsr", @@ -4149,7 +4260,7 @@ dependencies = [ "anyhow", "async-trait", "bytesize", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "derivative", "futures-core", "mz-ore", @@ -4166,8 +4277,8 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "chrono", - "clap", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.3.1", "fail", "futures", "k8s-openapi", @@ -4191,7 +4302,7 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "futures", "hex", "itertools", @@ -4218,7 +4329,7 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "clap", + "clap 4.3.1", "futures-core", "http", "humantime", @@ -4242,8 +4353,8 @@ dependencies = [ "async-trait", "atty", "bytes", - "chrono", - "clap", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.3.1", "console-subscriber", "ctor", "either", @@ -4333,7 +4444,7 @@ dependencies = [ "async-trait", "axum", "bytes", - "clap", + "clap 4.3.1", "criterion", "datadriven", "differential-dataflow", @@ -4409,7 +4520,7 @@ version = "0.0.0" dependencies = [ "byteorder", "bytes", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "dec", "mz-ore", "mz-pgrepr-consts", @@ -4433,7 +4544,7 @@ version = "0.0.0" dependencies = [ "anyhow", "bytes", - "clap", + "clap 4.3.1", "datadriven", "fallible-iterator", "mz-ore", @@ -4565,7 +4676,7 @@ dependencies = [ "anyhow", "bitflags", "bytes", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "chrono-tz", "columnation", "criterion", @@ -4612,7 +4723,7 @@ dependencies = [ name = "mz-repr-test-util" version = "0.0.0" dependencies = [ - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "datadriven", "mz-lowertest", "mz-ore", @@ -4658,7 +4769,7 @@ dependencies = [ "aws-config", "aws-sdk-s3", "bytefmt", - "clap", + "clap 4.3.1", "futures", "indicatif", "mz-aws-s3-util", @@ -4699,7 +4810,7 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "clap", + "clap 4.3.1", "crossbeam-channel", "futures", "http", @@ -4732,7 +4843,7 @@ dependencies = [ "anyhow", "aws-sdk-sts", "bitflags", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "datadriven", "enum-kinds", "fail", @@ -4807,8 +4918,8 @@ version = "0.0.1" dependencies = [ "anyhow", "bytes", - "chrono", - "clap", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.3.1", "fallible-iterator", "futures", "itertools", @@ -4904,7 +5015,7 @@ name = "mz-stash-debug" version = "0.28.0-dev" dependencies = [ "anyhow", - "clap", + "clap 4.3.1", "mz-adapter", "mz-build-info", "mz-ore", @@ -4930,8 +5041,8 @@ dependencies = [ "axum", "bincode", "bytesize", - "chrono", - "clap", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.3.1", "crossbeam-channel", "csv-core", "datadriven", @@ -5011,7 +5122,7 @@ dependencies = [ "aws-credential-types", "aws-types", "bytes", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "dec", "derivative", "differential-dataflow", @@ -5070,7 +5181,7 @@ name = "mz-test-util" version = "0.0.0" dependencies = [ "anyhow", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "mz-kafka-util", "mz-ore", "rand", @@ -5095,8 +5206,8 @@ dependencies = [ "aws-types", "byteorder", "bytes", - "chrono", - "clap", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.3.1", "flate2", "futures", "globset", @@ -5898,7 +6009,7 @@ dependencies = [ [[package]] name = "postgres-protocol" version = "0.6.5" -source = "git+https://github.com/MaterializeInc/rust-postgres#dd70a8b9caec1bb056ff66782a8e8b72d446ffa5" +source = "git+https://github.com/MaterializeInc/rust-postgres#7bdd17b5acf4d7dbc53b08a9038793ab7e49da6c" dependencies = [ "base64 0.21.0", "byteorder", @@ -5915,10 +6026,10 @@ dependencies = [ [[package]] name = "postgres-types" version = "0.2.5" -source = "git+https://github.com/MaterializeInc/rust-postgres#dd70a8b9caec1bb056ff66782a8e8b72d446ffa5" +source = "git+https://github.com/MaterializeInc/rust-postgres#7bdd17b5acf4d7dbc53b08a9038793ab7e49da6c" dependencies = [ "bytes", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "fallible-iterator", "postgres-protocol", "serde", @@ -6041,30 +6152,6 @@ dependencies = [ "toml", ] -[[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.107", - "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-macro-hack" version = "0.5.19" @@ -6914,7 +7001,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef" dependencies = [ "base64 0.13.1", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "hex", "indexmap", "serde", @@ -7656,7 +7743,7 @@ dependencies = [ [[package]] name = "tokio-postgres" version = "0.7.8" -source = "git+https://github.com/MaterializeInc/rust-postgres#dd70a8b9caec1bb056ff66782a8e8b72d446ffa5" +source = "git+https://github.com/MaterializeInc/rust-postgres#7bdd17b5acf4d7dbc53b08a9038793ab7e49da6c" dependencies = [ "async-trait", "byteorder", @@ -8128,6 +8215,12 @@ name = "utf8parse" version = "0.2.0" source = "git+https://github.com/alacritty/vte#45670c47cebd7af050def2f80a307bdeec7caba3" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "1.2.2" @@ -8169,7 +8262,7 @@ version = "0.10.1" source = "git+https://github.com/alacritty/vte#45670c47cebd7af050def2f80a307bdeec7caba3" dependencies = [ "arrayvec", - "utf8parse", + "utf8parse 0.2.0", "vte_generate_state_changes", ] @@ -8508,8 +8601,8 @@ dependencies = [ "byteorder", "bytes", "cc", - "chrono", - "clap", + "chrono 0.4.26 (git+https://github.com/chronotope/chrono.git?branch=0.4.x)", + "clap 4.3.1", "criterion", "crossbeam-channel", "crossbeam-deque", @@ -8662,3 +8755,8 @@ dependencies = [ "cc", "libc", ] + +[[patch.unused]] +name = "chrono" +version = "0.4.24" +source = "git+https://github.com/chronotope/chrono.git?branch=0.4.x#ada0629bb45cf08e9ff72f0ac18fe5eb43d628cb" diff --git a/doc/user/content/sql/system-catalog/mz_catalog.md b/doc/user/content/sql/system-catalog/mz_catalog.md index 3935e63d19359..6061cce7247a7 100644 --- a/doc/user/content/sql/system-catalog/mz_catalog.md +++ b/doc/user/content/sql/system-catalog/mz_catalog.md @@ -360,7 +360,7 @@ Field | Type | Meaning `oid` | [`oid`] | A [PostgreSQL-compatible OID][oid] for the source. `schema_id` | [`uint8`] | The ID of the schema to which the source belongs. Corresponds to [`mz_schemas.id`](/sql/system-catalog/mz_catalog/#mz_schemas). `name` | [`text`] | The name of the source. -`type` | [`text`] | The type of the source: `kafka`, `postgres`, `load-generator`, or `subsource`. +`type` | [`text`] | The type of the source: `kafka`, `postgres`, `load-generator`, `progress`, or `subsource`. `connection_id` | [`text`] | The ID of the connection associated with the source, if any. Corresponds to [`mz_connections.id`](/sql/system-catalog/mz_catalog/#mz_connections). `size` | [`text`] | The [size](/sql/create-source/#sizing-a-source) of the source. `envelope_type` | [`text`] | The [envelope](/sql/create-source/#envelopes) of the source: `none`, `upsert`, or `debezium`. diff --git a/src/adapter/src/catalog.rs b/src/adapter/src/catalog.rs index 7dc5d83cf7ff1..a10936db643a4 100644 --- a/src/adapter/src/catalog.rs +++ b/src/adapter/src/catalog.rs @@ -1930,7 +1930,8 @@ impl Source { pub fn source_type(&self) -> &str { match &self.data_source { DataSourceDesc::Ingestion(ingestion) => ingestion.desc.connection.name(), - DataSourceDesc::Progress | DataSourceDesc::Source => "subsource", + DataSourceDesc::Progress => "progress", + DataSourceDesc::Source => "subsource", DataSourceDesc::Introspection(_) => "source", } } diff --git a/src/cluster/Cargo.toml b/src/cluster/Cargo.toml index 5d4cede0555fe..61e0712e66ec9 100644 --- a/src/cluster/Cargo.toml +++ b/src/cluster/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" async-trait = "0.1.68" bytesize = "1.1.0" -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.3.1", features = ["derive", "env"] } crossbeam-channel = "0.5.8" dec = { version = "0.4.8", features = ["serde"] } differential-dataflow = { git = "https://github.com/TimelyDataflow/differential-dataflow.git" } diff --git a/src/clusterd/Cargo.toml b/src/clusterd/Cargo.toml index d6838258ae3d6..ce68f18453377 100644 --- a/src/clusterd/Cargo.toml +++ b/src/clusterd/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" axum = "0.6.7" -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.3.1", features = ["derive", "env"] } fail = { version = "0.5.1", features = ["failpoints"] } futures = "0.3.25" mz-alloc = { path = "../alloc" } diff --git a/src/compute/Cargo.toml b/src/compute/Cargo.toml index 229738d786843..d7b40ccd2d52d 100644 --- a/src/compute/Cargo.toml +++ b/src/compute/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" async-trait = "0.1.68" bytesize = "1.1.0" -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.3.1", features = ["derive", "env"] } crossbeam-channel = "0.5.8" dec = { version = "0.4.8", features = ["serde"] } differential-dataflow = { git = "https://github.com/TimelyDataflow/differential-dataflow.git" } diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml index 8da26692a4243..878a7b278b638 100644 --- a/src/environmentd/Cargo.toml +++ b/src/environmentd/Cargo.toml @@ -17,7 +17,7 @@ base64 = "0.13.1" bytes = "1.3.0" bytesize = "1.1.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["wrap_help", "env", "derive"] } +clap = { version = "4.3.1", features = ["wrap_help", "env", "derive"] } fail = { version = "0.5.1", features = ["failpoints"] } futures = "0.3.25" headers = "0.3.8" diff --git a/src/interchange/Cargo.toml b/src/interchange/Cargo.toml index 1d01bc7ce2091..04a504b1a4cbb 100644 --- a/src/interchange/Cargo.toml +++ b/src/interchange/Cargo.toml @@ -15,7 +15,7 @@ harness = false anyhow = "1.0.66" byteorder = "1.4.3" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.3.1", features = ["derive"] } differential-dataflow = { git = "https://github.com/TimelyDataflow/differential-dataflow.git" } itertools = "0.10.5" once_cell = "1.16.0" diff --git a/src/kafka-util/Cargo.toml b/src/kafka-util/Cargo.toml index b52201bc3b4ee..c27bc91a3a641 100644 --- a/src/kafka-util/Cargo.toml +++ b/src/kafka-util/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.3.1", features = ["derive"] } crossbeam = "0.8.2" mz-avro = { path = "../avro" } mz-ccsr = { path = "../ccsr" } diff --git a/src/mz/Cargo.toml b/src/mz/Cargo.toml index b049e881bc8df..396bb6ad0e509 100644 --- a/src/mz/Cargo.toml +++ b/src/mz/Cargo.toml @@ -9,7 +9,7 @@ rust-version.workspace = true [dependencies] anyhow = "1.0.66" axum = { version = "0.6.7" } -clap = { version = "3.2.24", features = [ "derive" ] } +clap = { version = "4.3.1", features = [ "derive" ] } dirs = "4.0.0" indicatif = "0.17.2" mz-build-info = { path = "../build-info" } diff --git a/src/orchestrator-kubernetes/Cargo.toml b/src/orchestrator-kubernetes/Cargo.toml index 18a74232dc837..021b7d74b3cbe 100644 --- a/src/orchestrator-kubernetes/Cargo.toml +++ b/src/orchestrator-kubernetes/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" async-trait = "0.1.68" chrono = { version = "0.4.23", default-features = false } -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.3.1", features = ["derive"] } fail = { version = "0.5.1", features = ["failpoints"] } futures = "0.3.25" maplit = "1.0.2" diff --git a/src/orchestrator-tracing/Cargo.toml b/src/orchestrator-tracing/Cargo.toml index c0b3f2639a43e..506d27ea69fba 100644 --- a/src/orchestrator-tracing/Cargo.toml +++ b/src/orchestrator-tracing/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" async-trait = "0.1.68" -clap = { version = "3.2.24", features = ["env", "derive"] } +clap = { version = "4.3.1", features = ["env", "derive"] } futures-core = "0.3.21" http = "0.2.8" humantime = { version = "2.1.0", optional = true } diff --git a/src/ore/Cargo.toml b/src/ore/Cargo.toml index d13acf9bb769a..86021837ab656 100644 --- a/src/ore/Cargo.toml +++ b/src/ore/Cargo.toml @@ -18,7 +18,7 @@ anyhow = { version = "1.0.66", optional = true } async-trait = { version = "0.1.68", optional = true } bytes = { version = "1.3.0", optional = true } chrono = { version = "0.4.23", default-features = false, features = ["std"], optional = true } -clap = { version = "3.2.24", features = ["env"], optional = true } +clap = { version = "4.3.1", features = ["env"], optional = true } ctor = { version = "0.1.26", optional = true } either = "1.8.0" futures = { version = "0.3.25", optional = true } diff --git a/src/persist-client/Cargo.toml b/src/persist-client/Cargo.toml index 1f101119cd98f..8951b67430685 100644 --- a/src/persist-client/Cargo.toml +++ b/src/persist-client/Cargo.toml @@ -33,7 +33,7 @@ anyhow = { version = "1.0.66", features = ["backtrace"] } async-stream = "0.3.3" async-trait = "0.1.68" bytes = "1.3.0" -clap = { version = "3.2.24", features = [ "derive" ] } +clap = { version = "4.3.1", features = [ "derive" ] } differential-dataflow = { git = "https://github.com/TimelyDataflow/differential-dataflow.git" } futures = "0.3.25" futures-util = "0.3" @@ -67,7 +67,7 @@ tokio-console = ["mz-ore/tokio-console"] [dev-dependencies] async-trait = "0.1.68" axum = { version = "0.6.7" } -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.3.1", features = ["derive", "env"] } criterion = { version = "0.4.0", features = ["html_reports"] } datadriven = { version = "0.6.0", features = ["async"] } futures-task = "0.3.21" diff --git a/src/pgtest/Cargo.toml b/src/pgtest/Cargo.toml index 10c349bc3b752..5a0c59d644542 100644 --- a/src/pgtest/Cargo.toml +++ b/src/pgtest/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" bytes = "1.3.0" -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.3.1", features = ["derive"] } datadriven = "0.6.0" fallible-iterator = "0.2.0" mz-ore = { path = "../ore", features = ["cli"] } diff --git a/src/s3-datagen/Cargo.toml b/src/s3-datagen/Cargo.toml index e10adae824cb5..7a47e45179f45 100644 --- a/src/s3-datagen/Cargo.toml +++ b/src/s3-datagen/Cargo.toml @@ -11,7 +11,7 @@ anyhow = "1.0.66" aws-config = { version = "0.55", default-features = false, features = ["native-tls"] } aws-sdk-s3 = { version = "0.26", default-features = false, features = ["native-tls", "rt-tokio"] } bytefmt = "0.1.7" -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.3.1", features = ["derive"] } futures = "0.3.25" indicatif = "0.17.2" mz-aws-s3-util = { path = "../aws-s3-util" } diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml index c9bd084939c88..3e8f28ab5e975 100644 --- a/src/service/Cargo.toml +++ b/src/service/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" async-stream = "0.3.3" async-trait = "0.1.68" -clap = { version = "3.2.24", features = ["env", "derive"] } +clap = { version = "4.3.1", features = ["env", "derive"] } crossbeam-channel = "0.5.8" futures = "0.3.25" http = "0.2.8" diff --git a/src/sqllogictest/Cargo.toml b/src/sqllogictest/Cargo.toml index 9554de6045313..addee937c9cd2 100644 --- a/src/sqllogictest/Cargo.toml +++ b/src/sqllogictest/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" bytes = "1.3.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.3.1", features = ["derive"] } fallible-iterator = "0.2.0" futures = "0.3.25" itertools = "0.10.5" diff --git a/src/stash-debug/Cargo.toml b/src/stash-debug/Cargo.toml index 07123776627f5..21cecca2e2870 100644 --- a/src/stash-debug/Cargo.toml +++ b/src/stash-debug/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] anyhow = "1.0.66" -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.3.1", features = ["derive", "env"] } mz-adapter = { path = "../adapter" } mz-build-info = { path = "../build-info" } mz-ore = { path = "../ore" } diff --git a/src/storage-client/src/client.rs b/src/storage-client/src/client.rs index 6f7cb2b3c5873..3c55d007294f6 100644 --- a/src/storage-client/src/client.rs +++ b/src/storage-client/src/client.rs @@ -114,6 +114,39 @@ pub enum StorageCommand { CreateSinks(Vec>), } +// /// A list of identifiers of traces, with new upper frontiers. +// /// +// /// TODO(teskje): Consider also reporting the previous upper frontier and using that +// /// information to assert the correct implementation of our protocols at various places. +// FrontierUppers(Vec<(GlobalId, Antichain)>), +// /// Punctuation indicates that no more responses will be transmitted for the specified ids +// DroppedIds(BTreeSet), + +// /// A list of statistics updates, currently only for sources. +// StatisticsUpdates(Vec, Vec), + +impl StorageCommand { + fn expected_response(&self) -> Option> { + match self { + StorageCommand::AllowCompaction(compactions) => { + if compactions.iter().any(|(_, frontier)| frontier.is_empty()) { + Some(StorageResponse::DroppedIds( + compactions + .iter() + .filter_map( + |(id, frontier)| if frontier.is_empty() { Some(*id) } else { None }, + ) + .collect(), + )) + } else { + None + } + } + _ => None, + } + } +} + /// A command that starts ingesting the given ingestion description #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] pub struct CreateSourceCommand { diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index 6d1ed2ab9e72a..829f9a35d7010 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -17,7 +17,7 @@ async-trait = "0.1.68" bytesize = "1.1.0" bincode = "1" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.3.1", features = ["derive", "env"] } crossbeam-channel = "0.5.8" csv-core = { version = "0.1.10" } dec = "0.4.8" @@ -84,7 +84,7 @@ tonic-build = "0.8.2" [dev-dependencies] async-trait = "0.1.68" axum = { version = "0.6.7" } -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.3.1", features = ["derive", "env"] } datadriven = { version = "0.6.0", features = ["async"] } humantime = "2.1.0" mz-http-util = { path = "../http-util" } diff --git a/src/testdrive/Cargo.toml b/src/testdrive/Cargo.toml index a110e133b7317..ccce4da13e413 100644 --- a/src/testdrive/Cargo.toml +++ b/src/testdrive/Cargo.toml @@ -18,7 +18,7 @@ aws-types = "0.55" byteorder = "1.4.3" bytes = "1.3.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.3.1", features = ["derive"] } flate2 = "1.0.24" futures = "0.3.25" globset = "0.4.9" diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index b3979e57115ee..34d3a7e9ad68d 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -26,7 +26,7 @@ bstr = { version = "0.2.14" } byteorder = { version = "1.4.3" } bytes = { version = "1.3.0" } chrono = { git = "https://github.com/chronotope/chrono.git", branch = "0.4.x", default-features = false, features = ["alloc", "clock", "serde"] } -clap = { version = "3.2.24", features = ["derive", "env", "wrap_help"] } +clap = { version = "4.3.1", features = ["derive", "env", "wrap_help"] } criterion = { version = "0.4.0", features = ["async_tokio", "html_reports"] } crossbeam-channel = { version = "0.5.8" } crossbeam-deque = { version = "0.8.2" } @@ -123,7 +123,7 @@ byteorder = { version = "1.4.3" } bytes = { version = "1.3.0" } cc = { version = "1.0.78", default-features = false, features = ["parallel"] } chrono = { git = "https://github.com/chronotope/chrono.git", branch = "0.4.x", default-features = false, features = ["alloc", "clock", "serde"] } -clap = { version = "3.2.24", features = ["derive", "env", "wrap_help"] } +clap = { version = "4.3.1", features = ["derive", "env", "wrap_help"] } criterion = { version = "0.4.0", features = ["async_tokio", "html_reports"] } crossbeam-channel = { version = "0.5.8" } crossbeam-deque = { version = "0.8.2" } diff --git a/test/pg-cdc/pg-cdc.td b/test/pg-cdc/pg-cdc.td index 0d49e71612c96..a722fd2f8e1b6 100644 --- a/test/pg-cdc/pg-cdc.td +++ b/test/pg-cdc/pg-cdc.td @@ -267,7 +267,7 @@ escaped_text_table subsource large_text subsource multipart_pk subsource mz_source postgres ${arg.default-storage-size} -mz_source_progress subsource +mz_source_progress progress no_replica_identity subsource nonpk_table subsource nulls_table subsource @@ -643,7 +643,7 @@ contains: invalid TEXT COLUMNS option value: table utf8_table not found in sourc > SELECT * FROM (SHOW SOURCES) WHERE name LIKE '%enum%'; another_enum_table subsource enum_source postgres ${arg.default-storage-size} -enum_source_progress subsource +enum_source_progress progress enum_table subsource > SELECT * FROM enum_table @@ -685,7 +685,7 @@ regex:Source error: .*: db error: ERROR: publication "mz_source" does not exist > SHOW SOURCES another_source postgres ${arg.default-storage-size} -another_source_progress subsource +another_source_progress progress another_table subsource > DROP SOURCE another_source diff --git a/test/testdrive/get-started.td b/test/testdrive/get-started.td index aa4ec9186a4a9..b68f2f15a8213 100644 --- a/test/testdrive/get-started.td +++ b/test/testdrive/get-started.td @@ -15,7 +15,7 @@ name type size ---------------------------------- demo load-generator ${arg.default-storage-size} -demo_progress subsource +demo_progress progress accounts subsource auctions subsource bids subsource diff --git a/test/testdrive/load-generator.td b/test/testdrive/load-generator.td index c9b1d972b60cf..a686c56743883 100644 --- a/test/testdrive/load-generator.td +++ b/test/testdrive/load-generator.td @@ -15,7 +15,7 @@ ALTER SYSTEM SET enable_format_json = true > SHOW SOURCES accounts subsource auction_house load-generator ${arg.default-storage-size} -auction_house_progress subsource +auction_house_progress progress auctions subsource bids subsource organizations subsource @@ -27,7 +27,7 @@ users subsource > SHOW SOURCES FROM a; auction_bids load-generator ${arg.default-storage-size} -auction_bids_progress subsource +auction_bids_progress progress bids subsource # For Tables with mentioned schema should work @@ -37,7 +37,7 @@ bids subsource > SHOW SOURCES FROM another; accounts subsource auction_house load-generator ${arg.default-storage-size} -auction_house_progress subsource +auction_house_progress progress auctions subsource bids subsource organizations subsource @@ -52,7 +52,7 @@ users subsource > SHOW SOURCES FROM foo; auction_subset load-generator ${arg.default-storage-size} -auction_subset_progress subsource +auction_subset_progress progress foo_bids subsource > SHOW SOURCES FROM bar; diff --git a/test/testdrive/materializations.td b/test/testdrive/materializations.td index 509c9b3014b63..c721228d92f62 100644 --- a/test/testdrive/materializations.td +++ b/test/testdrive/materializations.td @@ -338,7 +338,7 @@ a b name type size --------------------- data kafka ${arg.default-storage-size} -data_progress subsource +data_progress progress mat_data kafka ${arg.default-storage-size} mat_data_progress subsource diff --git a/test/testdrive/rename.td b/test/testdrive/rename.td index f117e3c08f935..3e443f81d1187 100644 --- a/test/testdrive/rename.td +++ b/test/testdrive/rename.td @@ -190,8 +190,8 @@ renamed_sink > SHOW SOURCES; name type size ------------------------------ -renamed_mz_data kafka ${arg.default-storage-size} -mz_data_progress subsource +renamed_mz_data kafka ${arg.default-storage-size} +mz_data_progress progress # Sink was successfully renamed > SHOW SINKS diff --git a/test/testdrive/tpch.td b/test/testdrive/tpch.td index 374aa08e1a619..2500d475daf93 100644 --- a/test/testdrive/tpch.td +++ b/test/testdrive/tpch.td @@ -30,7 +30,7 @@ name type size -------------------------------- customer subsource gen load-generator ${source-size} - gen_progress subsource + gen_progress progress lineitem subsource nation subsource orders subsource