build: support build without git (#3309)

* build: support build without git Signed-off-by: tison <[email protected]> * chore Signed-off-by: tison <[email protected]> * address comment Signed-off-by: tison <[email protected]> * fix syntax Signed-off-by: tison <[email protected]> --------- Signed-off-by: tison <[email protected]>
GreptimeTeam · Feb 18, 2024 · 4e04a4e · 4e04a4e
1 parent b889d57
commit 4e04a4e
Show file tree

Hide file tree

Showing 35 changed files with 154 additions and 116 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -81,7 +81,7 @@ 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
 

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]

diff --git a/src/common/function/Cargo.toml b/src/common/function/Cargo.toml
@@ -8,14 +8,14 @@ license.workspace = true
 api.workspace = true
 arc-swap = "1.0"
 async-trait.workspace = true
-build-data = "0.1"
 chrono-tz = "0.6"
 common-error.workspace = true
 common-macro.workspace = true
 common-query.workspace = true
 common-runtime.workspace = true
 common-telemetry.workspace = true
 common-time.workspace = true
+common-version.workspace = true
 datafusion.workspace = true
 datatypes.workspace = true
 libc = "0.2"

diff --git a/src/common/function/src/system/build.rs b/src/common/function/src/system/build.rs
@@ -22,8 +22,6 @@ use datatypes::vectors::{StringVector, VectorRef};
 
 use crate::function::{Function, FunctionContext};
 
-const DEFAULT_VALUE: &str = "unknown";
-
 /// Generates build information  
 #[derive(Clone, Debug, Default)]
 pub struct BuildFunction;
@@ -52,15 +50,7 @@ impl Function for BuildFunction {
     }
 
     fn eval(&self, _func_ctx: FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
-        let build_info = format!(
-            "branch: {}\ncommit: {}\ncommit short: {}\ndirty: {}\nversion: {}",
-            build_data::get_git_branch().unwrap_or_else(|_| DEFAULT_VALUE.to_string()),
-            build_data::get_git_commit().unwrap_or_else(|_| DEFAULT_VALUE.to_string()),
-            build_data::get_git_commit_short().unwrap_or_else(|_| DEFAULT_VALUE.to_string()),
-            build_data::get_git_dirty().map_or(DEFAULT_VALUE.to_string(), |v| v.to_string()),
-            env!("CARGO_PKG_VERSION")
-        );
-
+        let build_info = common_version::build_info().to_string();
         let v = Arc::new(StringVector::from(vec![build_info]));
         Ok(v)
     }
@@ -87,14 +77,7 @@ mod tests {
                              volatility: Volatility::Immutable
                          } if  valid_types == vec![ConcreteDataType::string_datatype()]
         ));
-        let build_info = format!(
-            "branch: {}\ncommit: {}\ncommit short: {}\ndirty: {}\nversion: {}",
-            build_data::get_git_branch().unwrap_or_else(|_| DEFAULT_VALUE.to_string()),
-            build_data::get_git_commit().unwrap_or_else(|_| DEFAULT_VALUE.to_string()),
-            build_data::get_git_commit_short().unwrap_or_else(|_| DEFAULT_VALUE.to_string()),
-            build_data::get_git_dirty().map_or(DEFAULT_VALUE.to_string(), |v| v.to_string()),
-            env!("CARGO_PKG_VERSION")
-        );
+        let build_info = common_version::build_info().to_string();
         let vector = build.eval(FunctionContext::default(), &[]).unwrap();
         let expect: VectorRef = Arc::new(StringVector::from(vec![build_info]));
         assert_eq!(expect, vector);

diff --git a/src/common/greptimedb-telemetry/build.rs b/src/common/greptimedb-telemetry/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/meta/Cargo.toml b/src/common/meta/Cargo.toml
@@ -28,8 +28,8 @@ common-wal.workspace = true
 datatypes.workspace = true
 derive_builder.workspace = true
 etcd-client.workspace = true
-futures-util.workspace = true
 futures.workspace = true
+futures-util.workspace = true
 hex = { version = "0.4" }
 humantime-serde.workspace = true
 lazy_static.workspace = true

diff --git a/src/common/query/Cargo.toml b/src/common/query/Cargo.toml
@@ -11,9 +11,9 @@ common-error.workspace = true
 common-macro.workspace = true
 common-recordbatch.workspace = true
 common-time.workspace = true
+datafusion.workspace = true
 datafusion-common.workspace = true
 datafusion-expr.workspace = true
-datafusion.workspace = true
 datatypes.workspace = true
 serde.workspace = true
 snafu.workspace = true

diff --git a/src/common/recordbatch/Cargo.toml b/src/common/recordbatch/Cargo.toml
@@ -9,8 +9,8 @@ arc-swap = "1.6"
 common-base.workspace = true
 common-error.workspace = true
 common-macro.workspace = true
-datafusion-common.workspace = true
 datafusion.workspace = true
+datafusion-common.workspace = true
 datatypes.workspace = true
 futures.workspace = true
 paste = "1.0"

diff --git a/src/common/runtime/Cargo.toml b/src/common/runtime/Cargo.toml
@@ -14,10 +14,10 @@ once_cell.workspace = true
 paste.workspace = true
 prometheus.workspace = true
 snafu.workspace = true
+tokio.workspace = true
 tokio-metrics = "0.3"
 tokio-metrics-collector = "0.2"
 tokio-util.workspace = true
-tokio.workspace = true
 
 [dev-dependencies]
 tokio-test = "0.4"
diff --git a/src/common/substrait/Cargo.toml b/src/common/substrait/Cargo.toml
@@ -13,10 +13,10 @@ common-catalog.workspace = true
 common-error.workspace = true
 common-macro.workspace = true
 common-telemetry.workspace = true
+datafusion.workspace = true
 datafusion-common.workspace = true
 datafusion-expr.workspace = true
 datafusion-substrait.workspace = true
-datafusion.workspace = true
 datatypes.workspace = true
 futures = "0.3"
 promql.workspace = true

diff --git a/src/common/time/Cargo.toml b/src/common/time/Cargo.toml
@@ -6,8 +6,8 @@ license.workspace = true
 
 [dependencies]
 arrow.workspace = true
-chrono-tz = "0.8"
 chrono.workspace = true
+chrono-tz = "0.8"
 common-error.workspace = true
 common-macro.workspace = true
 once_cell.workspace = true