Merge branch 'main' of https://github.com/datafuselabs/databend into desc

Author: andylokandy

Cargo.lock

@@ -41,7 +41,7 @@ externalStage ::= @<external_stage_name>[/<path>]
 
 ### externalLocation (for Amazon S3)
 
-```
+```sql
 externalLocation (for Amazon S3) ::=
   's3://<bucket>[/<path>]'
   [ { CONNECTION = ( {  { AWS_KEY_ID = '<string>' AWS_SECRET_KEY = '<string>' } } ) } ]
@@ -59,7 +59,7 @@ externalLocation (for Amazon S3) ::=
 See [Input & Output File Formats](../../13-sql-reference/50-file-format-options.md).
 
 ### copyOptions
-```
+```sql
 copyOptions ::=
   [ SINGLE = TRUE | FALSE ]
   [ MAX_FILE_SIZE = <num> ]
@@ -93,4 +93,4 @@ COPY INTO @s2 FROM test_table FILE_FORMAT = (TYPE = CSV);
 
 -- Unload the data from a query into a parquet file on the stage
 COPY INTO @s2 FROM (SELECT name, age, id FROM test_table LIMIT 100) FILE_FORMAT = (TYPE = PARQUET);
-```
+```

docs/doc/14-sql-commands/10-dml/dml-copy-into-location.md

@@ -22,7 +22,6 @@ async-trait = "0.1"
 bytes = "1"
 futures = "0.3"
 opendal = { workspace = true }
-parking_lot = "0.12.1"
 regex = "1.6.0"
 serde = { workspace = true }
 

src/common/storage/Cargo.toml

@@ -33,7 +33,6 @@ use opendal::raw::RpRead;
 use opendal::raw::RpScan;
 use opendal::raw::RpWrite;
 use opendal::Result;
-use parking_lot::RwLock;
 
 /// StorageMetrics represents the metrics of storage (all bytes metrics are compressed size).
 #[derive(Debug, Default)]
@@ -50,8 +49,6 @@ pub struct StorageMetrics {
     partitions_scanned: AtomicU64,
     /// Number of partitions, before pruning
     partitions_total: AtomicU64,
-    /// Status of the operation.
-    status: Arc<RwLock<String>>,
 }
 
 impl StorageMetrics {
@@ -72,13 +69,6 @@ impl StorageMetrics {
             partitions_total: AtomicU64::new(
                 vs.iter().map(|v| v.as_ref().get_partitions_total()).sum(),
             ),
-            // Get the last one status, mainly used for the single table operation.
-            status: Arc::new(RwLock::new(
-                vs.iter()
-                    .map(|v| v.as_ref().get_status())
-                    .collect::<Vec<String>>()
-                    .join("|"),
-            )),
         }
     }
 
@@ -141,16 +131,6 @@ impl StorageMetrics {
     pub fn get_partitions_total(&self) -> u64 {
         self.partitions_total.load(Ordering::Relaxed)
     }
-
-    pub fn set_status(&self, new: &str) {
-        let mut status = self.status.write();
-        *status = new.to_string();
-    }
-
-    pub fn get_status(&self) -> String {
-        let status = self.status.read();
-        status.clone()
-    }
 }
 
 #[derive(Clone, Debug)]
@@ -210,6 +190,14 @@ impl<A: Accessor> LayeredAccessor for StorageMetricsAccessor<A> {
             .map(|(rp, r)| (rp, StorageMetricsWrapper::new(r, self.metrics.clone())))
     }
 
+    async fn list(&self, path: &str, args: OpList) -> Result<(RpList, Self::Pager)> {
+        self.inner.list(path, args).await
+    }
+
+    async fn scan(&self, path: &str, args: OpScan) -> Result<(RpScan, Self::Pager)> {
+        self.inner.scan(path, args).await
+    }
+
     fn blocking_read(&self, path: &str, args: OpRead) -> Result<(RpRead, Self::BlockingReader)> {
         self.inner
             .blocking_read(path, args)
@@ -222,14 +210,6 @@ impl<A: Accessor> LayeredAccessor for StorageMetricsAccessor<A> {
             .map(|(rp, r)| (rp, StorageMetricsWrapper::new(r, self.metrics.clone())))
     }
 
-    async fn list(&self, path: &str, args: OpList) -> Result<(RpList, Self::Pager)> {
-        self.inner.list(path, args).await
-    }
-
-    async fn scan(&self, path: &str, args: OpScan) -> Result<(RpScan, Self::Pager)> {
-        self.inner.scan(path, args).await
-    }
-
     fn blocking_list(&self, path: &str, args: OpList) -> Result<(RpList, Self::BlockingPager)> {
         self.inner.blocking_list(path, args)
     }

src/common/storage/src/metrics.rs

@@ -43,12 +43,12 @@ pub use util::db_has_to_exist;
 pub use util::deserialize_struct;
 pub use util::fetch_id;
 pub use util::get_object_shared_by_share_ids;
+pub use util::get_pb_value;
 pub use util::get_share_account_meta_or_err;
 pub use util::get_share_database_id_and_privilege;
 pub use util::get_share_id_to_name_or_err;
 pub use util::get_share_meta_by_id_or_err;
 pub use util::get_share_or_err;
-pub use util::get_struct_value;
 pub use util::get_u64_value;
 pub use util::is_all_db_data_removed;
 pub use util::is_db_need_to_be_remove;