feat: Update to Rust 1.85 and 2024 Edition (#26046)

Author: mgattozzi

Cargo.toml

@@ -37,7 +37,7 @@ exclude = [
 [workspace.package]
 version = "0.1.0"
 authors = ["InfluxData OSS Developers"]
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]

influxdb3/src/commands/create.rs

@@ -1,13 +1,13 @@
 use crate::commands::common::{
-    parse_key_val, DataType, InfluxDb3Config, SeparatedKeyValue, SeparatedList,
+    DataType, InfluxDb3Config, SeparatedKeyValue, SeparatedList, parse_key_val,
 };
-use base64::engine::general_purpose::URL_SAFE_NO_PAD as B64;
 use base64::Engine as _;
+use base64::engine::general_purpose::URL_SAFE_NO_PAD as B64;
 use hashbrown::HashMap;
 use influxdb3_client::Client;
 use influxdb3_wal::TriggerSpecificationDefinition;
-use rand::rngs::OsRng;
 use rand::RngCore;
+use rand::rngs::OsRng;
 use secrecy::ExposeSecret;
 use secrecy::Secret;
 use sha2::Digest;

influxdb3/src/commands/query.rs

@@ -3,7 +3,7 @@ use std::str::Utf8Error;
 use clap::{Parser, ValueEnum};
 use secrecy::ExposeSecret;
 use std::fs;
-use std::io::{stdin, BufReader, IsTerminal, Read};
+use std::io::{BufReader, IsTerminal, Read, stdin};
 use tokio::{
     fs::OpenOptions,
     io::{self, AsyncWriteExt},

influxdb3/src/commands/serve.rs

@@ -1,6 +1,6 @@
 //! Entrypoint for InfluxDB 3 Core Server
 
-use anyhow::{bail, Context};
+use anyhow::{Context, bail};
 use datafusion_util::config::register_iox_object_store;
 use influxdb3_cache::{
     distinct_cache::DistinctCacheProvider,
@@ -16,29 +16,30 @@ use influxdb3_clap_blocks::{
     tokio::TokioDatafusionConfig,
 };
 use influxdb3_process::{
-    build_malloc_conf, setup_metric_registry, INFLUXDB3_GIT_HASH, INFLUXDB3_VERSION, PROCESS_UUID,
+    INFLUXDB3_GIT_HASH, INFLUXDB3_VERSION, PROCESS_UUID, build_malloc_conf, setup_metric_registry,
 };
+use influxdb3_processing_engine::ProcessingEngineManagerImpl;
 use influxdb3_processing_engine::environment::{
     DisabledManager, PipManager, PythonEnvironmentManager, UVManager,
 };
 use influxdb3_processing_engine::plugins::ProcessingEngineEnvironmentManager;
-use influxdb3_processing_engine::ProcessingEngineManagerImpl;
 use influxdb3_server::{
+    CommonServerState,
     auth::AllOrNothingAuthorizer,
     builder::ServerBuilder,
     query_executor::{CreateQueryExecutorArgs, QueryExecutorImpl},
-    serve, CommonServerState,
+    serve,
 };
 use influxdb3_sys_events::SysEventStore;
 use influxdb3_telemetry::store::TelemetryStore;
 use influxdb3_wal::{Gen1Duration, WalConfig};
 use influxdb3_write::{
+    WriteBuffer,
     persister::Persister,
     write_buffer::{
-        check_mem_and_force_snapshot_loop, persisted_files::PersistedFiles, WriteBufferImpl,
-        WriteBufferImplArgs,
+        WriteBufferImpl, WriteBufferImplArgs, check_mem_and_force_snapshot_loop,
+        persisted_files::PersistedFiles,
     },
-    WriteBuffer,
 };
 use iox_query::exec::{DedicatedExecutor, Executor, ExecutorConfig};
 use iox_time::SystemProvider;

influxdb3/src/commands/write.rs

@@ -1,6 +1,6 @@
 use std::{
     fs,
-    io::{stdin, BufReader, IsTerminal, Read},
+    io::{BufReader, IsTerminal, Read, stdin},
 };
 
 use clap::Parser;

influxdb3/src/main.rs

@@ -14,12 +14,15 @@ use dotenvy::dotenv;
 use influxdb3_clap_blocks::tokio::TokioIoConfig;
 use influxdb3_process::VERSION_STRING;
 use observability_deps::tracing::warn;
-use std::env;
-use std::path::{Path, PathBuf};
+#[cfg(feature = "system-py")]
+use std::{
+    env,
+    path::{Path, PathBuf},
+};
 use trogging::{
-    cli::LoggingConfigBuilderExt,
-    tracing_subscriber::{prelude::*, Registry},
     TroggingGuard,
+    cli::LoggingConfigBuilderExt,
+    tracing_subscriber::{Registry, prelude::*},
 };
 
 pub mod commands {
@@ -264,21 +267,23 @@ unsafe extern "C" fn signal_handler(sig: i32) {
 #[cfg(unix)]
 unsafe fn set_signal_handler(signal: libc::c_int, handler: unsafe extern "C" fn(libc::c_int)) {
     use libc::{sigaction, sigfillset, sighandler_t};
-    let mut sigset = std::mem::zeroed();
+    let mut sigset = unsafe { std::mem::zeroed() };
 
     // Block all signals during the handler. This is the expected behavior, but
     // it's not guaranteed by `signal()`.
-    if sigfillset(&mut sigset) != -1 {
+    if unsafe { sigfillset(&mut sigset) } != -1 {
         // Done because sigaction has private members.
         // This is safe because sa_restorer and sa_handlers are pointers that
         // might be null (that is, zero).
-        let mut action: sigaction = std::mem::zeroed();
+        let mut action: sigaction = unsafe { std::mem::zeroed() };
 
         // action.sa_flags = 0;
         action.sa_mask = sigset;
         action.sa_sigaction = handler as sighandler_t;
 
-        sigaction(signal, &action, std::ptr::null_mut());
+        unsafe {
+            sigaction(signal, &action, std::ptr::null_mut());
+        }
     }
 }
 

influxdb3/tests/cli/mod.rs

@@ -1,9 +1,9 @@
 use crate::server::{ConfigProvider, TestServer};
-use assert_cmd::cargo::CommandCargoExt;
 use assert_cmd::Command as AssertCmd;
+use assert_cmd::cargo::CommandCargoExt;
 use observability_deps::tracing::debug;
 use pretty_assertions::assert_eq;
-use serde_json::{json, Value};
+use serde_json::{Value, json};
 use std::{
     io::Write,
     process::{Command, Stdio},
@@ -1110,8 +1110,7 @@ async fn test_show_system() {
             ],
         },
         SuccessTestCase {
-            name:
-                "table NAME should show queries table without information or system schema queries",
+            name: "table NAME should show queries table without information or system schema queries",
             args: vec![
                 "show",
                 "system",
@@ -1155,11 +1154,29 @@ async fn test_show_system() {
         },
         FailTestCase {
             name: "random table name doesn't exist, should error",
-            args: vec!["show", "system", "--host", server_addr.as_str(), "--database", db_name, "table", "meow"],
+            args: vec![
+                "show",
+                "system",
+                "--host",
+                server_addr.as_str(),
+                "--database",
+                db_name,
+                "table",
+                "meow",
+            ],
         },
         FailTestCase {
             name: "iox schema table name exists, but should error because we're concerned here with system tables",
-            args: vec!["show", "system", "--host", server_addr.as_str(), "--database", db_name, "table", "cpu"],
+            args: vec![
+                "show",
+                "system",
+                "--host",
+                server_addr.as_str(),
+                "--database",
+                db_name,
+                "table",
+                "cpu",
+            ],
         },
     ];
 
@@ -1412,7 +1429,7 @@ async fn test_wal_plugin_errors() {
         expected_error: &'static str,
     }
 
-    let  tests = vec![
+    let tests = vec![
         Test {
             name: "invalid_python",
             plugin_code: r#"
@@ -1467,7 +1484,7 @@ def process_writes(influxdb3_local, table_batches, args=None):
     influxdb3_local.query("SELECT foo FROM not_here")
 "#,
             expected_error: "error executing plugin: QueryError: error: error while planning query: Error during planning: table 'public.iox.not_here' not found executing query: SELECT foo FROM not_here",
-        }
+        },
     ];
 
     let plugin_dir = TempDir::new().unwrap();

influxdb3/tests/server/auth.rs

@@ -3,7 +3,7 @@ use arrow_util::assert_batches_sorted_eq;
 use influxdb3_client::Precision;
 use reqwest::StatusCode;
 
-use crate::server::{collect_stream, ConfigProvider, TestServer};
+use crate::server::{ConfigProvider, TestServer, collect_stream};
 
 #[tokio::test]
 async fn auth() {

influxdb3/tests/server/configure.rs

@@ -1,7 +1,7 @@
 use hyper::StatusCode;
 use observability_deps::tracing::debug;
 use pretty_assertions::assert_eq;
-use serde_json::{json, Value};
+use serde_json::{Value, json};
 use test_helpers::assert_contains;
 
 use crate::server::TestServer;
@@ -97,8 +97,7 @@ async fn api_v3_configure_distinct_cache_create() {
             ..Default::default()
         },
         TestCase {
-            description:
-                "identical to previous request, still success, but results in no 204 content",
+            description: "identical to previous request, still success, but results in no 204 content",
             db: Some("foo"),
             table: Some("bar"),
             columns: &["t1", "t2"],
@@ -480,8 +479,7 @@ async fn api_v3_configure_last_cache_create() {
             ..Default::default()
         },
         TestCase {
-            description:
-                "Will create new cache, because key columns are unique, and so will be the name",
+            description: "Will create new cache, because key columns are unique, and so will be the name",
             db: Some(db_name),
             table: Some(tbl_name),
             key_cols: Some(&["t1", "t2"]),