Merge branch 'main' into trace-query

Signed-off-by: Ruihang Xia <[email protected]>
GreptimeTeam · Feb 18, 2024 · 8726715 · 8726715
2 parents 184c90a + df6260d
commit 8726715
Show file tree

Hide file tree

Showing 40 changed files with 204 additions and 137 deletions.
diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
@@ -330,14 +330,14 @@ jobs:
     env:
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_DEVELOP_CHANNEL }}
     steps:
-      - name: Notifiy nightly build successful result
+      - name: Notifiy dev build successful result
         uses: slackapi/[email protected]
         if: ${{ needs.release-images-to-dockerhub.outputs.build-result == 'success' }}
         with:
           payload: |
             {"text": "GreptimeDB's ${{ env.NEXT_RELEASE_VERSION }} build has completed successfully."}
 
-      - name: Notifiy nightly build failed result
+      - name: Notifiy dev build failed result
         uses: slackapi/[email protected]
         if: ${{ needs.release-images-to-dockerhub.outputs.build-result != 'success' }}
         with:

diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -42,7 +42,6 @@ jobs:
 
   check:
     name: Check
-    if: github.event.pull_request.draft == false
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -67,7 +66,6 @@ jobs:
 
   toml:
     name: Toml Check
-    if: github.event.pull_request.draft == false
     runs-on: ubuntu-20.04
     timeout-minutes: 60
     steps:
@@ -81,13 +79,12 @@ jobs:
           # Shares across multiple jobs
           shared-key: "check-toml"
       - name: Install taplo
-        run: cargo +stable install taplo-cli --version ^0.8 --locked
+        run: cargo +stable install taplo-cli --version ^0.9 --locked
       - name: Run taplo
         run: taplo format --check
 
   build:
     name: Build GreptimeDB binaries
-    if: github.event.pull_request.draft == false
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -122,7 +119,6 @@ jobs:
 
   sqlness:
     name: Sqlness Test
-    if: github.event.pull_request.draft == false
     needs: build
     runs-on: ${{ matrix.os }}
     strategy:
@@ -139,7 +135,8 @@ jobs:
       - name: Unzip binaries
         run: tar -xvf ./bins.tar.gz
       - name: Run sqlness
-        run: ./bins/sqlness-runner -c ./tests/cases --bins-dir ./bins
+        run: RUST_BACKTRACE=1 ./bins/sqlness-runner -c ./tests/cases --bins-dir ./bins
+      # FIXME: Logs cannot found be on failure (or even success). Need to figure out the cause.
       - name: Upload sqlness logs
         if: always()
         uses: actions/upload-artifact@v3
@@ -150,7 +147,6 @@ jobs:
 
   sqlness-kafka-wal:
     name: Sqlness Test with Kafka Wal
-    if: github.event.pull_request.draft == false
     needs: build
     runs-on: ${{ matrix.os }}
     strategy:
@@ -170,7 +166,8 @@ jobs:
         working-directory: tests-integration/fixtures/kafka
         run: docker compose -f docker-compose-standalone.yml up -d --wait
       - name: Run sqlness
-        run: ./bins/sqlness-runner -w kafka -k 127.0.0.1:9092 -c ./tests/cases --bins-dir ./bins
+        run: RUST_BACKTRACE=1 ./bins/sqlness-runner -w kafka -k 127.0.0.1:9092 -c ./tests/cases --bins-dir ./bins
+      # FIXME: Logs cannot be found on failure (or even success). Need to figure out the cause.
       - name: Upload sqlness logs
         if: always()
         uses: actions/upload-artifact@v3
@@ -181,7 +178,6 @@ jobs:
 
   fmt:
     name: Rustfmt
-    if: github.event.pull_request.draft == false
     runs-on: ubuntu-20.04
     timeout-minutes: 60
     steps:
@@ -203,7 +199,6 @@ jobs:
 
   clippy:
     name: Clippy
-    if: github.event.pull_request.draft == false
     runs-on: ubuntu-20.04
     timeout-minutes: 60
     steps:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -38,34 +38,29 @@ jobs:
 
   check:
     name: Check
-    if: github.event.pull_request.draft == false
     runs-on: ubuntu-20.04
     steps:
       - run: 'echo "No action required"'
 
   fmt:
     name: Rustfmt
-    if: github.event.pull_request.draft == false
     runs-on: ubuntu-20.04
     steps:
       - run: 'echo "No action required"'
 
   clippy:
     name: Clippy
