chore: patch enterprise back to core (#25798)

deny.toml

@@ -1,7 +1,8 @@
 # Configuration documentation:
-#   https://embarkstudios.github.io/cargo-deny/index.html
+#   https://embarkstudios.github.io/cargo-deny/index.html
 
 [advisories]
+version = 2
 yanked = "deny"
 ignore = [
     # dependent on datafusion-common moving away from instant
@@ -11,6 +12,8 @@ ignore = [
 git-fetch-with-cli = true
 
 [licenses]
+version = 2
+unused-allowed-license = "warn"
 allow = [
     "Apache-2.0",
     "BSD-2-Clause",
@@ -22,7 +25,6 @@ allow = [
     "Unicode-3.0",
     "Zlib",
 ]
-
 exceptions = [
     # We should probably NOT bundle CA certs but use the OS ones.
     { name = "webpki-roots", allow = ["MPL-2.0"] },
@@ -41,10 +43,10 @@ license-files = [
 github = ["influxdata"]
 
 [bans]
-multiple-versions = "warn"
+multiple-versions = "allow"
 deny = [
-    # We are using rustls as the TLS implementation, so we shouldn't be linking
-    # in OpenSSL too.
+    # We are using rustls as the TLS implementation, so we shouldn't be linking
+    # in OpenSSL too.
     #
     # If you're hitting this, you might want to take a look at what new
     # dependencies you have introduced and check if there's a way to depend on
@@ -53,4 +55,6 @@ deny = [
     # We've decided to use the `humantime` crate to parse and generate friendly time formats; use
     # that rather than chrono-english.
     { name = "chrono-english" },
+    # Use stdlib ( https://doc.rust-lang.org/stable/std/io/trait.IsTerminal.html )
+    { name = "atty" },
 ]

influxdb3_cache/src/distinct_cache/cache.rs

@@ -473,7 +473,7 @@ impl Node {
                         let block = builder.append_block(value.0.as_bytes().into());
                         for _ in 0..count {
                             builder
-                                .try_append_view(block, 0u32, value.0.as_bytes().len() as u32)
+                                .try_append_view(block, 0u32, value.0.len() as u32)
                                 .expect("append view for known valid block, offset and length");
                         }
                     }

influxdb3_catalog/Cargo.toml

@@ -17,6 +17,7 @@ influxdb3_id = { path = "../influxdb3_id" }
 influxdb3_wal = { path = "../influxdb3_wal" }
 
 # crates.io dependencies
+anyhow.workspace = true
 arrow.workspace = true
 bimap.workspace = true
 chrono.workspace = true

influxdb3_clap_blocks/src/datafusion.rs

@@ -4,7 +4,7 @@ use datafusion::config::ConfigExtension;
 use iox_query::config::IoxConfigExt;
 
 /// Extends the standard [`HashMap`] based DataFusion config option in the CLI with specific
-/// options (along with defaults) for InfluxDB 3 OSS/Pro. This is intended for customization of
+/// options (along with defaults) for InfluxDB 3 Core/Enterprise. This is intended for customization of
 /// options that are defined in the `iox_query` crate, e.g., those defined in [`IoxConfigExt`]
 /// that are relevant to the monolithinc versions of InfluxDB 3.
 #[derive(Debug, clap::Parser, Clone)]

influxdb3_client/src/lib.rs

@@ -852,7 +852,7 @@ impl<'c> WriteRequestBuilder<'c, NoBody> {
     }
 }
 
-impl<'c> WriteRequestBuilder<'c, Body> {
+impl WriteRequestBuilder<'_, Body> {
     /// Send the request to the server
     pub async fn send(self) -> Result<()> {
         let url = self.client.base_url.join("/api/v3/write_lp")?;
@@ -900,7 +900,7 @@ pub struct QueryRequestBuilder<'c> {
 // TODO - for now the send method just returns the bytes from the response.
 //   It may be nicer to have the format parameter dictate how we return from
 //   send, e.g., using types more specific to the format selected.
-impl<'c> QueryRequestBuilder<'c> {
+impl QueryRequestBuilder<'_> {
     /// Specify the format, `json`, `csv`, `pretty`, or `parquet`
     pub fn format(mut self, format: Format) -> Self {
         self.format = Some(format);
@@ -1101,7 +1101,7 @@ pub struct ShowDatabasesRequestBuilder<'c> {
     show_deleted: bool,
 }
 
-impl<'c> ShowDatabasesRequestBuilder<'c> {
+impl ShowDatabasesRequestBuilder<'_> {
     /// Specify whether or not to show deleted databases in the output
     pub fn with_show_deleted(mut self, show_deleted: bool) -> Self {
         self.show_deleted = show_deleted;

influxdb3_internal_api/src/query_executor.rs

@@ -24,6 +24,8 @@ pub enum QueryExecutorError {
     DatabasesToRecordBatch(#[source] ArrowError),
     #[error("unable to compose record batches from retention policies: {0}")]
     RetentionPoliciesToRecordBatch(#[source] ArrowError),
+    #[error("invokded a method that is not implemented: {0}")]
+    MethodNotImplemented(&'static str),
 }
 
 #[async_trait]

influxdb3_server/src/http.rs

@@ -247,6 +247,10 @@ impl Error {
     fn into_response(self) -> Response<Body> {
         debug!(error = ?self, "API error");
         match self {
+            Self::Query(err @ QueryExecutorError::MethodNotImplemented(_)) => Response::builder()
+                .status(StatusCode::METHOD_NOT_ALLOWED)
+                .body(Body::from(err.to_string()))
+                .unwrap(),
             Self::WriteBuffer(err @ WriteBufferError::DatabaseNotFound { db_name: _ }) => {
                 Response::builder()
                     .status(StatusCode::NOT_FOUND)
@@ -1254,7 +1258,7 @@ fn json_content_type(headers: &HeaderMap) -> bool {
     };
 
     let is_json_content_type = mime.type_() == "application"
-        && (mime.subtype() == "json" || mime.suffix().map_or(false, |name| name == "json"));
+        && (mime.subtype() == "json" || mime.suffix().is_some_and(|name| name == "json"));
 
     is_json_content_type
 }
@@ -1329,7 +1333,7 @@ fn validate_db_name(name: &str, accept_rp: bool) -> Result<(), ValidateDbNameErr
     let mut rp_seperator_found = false;
     let mut last_char = None;
     for grapheme in name.graphemes(true) {
-        if grapheme.as_bytes().len() > 1 {
+        if grapheme.len() > 1 {
             // In the case of a unicode we need to handle multibyte chars
             return Err(ValidateDbNameError::InvalidChar);
         }

influxdb3_server/src/lib.rs

@@ -1,4 +1,4 @@
-//! InfluxDB 3 Core server implementation
+//! InfluxDB 3 Enterprise server implementation
 //!
 //! The server is responsible for handling the HTTP API
 #![deny(rustdoc::broken_intra_doc_links, rustdoc::bare_urls, rust_2018_idioms)]
@@ -789,7 +789,7 @@ mod tests {
         let parquet_metrics_provider: Arc<PersistedFiles> =
             Arc::clone(&write_buffer_impl.persisted_files());
         let sample_telem_store =
-            TelemetryStore::new_without_background_runners(parquet_metrics_provider);
+            TelemetryStore::new_without_background_runners(Some(parquet_metrics_provider));
         let write_buffer: Arc<dyn WriteBuffer> = write_buffer_impl;
         let common_state = crate::CommonServerState::new(
             Arc::clone(&metrics),