chore(toolchain): bump to 2022-12-12

ci/build-ci-image.sh

@@ -14,7 +14,7 @@ export RUST_TOOLCHAIN=$(cat ../rust-toolchain)
 # !!! CHANGE THIS WHEN YOU WANT TO BUMP CI IMAGE !!! #
 #          AND ALSO docker-compose.yml               #
 ######################################################
-export BUILD_ENV_VERSION=v20221123
+export BUILD_ENV_VERSION=v20221208
 
 export BUILD_TAG="public.ecr.aws/x5u3w5h6/rw-build-env:${BUILD_ENV_VERSION}"
 

ci/docker-compose.yml

@@ -61,35 +61,35 @@ services:
       - "5980:8681"
 
   source-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20221123
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20221208
     depends_on:
       - mysql
     volumes:
       - ..:/risingwave
 
   sink-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20221123
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20221208
     depends_on:
       - mysql
       - db
     volumes:
       - ..:/risingwave
 
   rw-build-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20221123
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20221208
     volumes:
       - ..:/risingwave
 
   regress-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20221123
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20221208
     depends_on:
       db:
         condition: service_healthy
     volumes:
       - ..:/risingwave
 
   benchmark-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20221123
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20221208
     depends_on:
       - kafka
     volumes:

ci/scripts/build.sh

@@ -28,7 +28,7 @@ echo "--- Rust cargo-sort check"
 cargo sort -c -w
 
 echo "--- Rust cargo-hakari check"
-cargo hakari verify
+cargo hakari generate --diff
 
 echo "--- Rust format check"
 cargo fmt --all -- --check

rust-toolchain

@@ -1 +1 @@
-nightly-2022-10-16
+nightly-2022-11-21

src/batch/src/task/consistent_hash_shuffle_channel.rs