-    if: github.event.pull_request.draft == false
     runs-on: ubuntu-20.04
     steps:
       - run: 'echo "No action required"'
 
   coverage:
-    if: github.event.pull_request.draft == false
     runs-on: ubuntu-20.04
     steps:
       - run: 'echo "No action required"'
 
   sqlness:
     name: Sqlness Test
-    if: github.event.pull_request.draft == false
     runs-on: ubuntu-20.04
     steps:
       - run: 'echo "No action required"'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -240,6 +240,11 @@ jobs:
           disable-run-tests: ${{ env.DISABLE_RUN_TESTS }}
           artifacts-dir: ${{ matrix.artifacts-dir-prefix }}-${{ needs.allocate-runners.outputs.version }}
 
+      - name: Set build macos result
+        id: set-build-macos-result
+        run: |
+          echo "build-macos-result=success" >> $GITHUB_OUTPUT    
+
   build-windows-artifacts:
     name: Build Windows artifacts
     strategy:
@@ -276,6 +281,11 @@ jobs:
           disable-run-tests: ${{ env.DISABLE_RUN_TESTS }}
           artifacts-dir: ${{ matrix.artifacts-dir-prefix }}-${{ needs.allocate-runners.outputs.version }}
 
+      - name: Set build windows result
+        id: set-build-windows-result
+        run: |
+          echo "build-windows-result=success" >> $GITHUB_OUTPUT    
+
   release-images-to-dockerhub:
     name: Build and push images to DockerHub
     if: ${{ inputs.release_images || github.event_name == 'push' || github.event_name == 'schedule' }}
@@ -299,6 +309,11 @@ jobs:
           image-registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
           version: ${{ needs.allocate-runners.outputs.version }}
 
+      - name: Set build image result
+        id: set-image-build-result
+        run: |
+          echo "build-image-result=success" >> $GITHUB_OUTPUT    
+
   release-cn-artifacts:
     name: Release artifacts to CN region
     if: ${{ inputs.release_images || github.event_name == 'push' || github.event_name == 'schedule' }}
@@ -413,3 +428,27 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ${{ vars.EC2_RUNNER_REGION }}
           github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
+
+  notification:
+    if: ${{ always() }} # Not requiring successful dependent jobs, always run.
+    name: Send notification to Greptime team
+    needs: [
+      release-images-to-dockerhub
+    ]
+    runs-on: ubuntu-20.04
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_DEVELOP_CHANNEL }}
+    steps:
+      - name: Notifiy release successful result
+        uses: slackapi/[email protected]
+        if: ${{ needs.release-images-to-dockerhub.outputs.build-image-result == 'success' && needs.build-windows-artifacts.outputs.build-windows-result == 'success' && needs.build-macos-artifacts.outputs.build-macos-result == 'success' }}
+        with:
+          payload: |
+            {"text": "GreptimeDB's release version ${{ needs.allocate-runners.outputs.version }} has completed successfully."}
+
+      - name: Notifiy release failed result
+        uses: slackapi/[email protected]
+        if: ${{ needs.release-images-to-dockerhub.outputs.build-image-result != 'success' || needs.build-windows-artifacts.outputs.build-windows-result != 'success' || needs.build-macos-artifacts.outputs.build-macos-result != 'success' }}
+        with:
+          payload: |
+            {"text": "GreptimeDB's release version ${{ needs.allocate-runners.outputs.version }} has failed, please check 'https://github.com/GreptimeTeam/greptimedb/actions/workflows/release.yml'."}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -164,7 +164,6 @@ common-grpc-expr = { path = "src/common/grpc-expr" }
 common-macro = { path = "src/common/macro" }
 common-mem-prof = { path = "src/common/mem-prof" }
 common-meta = { path = "src/common/meta" }
-common-pprof = { path = "src/common/pprof" }
 common-procedure = { path = "src/common/procedure" }
 common-procedure-test = { path = "src/common/procedure-test" }
 common-query = { path = "src/common/query" }

diff --git a/src/catalog/Cargo.toml b/src/catalog/Cargo.toml
@@ -10,11 +10,10 @@ testing = []
 [dependencies]
 api.workspace = true
 arc-swap = "1.0"
-arrow-schema.workspace = true
 arrow.workspace = true
+arrow-schema.workspace = true
 async-stream.workspace = true
 async-trait = "0.1"
