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

…table
databendlabs · Jun 14, 2022 · 2966528 · 2966528
2 parents f80ecfb + 66bc80d
commit 2966528
Show file tree

Hide file tree

Showing 115 changed files with 1,373 additions and 457 deletions.
diff --git a/.github/workflows/databend-release.yml b/.github/workflows/databend-release.yml
@@ -152,7 +152,7 @@ jobs:
         run: |
           mkdir -p ./target/release
           wget -q https://repo.databend.rs/databend/${{ steps.get_version.outputs.VERSION }}/databend-${{ steps.get_version.outputs.VERSION }}-x86_64-unknown-linux-gnu.tar.gz
-          tar xC ./target/release -f ./databend-${{ steps.get_version.outputs.VERSION }}-x86_64-unknown-linux-gnu.tar.gz bin/*
+          tar x -C ./target/release -f ./databend-${{ steps.get_version.outputs.VERSION }}-x86_64-unknown-linux-gnu.tar.gz --strip-components 1 bin/
 
       - name: Build and push
         id: docker_build
@@ -211,7 +211,7 @@ jobs:
               target=${platform_targets[$platform]}
               wget -P distro -qc https://repo.databend.rs/databend/${version}/databend-${version}-${target}.tar.gz
               mkdir -p ./target/${target}/release
-              tar xC ./target/${target}/release -f ./distro/databend-${version}-${target}.tar.gz bin/*
+              tar x -C ./target/${target}/release -f ./distro/databend-${version}-${target}.tar.gz --strip-components 1 bin/
               mkdir -p ./distro/linux/${platform}
               cp ./target/${target}/release/databend-${{ matrix.service }} ./distro/linux/${platform}
           done

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/ast/Cargo.toml b/common/ast/Cargo.toml
@@ -21,7 +21,7 @@ common-meta-types = { path = "../meta/types" }
 # TODO(andylokandy): Use the version from crates.io once
 # https://github.com/brendanzab/codespan/pull/331 is released.
 codespan-reporting = { git = "https://github.com/brendanzab/codespan", rev = "c84116f5" }
-sqlparser = { git = "https://github.com/datafuse-extras/sqlparser-rs", rev = "13d3176" }
+sqlparser = { git = "https://github.com/datafuse-extras/sqlparser-rs", rev = "d44a8e1" }
 
 # Crates.io dependencies
 async-trait = "0.1.53"

diff --git a/common/contexts/Cargo.toml b/common/contexts/Cargo.toml
@@ -12,5 +12,5 @@ test = false
 common-base = { path = "../base" }
 
 async-trait = "0.1.53"
-opendal = { version = "0.8.0", features = ["retry"] }
+opendal = { version = "0.9.0", features = ["retry"] }
 time = "0.3.9"
diff --git a/common/exception/Cargo.toml b/common/exception/Cargo.toml
@@ -25,4 +25,4 @@ tonic = "=0.7.2"
 
 # Github dependencies
 bincode = { git = "https://github.com/datafuse-extras/bincode", rev = "fd3f9ff" }
-sqlparser = { git = "https://github.com/datafuse-extras/sqlparser-rs", rev = "13d3176" }
+sqlparser = { git = "https://github.com/datafuse-extras/sqlparser-rs", rev = "d44a8e1" }
diff --git a/common/functions/Cargo.toml b/common/functions/Cargo.toml
@@ -46,7 +46,7 @@ serde_json = "1.0.79"
 sha1 = "0.10.1"
 sha2 = "0.10.2"
 simdutf8 = "0.1.4"
-sqlparser = { git = "https://github.com/datafuse-extras/sqlparser-rs", rev = "13d3176" }
+sqlparser = { git = "https://github.com/datafuse-extras/sqlparser-rs", rev = "d44a8e1" }
 strength_reduce = "0.2.3"
 twox-hash = "1.6.2"
 uuid = { version = "0.8.2", features = ["v4"] }

diff --git a/common/io/Cargo.toml b/common/io/Cargo.toml
@@ -28,7 +28,7 @@ chrono = "0.4.19"
 chrono-tz = "0.6.1"
 futures = "0.3.21"
 lexical-core = "0.8.2"
-opendal = { version = "0.8.0", features = ["retry"] }
+opendal = { version = "0.9.0", features = ["retry"] }
 serde = { version = "1.0.136", features = ["derive"] }
 time = "0.3.9"
 

diff --git a/common/io/src/configs.rs b/common/io/src/configs.rs
@@ -109,6 +109,11 @@ pub struct StorageS3Config {
     /// This flag is used internally to control whether or not databend load
     /// credentials from environment like env, profile and web token.
     pub disable_credential_loader: bool,
+    /// Enable this flag to send API in virtual host style.
+    ///
+    /// - Virtual Host Style: `https://bucket.s3.amazonaws.com`
+    /// - Path Style: `https://s3.amazonaws.com/bucket`
+    pub enable_virtual_host_style: bool,
 }
 
 impl Default for StorageS3Config {
@@ -122,6 +127,7 @@ impl Default for StorageS3Config {
             master_key: "".to_string(),
             root: "".to_string(),
             disable_credential_loader: false,
+            enable_virtual_host_style: false,
         }
     }
 }
@@ -134,6 +140,7 @@ impl Debug for StorageS3Config {
             .field("bucket", &self.bucket)
             .field("root", &self.root)
             .field("disable_credential_loader", &self.disable_credential_loader)
+            .field("enable_virtual_host_style", &self.enable_virtual_host_style)
             .field("access_key_id", &mask_string(&self.access_key_id, 3))
             .field(
                 "secret_access_key",

diff --git a/common/proto-conv/src/config_from_to_protobuf_impl.rs b/common/proto-conv/src/config_from_to_protobuf_impl.rs
@@ -38,6 +38,7 @@ impl FromToProto<pb::S3StorageConfig> for StorageParams {
             root: p.root,
             master_key: p.master_key,
             disable_credential_loader: p.disable_credential_loader,
+            enable_virtual_host_style: p.enable_virtual_host_style,
         }))
     }
 
@@ -54,6 +55,7 @@ impl FromToProto<pb::S3StorageConfig> for StorageParams {
                 root: v.root.clone(),
                 master_key: v.master_key.clone(),
                 disable_credential_loader: v.disable_credential_loader,
+                enable_virtual_host_style: v.enable_virtual_host_style,
             })
         } else {
             Err(Incompatible {

diff --git a/common/protos/proto/config.proto b/common/protos/proto/config.proto
@@ -28,6 +28,7 @@ message S3StorageConfig {
   string root = 6;
   string master_key = 7;
   bool disable_credential_loader = 8;
+  bool enable_virtual_host_style = 9;
 }
 
 message FsStorageConfig {

diff --git a/common/streams/Cargo.toml b/common/streams/Cargo.toml
@@ -29,7 +29,7 @@ async-trait = "0.1.53"
 chrono-tz = "0.6.1"
 csv-async = "1.2.4"
 futures = "0.3.21"
-opendal = { version = "0.8.0", features = ["retry", "compress"] }
+opendal = { version = "0.9.0", features = ["retry", "compress"] }
 pin-project-lite = "0.2.8"
 serde_json = { version = "1.0.79", default-features = false, features = ["preserve_order"] }
 tempfile = "3.3.0"
diff --git a/docs/doc/30-reference/00-api/00-rest.md b/docs/doc/30-reference/00-api/00-rest.md
@@ -77,6 +77,14 @@ you are expected to get JSON like this (formatted):
       "rows": 100000000,
       "bytes": 800000000
     },
+    "write_progress": {
+      "rows": 0,
+      "bytes": 0
+    },
+    "result_progress": {
+      "rows": 0,
+      "bytes": 0 
+    },
     "running_time_ms": 466.85395800000003
   },
   "stats_uri": "/v1/query/3cd25ab7-c3a4-42ce-9e02-e1b354d91f06",

diff --git a/docs/doc/30-reference/30-sql/00-ddl/20-table/40-ddl-truncate-table.md b/docs/doc/30-reference/30-sql/00-ddl/20-table/40-ddl-truncate-table.md
@@ -13,7 +13,7 @@ TRUNCATE TABLE [db.]name
 ## Examples
 
 ```sql
-CREATE TABLE test(a BIGINT UNSIGNED, b VARCHAR) Engine = Memory;
+CREATE TABLE test(a BIGINT UNSIGNED, b VARCHAR) Engine = Fuse;
 
 INSERT INTO test(a,b) VALUES(888, 'stars');