@@ -107,7 +107,7 @@ fn generate_new_data_chunks(
 }
 
 impl ChanSender for ConsistentHashShuffleSender {
-    type SendFuture<'a> = impl Future<Output = BatchResult<()>>;
+    type SendFuture<'a> = impl Future<Output = BatchResult<()>> + 'a;
 
     fn send(&mut self, chunk: Option<DataChunk>) -> Self::SendFuture<'_> {
         async move {
@@ -152,7 +152,7 @@ impl ConsistentHashShuffleSender {
 }
 
 impl ChanReceiver for ConsistentHashShuffleReceiver {
-    type RecvFuture<'a> = impl Future<Output = Result<Option<DataChunkInChannel>>>;
+    type RecvFuture<'a> = impl Future<Output = Result<Option<DataChunkInChannel>>> + 'a;
 
     fn recv(&mut self) -> Self::RecvFuture<'_> {
         async move {

src/common/src/array/stream_chunk.rs

@@ -246,7 +246,7 @@ impl StreamChunk {
                     None => "".to_owned(), // NULL
                     Some(scalar) => scalar.to_text(),
                 };
-                cells.push(Cell::new(&str));
+                cells.push(Cell::new(str));
             }
             table.add_row(cells);
         }

src/connector/src/source/filesystem/s3/s3_dir.rs

@@ -134,8 +134,8 @@ pub async fn new_share_config(
             secret_access,
             session_token,
         } => SharedCredentialsProvider::new(aws_types::Credentials::from_keys(
-            &access_key,
-            &secret_access,
+            access_key,
+            secret_access,
             session_token,
         )),
     };

src/risedevtool/src/bin/risedev-dev.rs

@@ -413,7 +413,7 @@ fn main() -> Result<()> {
 
             std::fs::write(
                 Path::new(&env::var("PREFIX_CONFIG")?).join("risectl-env"),
-                &risectl_env,
+                risectl_env,
             )?;
 
             println!("All services started successfully.");

src/risedevtool/src/compose.rs

@@ -413,17 +413,17 @@ impl Compose for GrafanaConfig {
         let config_root = Path::new(&config.config_directory);
         std::fs::write(
             config_root.join("grafana.ini"),
-            &GrafanaGen.gen_custom_ini(self),
+            GrafanaGen.gen_custom_ini(self),
         )?;
 
         std::fs::write(
             config_root.join("grafana-risedev-datasource.yml"),
-            &GrafanaGen.gen_datasource_yml(self)?,
+            GrafanaGen.gen_datasource_yml(self)?,
         )?;
 
         std::fs::write(
             config_root.join("grafana-risedev-dashboard.yml"),
-            &GrafanaGen.gen_dashboard_yml(self, config_root, "/")?,
+            GrafanaGen.gen_dashboard_yml(self, config_root, "/")?,
         )?;
 
         let service = ComposeService {

src/risedevtool/src/compose_deploy.rs

@@ -241,7 +241,7 @@ fi
         x
     };
     let deploy_sh = Path::new(output_directory).join("deploy.sh");
-    fs::write(&deploy_sh, &shell_script)?;
+    fs::write(&deploy_sh, shell_script)?;
     let mut perms = fs::metadata(&deploy_sh)?.permissions();
     perms.set_mode(perms.mode() | 0o755);
     fs::set_permissions(&deploy_sh, perms)?;

src/risedevtool/src/task/grafana_service.rs

@@ -59,15 +59,15 @@ impl GrafanaService {
 
         std::fs::write(
             config_root.join("custom.ini"),
-            &GrafanaGen.gen_custom_ini(config),
+            GrafanaGen.gen_custom_ini(config),
         )?;
 
         let config_datasources_dir = config_root.join("provisioning").join("datasources");
         std::fs::remove_dir_all(&config_datasources_dir)?;
         std::fs::create_dir_all(&config_datasources_dir)?;
         std::fs::write(
             config_datasources_dir.join("risedev-prometheus.yml"),
-            &GrafanaGen.gen_datasource_yml(config)?,
+            GrafanaGen.gen_datasource_yml(config)?,
         )?;
 
         let prefix_config = prefix_config.as_ref();
@@ -76,7 +76,7 @@ impl GrafanaService {
         std::fs::create_dir_all(&config_dashboards_dir)?;
         std::fs::write(
             config_dashboards_dir.join("risingwave-dashboard.yaml"),
-            &GrafanaGen.gen_dashboard_yml(config, prefix_config, prefix_config)?,
+            GrafanaGen.gen_dashboard_yml(config, prefix_config, prefix_config)?,
         )?;
         // std::fs::write(
         //     config_dashboards_dir.join("aws-s3-dashboards.yaml"),

src/risedevtool/src/task/kafka_service.rs

@@ -67,7 +67,7 @@ impl Task for KafkaService {
         let config_path = Path::new(&prefix_config).join(format!("{}.properties", self.id()));
         std::fs::write(
             &config_path,
-            &KafkaGen.gen_server_properties(&self.config, &path.to_string_lossy()),
+            KafkaGen.gen_server_properties(&self.config, &path.to_string_lossy()),
         )?;
 
         let mut cmd = self.kafka()?;

src/risedevtool/src/task/prometheus_service.rs

@@ -65,7 +65,7 @@ impl Task for PrometheusService {
 
         std::fs::write(
             Path::new(&prefix_config).join("prometheus.yml"),
-            &PrometheusGen.gen_prometheus_yml(&self.config),
+            PrometheusGen.gen_prometheus_yml(&self.config),
         )?;
 
         let mut cmd = self.prometheus()?;

src/risedevtool/src/task/zookeeper_service.rs

@@ -67,7 +67,7 @@ impl Task for ZooKeeperService {
         let config_path = Path::new(&prefix_config).join(format!("{}.properties", self.id()));
         std::fs::write(
             &config_path,
-            &ZooKeeperGen.gen_server_properties(&self.config, &path.to_string_lossy()),
+            ZooKeeperGen.gen_server_properties(&self.config, &path.to_string_lossy()),
         )?;
 
         let mut cmd = self.zookeeper()?;

src/source/src/parser/protobuf/parser.rs

@@ -333,7 +333,7 @@ mod test {
         let dir = PathBuf::from("src/test_data");
         format!(
             "file://{}",
-            std::fs::canonicalize(&dir).unwrap().to_str().unwrap()
+            std::fs::canonicalize(dir).unwrap().to_str().unwrap()
         )
     }
 

src/storage/hummock_sdk/src/key_cmp.rs

@@ -114,15 +114,15 @@ mod tests {
         let key3 = UserKey::for_test(TableId::new(1), b"0".to_vec());
 
         assert_eq!(
-            KeyComparator::compare_user_key_cross_format(&key1.encode(), &key1),
+            KeyComparator::compare_user_key_cross_format(key1.encode(), &key1),
             Ordering::Equal
         );
         assert_eq!(
-            KeyComparator::compare_user_key_cross_format(&key1.encode(), &key2),
+            KeyComparator::compare_user_key_cross_format(key1.encode(), &key2),
             Ordering::Less
         );
         assert_eq!(
-            KeyComparator::compare_user_key_cross_format(&key2.encode(), &key3),
+            KeyComparator::compare_user_key_cross_format(key2.encode(), &key3),
             Ordering::Less
         );
     }

src/storage/src/store_impl.rs

@@ -409,7 +409,7 @@ pub mod verify {
     impl<A: StateStore, E: StateStore> StateStore for VerifyStateStore<A, E> {
         type Local = VerifyStateStore<A::Local, E::Local>;
 
-        type NewLocalFuture<'a> = impl Future<Output = Self::Local> + Send;
+        type NewLocalFuture<'a> = impl Future<Output = Self::Local> + Send + 'a;
 
         define_state_store_associated_type!();
 

src/stream/src/executor/mod.rs

@@ -670,7 +670,6 @@ pub type PkIndicesRef<'a> = &'a [usize];
 pub type PkDataTypes = SmallVec<[DataType; 1]>;
 
 /// Expect the first message of the given `stream` as a barrier.
-#[track_caller]
 pub async fn expect_first_barrier(
     stream: &mut (impl MessageStream + Unpin),
 ) -> StreamExecutorResult<Barrier> {
@@ -686,7 +685,6 @@ pub async fn expect_first_barrier(
 }
 
 /// Expect the first message of the given `stream` as a barrier.
-#[track_caller]
 pub async fn expect_first_barrier_from_aligned_stream(
     stream: &mut (impl AlignedMessageStream + Unpin),
 ) -> StreamExecutorResult<Barrier> {

src/stream/src/lib.rs

@@ -27,7 +27,6 @@
 #![feature(generators)]
 #![feature(proc_macro_hygiene)]
 #![feature(stmt_expr_attributes)]
-#![feature(unzip_option)]
 #![feature(allocator_api)]
 #![feature(map_try_insert)]
 #![feature(result_option_inspect)]

src/workspace-hack/Cargo.toml

@@ -28,7 +28,6 @@ criterion = { version = "0.4", features = ["async", "async_futures", "async_toki
 crossbeam-channel = { version = "0.5", features = ["crossbeam-utils", "std"] }
 crossbeam-deque = { version = "0.8", features = ["crossbeam-epoch", "crossbeam-utils", "std"] }
 crossbeam-epoch = { version = "0.9", features = ["alloc", "once_cell", "std"] }
-crossbeam-utils = { version = "0.8", features = ["once_cell", "std"] }
 either = { version = "1", features = ["use_std"] }
 fail = { version = "0.5", default-features = false, features = ["failpoints"] }
 fixedbitset = { version = "0.4", features = ["std"] }
@@ -69,7 +68,6 @@ parking_lot_core = { version = "0.9", default-features = false, features = ["bac
 petgraph = { version = "0.6", features = ["graphmap", "matrix_graph", "stable_graph"] }
 phf = { version = "0.11", features = ["std", "uncased"] }
 phf_shared = { version = "0.11", features = ["std", "uncased"] }
-postgres-types = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "87ca1dc", default-features = false, features = ["chrono-04", "derive", "postgres-derive", "with-chrono-0_4"] }
 prometheus = { version = "0.13", features = ["libc", "process", "procfs", "protobuf"] }
 prost = { version = "0.11", features = ["no-recursion-limit", "prost-derive", "std"] }
 prost-types = { version = "0.11", features = ["std"] }
@@ -79,7 +77,6 @@ regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cac
 regex-syntax = { version = "0.6", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
 reqwest = { version = "0.11", features = ["__tls", "default-tls", "hyper-tls", "json", "native-tls-crate", "serde_json", "tokio-native-tls"] }
 ring = { version = "0.16", features = ["alloc", "dev_urandom_fallback", "once_cell", "std"] }
-rust_decimal = { version = "1", features = ["byteorder", "bytes", "db-tokio-postgres", "postgres", "rand", "serde", "std", "tokio-postgres"] }
 scopeguard = { version = "1", features = ["use_std"] }
 serde = { version = "1", features = ["alloc", "derive", "rc", "serde_derive", "std"] }
 smallvec = { version = "1", default-features = false, features = ["serde", "union", "write"] }
@@ -114,7 +111,6 @@ criterion = { version = "0.4", features = ["async", "async_futures", "async_toki
 crossbeam-channel = { version = "0.5", features = ["crossbeam-utils", "std"] }
 crossbeam-deque = { version = "0.8", features = ["crossbeam-epoch", "crossbeam-utils", "std"] }
 crossbeam-epoch = { version = "0.9", features = ["alloc", "once_cell", "std"] }
-crossbeam-utils = { version = "0.8", features = ["once_cell", "std"] }
 either = { version = "1", features = ["use_std"] }
 fail = { version = "0.5", default-features = false, features = ["failpoints"] }
 fixedbitset = { version = "0.4", features = ["std"] }
@@ -155,7 +151,6 @@ parking_lot_core = { version = "0.9", default-features = false, features = ["bac
 petgraph = { version = "0.6", features = ["graphmap", "matrix_graph", "stable_graph"] }
 phf = { version = "0.11", features = ["std", "uncased"] }
 phf_shared = { version = "0.11", features = ["std", "uncased"] }
-postgres-types = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "87ca1dc", default-features = false, features = ["chrono-04", "derive", "postgres-derive", "with-chrono-0_4"] }
 proc-macro2 = { version = "1", features = ["proc-macro", "span-locations"] }
 prometheus = { version = "0.13", features = ["libc", "process", "procfs", "protobuf"] }
 prost = { version = "0.11", features = ["no-recursion-limit", "prost-derive", "std"] }
@@ -166,7 +161,6 @@ regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cac
 regex-syntax = { version = "0.6", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
 reqwest = { version = "0.11", features = ["__tls", "default-tls", "hyper-tls", "json", "native-tls-crate", "serde_json", "tokio-native-tls"] }
 ring = { version = "0.16", features = ["alloc", "dev_urandom_fallback", "once_cell", "std"] }
-rust_decimal = { version = "1", features = ["byteorder", "bytes", "db-tokio-postgres", "postgres", "rand", "serde", "std", "tokio-postgres"] }
 scopeguard = { version = "1", features = ["use_std"] }
 serde = { version = "1", features = ["alloc", "derive", "rc", "serde_derive", "std"] }
 smallvec = { version = "1", default-features = false, features = ["serde", "union", "write"] }