-build-data = "0.1"
 common-catalog.workspace = true
 common-error.workspace = true
 common-grpc.workspace = true
@@ -25,6 +24,7 @@ common-recordbatch.workspace = true
 common-runtime.workspace = true
 common-telemetry.workspace = true
 common-time.workspace = true
+common-version.workspace = true
 dashmap.workspace = true
 datafusion.workspace = true
 datatypes.workspace = true

diff --git a/src/catalog/src/information_schema/memory_table/tables.rs b/src/catalog/src/information_schema/memory_table/tables.rs
@@ -21,8 +21,6 @@ use datatypes::vectors::{Int64Vector, StringVector};
 
 use crate::information_schema::table_names::*;
 
-const UNKNOWN: &str = "unknown";
-
 /// Find the schema and columns by the table_name, only valid for memory tables.
 /// Safety: the user MUST ensure the table schema exists, panic otherwise.
 pub fn get_schema_columns(table_name: &str) -> (SchemaRef, Vec<VectorRef>) {
@@ -72,30 +70,27 @@ pub fn get_schema_columns(table_name: &str) -> (SchemaRef, Vec<VectorRef>) {
             ],
         ),
 
-        BUILD_INFO => (
-            string_columns(&[
-                "GIT_BRANCH",
-                "GIT_COMMIT",
-                "GIT_COMMIT_SHORT",
-                "GIT_DIRTY",
-                "PKG_VERSION",
-            ]),
-            vec![
-                Arc::new(StringVector::from(vec![
-                    build_data::get_git_branch().unwrap_or_else(|_| UNKNOWN.to_string())
-                ])),
-                Arc::new(StringVector::from(vec![
-                    build_data::get_git_commit().unwrap_or_else(|_| UNKNOWN.to_string())
-                ])),
-                Arc::new(StringVector::from(vec![
-                    build_data::get_git_commit_short().unwrap_or_else(|_| UNKNOWN.to_string())
-                ])),
-                Arc::new(StringVector::from(vec![
-                    build_data::get_git_dirty().map_or(UNKNOWN.to_string(), |v| v.to_string())
-                ])),
-                Arc::new(StringVector::from(vec![option_env!("CARGO_PKG_VERSION")])),
-            ],
-        ),
+        BUILD_INFO => {
+            let build_info = common_version::build_info();
+            (
+                string_columns(&[
+                    "GIT_BRANCH",
+                    "GIT_COMMIT",
+                    "GIT_COMMIT_SHORT",
+                    "GIT_DIRTY",
+                    "PKG_VERSION",
+                ]),
+                vec![
+                    Arc::new(StringVector::from(vec![build_info.branch.to_string()])),
+                    Arc::new(StringVector::from(vec![build_info.commit.to_string()])),
+                    Arc::new(StringVector::from(vec![build_info
+                        .commit_short
+                        .to_string()])),
+                    Arc::new(StringVector::from(vec![build_info.dirty.to_string()])),
+                    Arc::new(StringVector::from(vec![build_info.version.to_string()])),
+                ],
+            )
+        }
 
         CHARACTER_SETS => (
             vec![

diff --git a/src/client/Cargo.toml b/src/client/Cargo.toml
@@ -36,8 +36,8 @@ prost.workspace = true
 rand.workspace = true
 session.workspace = true
 snafu.workspace = true
-tokio-stream = { workspace = true, features = ["net"] }
 tokio.workspace = true
+tokio-stream = { workspace = true, features = ["net"] }
 tonic.workspace = true
 
 [dev-dependencies]

diff --git a/src/cmd/build.rs b/src/cmd/build.rs
@@ -13,5 +13,5 @@
 // limitations under the License.
 
 fn main() {
-    common_version::setup_git_versions();
+    common_version::setup_build_info();
 }
diff --git a/src/common/datasource/Cargo.toml b/src/common/datasource/Cargo.toml
@@ -5,8 +5,8 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
-arrow-schema.workspace = true
 arrow.workspace = true
+arrow-schema.workspace = true
 async-compression = { version = "0.3", features = [
     "bzip2",
     "gzip",
@@ -34,8 +34,8 @@ regex = "1.7"
 serde.workspace = true
 snafu.workspace = true
 strum.workspace = true
-tokio-util.workspace = true
 tokio.workspace = true
+tokio-util.workspace = true
 url = "2.3"
 
 [dev-dependencies]