chore: bump version v0.9.4 (#4833)

* feat: introduce `DefaultHeartbeatHandlerGroupBuilderCustomizer` and `DefaultLeadershipChangeNotifierCustomizer`

* chore: code styling

Cargo.lock

@@ -214,7 +214,7 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c"
 
 [[package]]
 name = "api"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "common-base",
  "common-decimal",
@@ -230,6 +230,15 @@ dependencies = [
  "tonic-build",
 ]
 
+[[package]]
+name = "approx"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "approx"
 version = "0.5.1"
@@ -766,7 +775,7 @@ dependencies = [
 
 [[package]]
 name = "auth"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "async-trait",
@@ -985,6 +994,7 @@ dependencies = [
  "num-bigint",
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -1375,7 +1385,7 @@ dependencies = [
 
 [[package]]
 name = "cache"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "catalog",
  "common-error",
@@ -1383,7 +1393,7 @@ dependencies = [
  "common-meta",
  "moka",
  "snafu 0.8.5",
- "substrait 0.9.3",
+ "substrait 0.9.4",
 ]
 
 [[package]]
@@ -1410,7 +1420,7 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "catalog"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "arrow",
@@ -1548,6 +1558,16 @@ dependencies = [
  "vob",
 ]
 
+[[package]]
+name = "cgmath"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317"
+dependencies = [
+ "approx 0.4.0",
+ "num-traits",
+]
+
 [[package]]
 name = "chrono"
 version = "0.4.38"
@@ -1739,7 +1759,7 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
 [[package]]
 name = "client"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "arc-swap",
@@ -1769,7 +1789,7 @@ dependencies = [
  "serde_json",
  "snafu 0.8.5",
  "substrait 0.37.3",
- "substrait 0.9.3",
+ "substrait 0.9.4",
  "tokio",
  "tokio-stream",
  "tonic 0.11.0",
@@ -1799,7 +1819,7 @@ dependencies = [
 
 [[package]]
 name = "cmd"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "async-trait",
  "auth",
@@ -1856,7 +1876,7 @@ dependencies = [
  "similar-asserts",
  "snafu 0.8.5",
  "store-api",
- "substrait 0.9.3",
+ "substrait 0.9.4",
  "table",
  "temp-env",
  "tempfile",
@@ -1902,7 +1922,7 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"
 
 [[package]]
 name = "common-base"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "anymap2",
  "async-trait",
@@ -1920,7 +1940,7 @@ dependencies = [
 
 [[package]]
 name = "common-catalog"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "chrono",
  "common-error",
@@ -1931,7 +1951,7 @@ dependencies = [
 
 [[package]]
 name = "common-config"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "common-base",
  "common-error",
@@ -1954,7 +1974,7 @@ dependencies = [
 
 [[package]]
 name = "common-datasource"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "arrow",
  "arrow-schema",
@@ -1991,7 +2011,7 @@ dependencies = [
 
 [[package]]
 name = "common-decimal"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "bigdecimal 0.4.5",
  "common-error",
@@ -2004,7 +2024,7 @@ dependencies = [
 
 [[package]]
 name = "common-error"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "snafu 0.8.5",
  "strum 0.25.0",
@@ -2013,7 +2033,7 @@ dependencies = [
 
 [[package]]
 name = "common-frontend"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "async-trait",
@@ -2028,7 +2048,7 @@ dependencies = [
 
 [[package]]
 name = "common-function"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "arc-swap",
@@ -2054,6 +2074,7 @@ dependencies = [
  "once_cell",
  "paste",
  "ron",
+ "s2",
  "serde",
  "serde_json",
  "session",
@@ -2067,7 +2088,7 @@ dependencies = [
 
 [[package]]
 name = "common-greptimedb-telemetry"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "async-trait",
  "common-runtime",
@@ -2084,7 +2105,7 @@ dependencies = [
 
 [[package]]
 name = "common-grpc"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "arrow-flight",
@@ -2110,7 +2131,7 @@ dependencies = [
 
 [[package]]
 name = "common-grpc-expr"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "common-base",
@@ -2128,7 +2149,7 @@ dependencies = [
 
 [[package]]
 name = "common-macro"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "arc-swap",
  "common-query",
@@ -2142,7 +2163,7 @@ dependencies = [
 
 [[package]]
 name = "common-mem-prof"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "common-error",
  "common-macro",
@@ -2155,7 +2176,7 @@ dependencies = [
 
 [[package]]
 name = "common-meta"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "anymap2",
  "api",
@@ -2212,11 +2233,23 @@ dependencies = [
 
 [[package]]
 name = "common-plugins"
-version = "0.9.3"
+version = "0.9.4"
+
+[[package]]
+name = "common-pprof"
+version = "0.9.4"
+dependencies = [
+ "common-error",
+ "common-macro",
+ "pprof",
+ "prost 0.12.6",
+ "snafu 0.8.5",
+ "tokio",
+]
 
 [[package]]
 name = "common-procedure"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -2243,7 +2276,7 @@ dependencies = [
 
 [[package]]
 name = "common-procedure-test"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "async-trait",
  "common-procedure",
@@ -2251,7 +2284,7 @@ dependencies = [
 
 [[package]]
 name = "common-query"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "async-trait",
@@ -2277,7 +2310,7 @@ dependencies = [
 
 [[package]]
 name = "common-recordbatch"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "arc-swap",
  "common-error",
@@ -2296,7 +2329,7 @@ dependencies = [
 
 [[package]]
 name = "common-runtime"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "async-trait",
  "common-error",
@@ -2318,7 +2351,7 @@ dependencies = [
 
 [[package]]
 name = "common-telemetry"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "atty",
  "backtrace",
@@ -2346,7 +2379,7 @@ dependencies = [
 
 [[package]]
 name = "common-test-util"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "client",
  "common-query",
@@ -2358,7 +2391,7 @@ dependencies = [
 
 [[package]]
 name = "common-time"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "arrow",
  "chrono",
@@ -2374,7 +2407,7 @@ dependencies = [
 
 [[package]]
 name = "common-version"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "build-data",
  "const_format",
@@ -2385,7 +2418,7 @@ dependencies = [
 
 [[package]]
 name = "common-wal"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "common-base",
  "common-error",
@@ -3194,7 +3227,7 @@ dependencies = [
 
 [[package]]
 name = "datanode"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "arrow-flight",
@@ -3244,7 +3277,7 @@ dependencies = [
  "session",
  "snafu 0.8.5",
  "store-api",
- "substrait 0.9.3",
+ "substrait 0.9.4",
  "table",
  "tokio",
  "toml 0.8.19",
@@ -3253,7 +3286,7 @@ dependencies = [
 
 [[package]]
 name = "datatypes"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -3859,7 +3892,7 @@ dependencies = [
 
 [[package]]
 name = "file-engine"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "async-trait",
@@ -3959,9 +3992,18 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28a80e3145d8ad11ba0995949bbcf48b9df2be62772b3d351ef017dff6ecb853"
 
+[[package]]
+name = "float_extras"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b22b70f8649ea2315955f1a36d964b0e4da482dfaa5f0d04df0d1fb7c338ab7a"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "flow"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "arrow",
@@ -4018,7 +4060,7 @@ dependencies = [
  "snafu 0.8.5",
  "store-api",
  "strum 0.25.0",
- "substrait 0.9.3",
+ "substrait 0.9.4",
  "table",
  "tokio",
  "tonic 0.11.0",
@@ -4080,7 +4122,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 
 [[package]]
 name = "frontend"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "arc-swap",
@@ -4389,7 +4431,7 @@ version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ff16065e5720f376fbced200a5ae0f47ace85fd70b7e54269790281353b6d61"
 dependencies = [
- "approx",
+ "approx 0.5.1",
  "num-traits",
  "serde",
 ]
@@ -5128,7 +5170,7 @@ dependencies = [
 
 [[package]]
 name = "index"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "async-trait",
  "asynchronous-codec",
@@ -5959,7 +6001,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "log-store"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -6279,7 +6321,7 @@ dependencies = [
 
 [[package]]
 name = "meta-client"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "async-trait",
@@ -6305,7 +6347,7 @@ dependencies = [
 
 [[package]]
 name = "meta-srv"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "async-trait",
@@ -6383,7 +6425,7 @@ dependencies = [
 
 [[package]]
 name = "metric-engine"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "aquamarine",
@@ -6486,7 +6528,7 @@ dependencies = [
 
 [[package]]
 name = "mito2"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "aquamarine",
@@ -6871,7 +6913,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d506eb7e08d6329505faa8a3a00a5dcc6de9f76e0c77e4b75763ae3c770831ff"
 dependencies = [
- "approx",
+ "approx 0.5.1",
  "matrixmultiply",
  "nalgebra-macros",
  "num-complex",
@@ -7222,7 +7264,7 @@ dependencies = [
 
 [[package]]
 name = "object-store"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "anyhow",
  "bytes",
@@ -7512,7 +7554,7 @@ dependencies = [
 
 [[package]]
 name = "operator"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "async-trait",
@@ -7557,7 +7599,7 @@ dependencies = [
  "sql",
  "sqlparser 0.45.0 (git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=54a267ac89c09b11c0c88934690530807185d3e7)",
  "store-api",
- "substrait 0.9.3",
+ "substrait 0.9.4",
  "table",
  "tokio",
  "tokio-util",
@@ -7807,7 +7849,7 @@ dependencies = [
 
 [[package]]
 name = "partition"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "async-trait",
@@ -8108,7 +8150,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pipeline"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "ahash 0.8.11",
  "api",
@@ -8270,7 +8312,7 @@ dependencies = [
 
 [[package]]
 name = "plugins"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "auth",
  "common-base",
@@ -8544,7 +8586,7 @@ dependencies = [
 
 [[package]]
 name = "promql"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "ahash 0.8.11",
  "async-trait",
@@ -8570,11 +8612,12 @@ dependencies = [
 
 [[package]]
 name = "promql-parser"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "007a331efb31f6ddb644590ef22359c9469784931162aad92599e34bcfa66583"
+checksum = "0c1ad4a4cfa84ec4aa5831c82e57af0a3faf3f0af83bee13fa1390b2d0a32dc9"
 dependencies = [
  "cfgrammar",
+ "chrono",
  "lazy_static",
  "lrlex",
  "lrpar",
@@ -8779,7 +8822,7 @@ dependencies = [
 
 [[package]]
 name = "puffin"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "async-compression 0.4.13",
  "async-trait",
@@ -8901,7 +8944,7 @@ dependencies = [
 
 [[package]]
 name = "query"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "ahash 0.8.11",
  "api",
@@ -8964,7 +9007,7 @@ dependencies = [
  "stats-cli",
  "store-api",
  "streaming-stats",
- "substrait 0.9.3",
+ "substrait 0.9.4",
  "table",
  "tokio",
  "tokio-stream",
@@ -10262,6 +10305,20 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
+[[package]]
+name = "s2"
+version = "0.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc7fbc04bb52c40b5f48c9bb2d2961375301916e0c25d9f373750654d588cd5c"
+dependencies = [
+ "bigdecimal 0.3.1",
+ "cgmath",
+ "float_extras",
+ "lazy_static",
+ "libm",
+ "serde",
+]
+
 [[package]]
 name = "safe-proc-macro2"
 version = "1.0.67"
@@ -10384,7 +10441,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "script"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "arc-swap",
@@ -10678,7 +10735,7 @@ dependencies = [
 
 [[package]]
 name = "servers"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "aide",
  "api",
@@ -10705,6 +10762,7 @@ dependencies = [
  "common-mem-prof",
  "common-meta",
  "common-plugins",
+ "common-pprof",
  "common-query",
  "common-recordbatch",
  "common-runtime",
@@ -10787,7 +10845,7 @@ dependencies = [
 
 [[package]]
 name = "session"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "arc-swap",
@@ -10899,7 +10957,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0b7840f121a46d63066ee7a99fc81dcabbc6105e437cae43528cea199b5a05f"
 dependencies = [
- "approx",
+ "approx 0.5.1",
  "num-complex",
  "num-traits",
  "paste",
@@ -11108,7 +11166,7 @@ dependencies = [
 
 [[package]]
 name = "sql"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "chrono",
@@ -11169,7 +11227,7 @@ dependencies = [
 
 [[package]]
 name = "sqlness-runner"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "async-trait",
  "clap 4.5.19",
@@ -11370,7 +11428,7 @@ version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b35a062dbadac17a42e0fc64c27f419b25d6fae98572eb43c8814c9e873d7721"
 dependencies = [
- "approx",
+ "approx 0.5.1",
  "lazy_static",
  "nalgebra",
  "num-traits",
@@ -11389,7 +11447,7 @@ dependencies = [
 
 [[package]]
 name = "store-api"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "aquamarine",
@@ -11558,7 +11616,7 @@ dependencies = [
 
 [[package]]
 name = "substrait"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "async-trait",
  "bytes",
@@ -11757,7 +11815,7 @@ dependencies = [
 
 [[package]]
 name = "table"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "async-trait",
@@ -12023,7 +12081,7 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "tests-fuzz"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "arbitrary",
  "async-trait",
@@ -12065,7 +12123,7 @@ dependencies = [
 
 [[package]]
 name = "tests-integration"
-version = "0.9.3"
+version = "0.9.4"
 dependencies = [
  "api",
  "arrow-flight",
@@ -12127,7 +12185,7 @@ dependencies = [
  "sql",
  "sqlx",
  "store-api",
- "substrait 0.9.3",
+ "substrait 0.9.4",
  "table",
  "tempfile",
  "time",

Cargo.toml

@@ -20,6 +20,7 @@ members = [
     "src/common/mem-prof",
     "src/common/meta",
     "src/common/plugins",
+    "src/common/pprof",
     "src/common/procedure",
     "src/common/procedure-test",
     "src/common/query",
@@ -64,7 +65,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.9.3"
+version = "0.9.4"
 edition = "2021"
 license = "Apache-2.0"
 
@@ -142,7 +143,7 @@ parquet = { version = "51.0.0", default-features = false, features = ["arrow", "
 paste = "1.0"
 pin-project = "1.0"
 prometheus = { version = "0.13.3", features = ["process"] }
-promql-parser = { version = "0.4" }
+promql-parser = { version = "0.4.1" }
 prost = "0.12"
 raft-engine = { version = "0.4.1", default-features = false }
 rand = "0.8"
@@ -208,6 +209,7 @@ common-macro = { path = "src/common/macro" }
 common-mem-prof = { path = "src/common/mem-prof" }
 common-meta = { path = "src/common/meta" }
 common-plugins = { path = "src/common/plugins" }
+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" }

docs/how-to/how-to-profile-cpu.md

@@ -1,11 +1,5 @@
 # Profiling CPU
 
-## Build GreptimeDB with `pprof` feature
-
-```bash
-cargo build --features=pprof
-```
-
 ## HTTP API
 Sample at 99 Hertz, for 5 seconds, output report in [protobuf format](https://github.com/google/pprof/blob/master/proto/profile.proto).
 ```bash

docs/how-to/how-to-profile-memory.md

@@ -18,12 +18,6 @@ sudo apt install libjemalloc-dev
 curl https://raw.githubusercontent.com/brendangregg/FlameGraph/master/flamegraph.pl > ./flamegraph.pl
 ```
 
-### Build GreptimeDB with `mem-prof` feature.
-
-```bash
-cargo build --features=mem-prof
-```
-
 ## Profiling
 
 Start GreptimeDB instance with environment variables:

src/api/src/helper.rs

@@ -17,10 +17,11 @@ use std::sync::Arc;
 use common_base::BitVec;
 use common_decimal::decimal128::{DECIMAL128_DEFAULT_SCALE, DECIMAL128_MAX_PRECISION};
 use common_decimal::Decimal128;
-use common_time::interval::IntervalUnit;
 use common_time::time::Time;
 use common_time::timestamp::TimeUnit;
-use common_time::{Date, DateTime, Interval, Timestamp};
+use common_time::{
+    Date, DateTime, IntervalDayTime, IntervalMonthDayNano, IntervalYearMonth, Timestamp,
+};
 use datatypes::prelude::{ConcreteDataType, ValueRef};
 use datatypes::scalars::ScalarVector;
 use datatypes::types::{
@@ -456,13 +457,11 @@ pub fn push_vals(column: &mut Column, origin_count: usize, vector: VectorRef) {
             TimeUnit::Microsecond => values.time_microsecond_values.push(val.value()),
             TimeUnit::Nanosecond => values.time_nanosecond_values.push(val.value()),
         },
-        Value::Interval(val) => match val.unit() {
+        Value::IntervalYearMonth(val) => values.interval_year_month_values.push(val.to_i32()),
-            IntervalUnit::YearMonth => values.interval_year_month_values.push(val.to_i32()),
+        Value::IntervalDayTime(val) => values.interval_day_time_values.push(val.to_i64()),
-            IntervalUnit::DayTime => values.interval_day_time_values.push(val.to_i64()),
+        Value::IntervalMonthDayNano(val) => values
-            IntervalUnit::MonthDayNano => values
+            .interval_month_day_nano_values
-                .interval_month_day_nano_values
+            .push(convert_month_day_nano_to_pb(val)),
-                .push(convert_i128_to_interval(val.to_i128())),
-        },
         Value::Decimal128(val) => values.decimal128_values.push(convert_to_pb_decimal128(val)),
         Value::List(_) | Value::Duration(_) => unreachable!(),
     });
@@ -507,14 +506,12 @@ fn ddl_request_type(request: &DdlRequest) -> &'static str {
     }
 }
 
-/// Converts an i128 value to google protobuf type [IntervalMonthDayNano].
+/// Converts an interval to google protobuf type [IntervalMonthDayNano].
-pub fn convert_i128_to_interval(v: i128) -> v1::IntervalMonthDayNano {
+pub fn convert_month_day_nano_to_pb(v: IntervalMonthDayNano) -> v1::IntervalMonthDayNano {
-    let interval = Interval::from_i128(v);
-    let (months, days, nanoseconds) = interval.to_month_day_nano();
     v1::IntervalMonthDayNano {
-        months,
+        months: v.months,
-        days,
+        days: v.days,
-        nanoseconds,
+        nanoseconds: v.nanoseconds,
     }
 }
 
@@ -562,11 +559,15 @@ pub fn pb_value_to_value_ref<'a>(
         ValueData::TimeMillisecondValue(t) => ValueRef::Time(Time::new_millisecond(*t)),
         ValueData::TimeMicrosecondValue(t) => ValueRef::Time(Time::new_microsecond(*t)),
         ValueData::TimeNanosecondValue(t) => ValueRef::Time(Time::new_nanosecond(*t)),
-        ValueData::IntervalYearMonthValue(v) => ValueRef::Interval(Interval::from_i32(*v)),
+        ValueData::IntervalYearMonthValue(v) => {
-        ValueData::IntervalDayTimeValue(v) => ValueRef::Interval(Interval::from_i64(*v)),
+            ValueRef::IntervalYearMonth(IntervalYearMonth::from_i32(*v))
+        }
+        ValueData::IntervalDayTimeValue(v) => {
+            ValueRef::IntervalDayTime(IntervalDayTime::from_i64(*v))
+        }
         ValueData::IntervalMonthDayNanoValue(v) => {
-            let interval = Interval::from_month_day_nano(v.months, v.days, v.nanoseconds);
+            let interval = IntervalMonthDayNano::new(v.months, v.days, v.nanoseconds);
-            ValueRef::Interval(interval)
+            ValueRef::IntervalMonthDayNano(interval)
         }
         ValueData::Decimal128Value(v) => {
             // get precision and scale from datatype_extension
@@ -657,7 +658,7 @@ pub fn pb_values_to_vector_ref(data_type: &ConcreteDataType, values: Values) ->
             IntervalType::MonthDayNano(_) => {
                 Arc::new(IntervalMonthDayNanoVector::from_iter_values(
                     values.interval_month_day_nano_values.iter().map(|x| {
-                        Interval::from_month_day_nano(x.months, x.days, x.nanoseconds).to_i128()
+                        IntervalMonthDayNano::new(x.months, x.days, x.nanoseconds).to_i128()
                     }),
                 ))
             }
@@ -802,18 +803,18 @@ pub fn pb_values_to_values(data_type: &ConcreteDataType, values: Values) -> Vec<
         ConcreteDataType::Interval(IntervalType::YearMonth(_)) => values
             .interval_year_month_values
             .into_iter()
-            .map(|v| Value::Interval(Interval::from_i32(v)))
+            .map(|v| Value::IntervalYearMonth(IntervalYearMonth::from_i32(v)))
             .collect(),
         ConcreteDataType::Interval(IntervalType::DayTime(_)) => values
             .interval_day_time_values
             .into_iter()
-            .map(|v| Value::Interval(Interval::from_i64(v)))
+            .map(|v| Value::IntervalDayTime(IntervalDayTime::from_i64(v)))
             .collect(),
         ConcreteDataType::Interval(IntervalType::MonthDayNano(_)) => values
             .interval_month_day_nano_values
             .into_iter()
             .map(|v| {
-                Value::Interval(Interval::from_month_day_nano(
+                Value::IntervalMonthDayNano(IntervalMonthDayNano::new(
                     v.months,
                     v.days,
                     v.nanoseconds,
@@ -941,18 +942,16 @@ pub fn to_proto_value(value: Value) -> Option<v1::Value> {
                 value_data: Some(ValueData::TimeNanosecondValue(v.value())),
             },
         },
-        Value::Interval(v) => match v.unit() {
+        Value::IntervalYearMonth(v) => v1::Value {
-            IntervalUnit::YearMonth => v1::Value {
+            value_data: Some(ValueData::IntervalYearMonthValue(v.to_i32())),
-                value_data: Some(ValueData::IntervalYearMonthValue(v.to_i32())),
+        },
-            },
+        Value::IntervalDayTime(v) => v1::Value {
-            IntervalUnit::DayTime => v1::Value {
+            value_data: Some(ValueData::IntervalDayTimeValue(v.to_i64())),
-                value_data: Some(ValueData::IntervalDayTimeValue(v.to_i64())),
+        },
-            },
+        Value::IntervalMonthDayNano(v) => v1::Value {
-            IntervalUnit::MonthDayNano => v1::Value {
+            value_data: Some(ValueData::IntervalMonthDayNanoValue(
-                value_data: Some(ValueData::IntervalMonthDayNanoValue(
+                convert_month_day_nano_to_pb(v),
-                    convert_i128_to_interval(v.to_i128()),
+            )),
-                )),
-            },
         },
         Value::Decimal128(v) => v1::Value {
             value_data: Some(ValueData::Decimal128Value(convert_to_pb_decimal128(v))),
@@ -1044,13 +1043,11 @@ pub fn value_to_grpc_value(value: Value) -> GrpcValue {
                 TimeUnit::Microsecond => ValueData::TimeMicrosecondValue(v.value()),
                 TimeUnit::Nanosecond => ValueData::TimeNanosecondValue(v.value()),
             }),
-            Value::Interval(v) => Some(match v.unit() {
+            Value::IntervalYearMonth(v) => Some(ValueData::IntervalYearMonthValue(v.to_i32())),
-                IntervalUnit::YearMonth => ValueData::IntervalYearMonthValue(v.to_i32()),
+            Value::IntervalDayTime(v) => Some(ValueData::IntervalDayTimeValue(v.to_i64())),
-                IntervalUnit::DayTime => ValueData::IntervalDayTimeValue(v.to_i64()),
+            Value::IntervalMonthDayNano(v) => Some(ValueData::IntervalMonthDayNanoValue(
-                IntervalUnit::MonthDayNano => {
+                convert_month_day_nano_to_pb(v),
-                    ValueData::IntervalMonthDayNanoValue(convert_i128_to_interval(v.to_i128()))
+            )),
-                }
-            }),
             Value::Decimal128(v) => Some(ValueData::Decimal128Value(convert_to_pb_decimal128(v))),
             Value::List(_) | Value::Duration(_) => unreachable!(),
         },
@@ -1061,6 +1058,7 @@ pub fn value_to_grpc_value(value: Value) -> GrpcValue {
 mod tests {
     use std::sync::Arc;
 
+    use common_time::interval::IntervalUnit;
     use datatypes::types::{
         Int32Type, IntervalDayTimeType, IntervalMonthDayNanoType, IntervalYearMonthType,
         TimeMillisecondType, TimeSecondType, TimestampMillisecondType, TimestampSecondType,
@@ -1506,11 +1504,11 @@ mod tests {
 
     #[test]
     fn test_convert_i128_to_interval() {
-        let i128_val = 3000;
+        let i128_val = 3;
-        let interval = convert_i128_to_interval(i128_val);
+        let interval = convert_month_day_nano_to_pb(IntervalMonthDayNano::from_i128(i128_val));
         assert_eq!(interval.months, 0);
         assert_eq!(interval.days, 0);
-        assert_eq!(interval.nanoseconds, 3000);
+        assert_eq!(interval.nanoseconds, 3);
     }
 
     #[test]
@@ -1590,9 +1588,9 @@ mod tests {
             },
         );
         let expect = vec![
-            Value::Interval(Interval::from_year_month(1_i32)),
+            Value::IntervalYearMonth(IntervalYearMonth::new(1_i32)),
-            Value::Interval(Interval::from_year_month(2_i32)),
+            Value::IntervalYearMonth(IntervalYearMonth::new(2_i32)),
-            Value::Interval(Interval::from_year_month(3_i32)),
+            Value::IntervalYearMonth(IntervalYearMonth::new(3_i32)),
         ];
         assert_eq!(expect, actual);
 
@@ -1605,9 +1603,9 @@ mod tests {
             },
         );
         let expect = vec![
-            Value::Interval(Interval::from_i64(1_i64)),
+            Value::IntervalDayTime(IntervalDayTime::from_i64(1_i64)),
-            Value::Interval(Interval::from_i64(2_i64)),
+            Value::IntervalDayTime(IntervalDayTime::from_i64(2_i64)),
-            Value::Interval(Interval::from_i64(3_i64)),
+            Value::IntervalDayTime(IntervalDayTime::from_i64(3_i64)),
         ];
         assert_eq!(expect, actual);
 
@@ -1636,9 +1634,9 @@ mod tests {
             },
         );
         let expect = vec![
-            Value::Interval(Interval::from_month_day_nano(1, 2, 3)),
+            Value::IntervalMonthDayNano(IntervalMonthDayNano::new(1, 2, 3)),
-            Value::Interval(Interval::from_month_day_nano(5, 6, 7)),
+            Value::IntervalMonthDayNano(IntervalMonthDayNano::new(5, 6, 7)),
-            Value::Interval(Interval::from_month_day_nano(9, 10, 11)),
+            Value::IntervalMonthDayNano(IntervalMonthDayNano::new(9, 10, 11)),
         ];
         assert_eq!(expect, actual);
     }

src/cmd/Cargo.toml

@@ -10,7 +10,7 @@ name = "greptime"
 path = "src/bin/greptime.rs"
 
 [features]
-default = ["python"]
+default = ["python", "servers/pprof", "servers/mem-prof"]
 tokio-console = ["common-telemetry/tokio-console"]
 python = ["frontend/python"]
 

src/cmd/src/metasrv.rs

@@ -48,6 +48,10 @@ impl Instance {
             _guard: guard,
         }
     }
+
+    pub fn get_inner(&self) -> &MetasrvInstance {
+        &self.instance
+    }
 }
 
 #[async_trait]
@@ -86,6 +90,14 @@ impl Command {
     pub fn load_options(&self, global_options: &GlobalOptions) -> Result<MetasrvOptions> {
         self.subcmd.load_options(global_options)
     }
+
+    pub fn config_file(&self) -> &Option<String> {
+        self.subcmd.config_file()
+    }
+
+    pub fn env_prefix(&self) -> &String {
+        self.subcmd.env_prefix()
+    }
 }
 
 #[derive(Parser)]
@@ -105,6 +117,18 @@ impl SubCommand {
             SubCommand::Start(cmd) => cmd.load_options(global_options),
         }
     }
+
+    fn config_file(&self) -> &Option<String> {
+        match self {
+            SubCommand::Start(cmd) => &cmd.config_file,
+        }
+    }
+
+    fn env_prefix(&self) -> &String {
+        match self {
+            SubCommand::Start(cmd) => &cmd.env_prefix,
+        }
+    }
 }
 
 #[derive(Debug, Default, Parser)]

src/cmd/src/standalone.rs

@@ -653,7 +653,7 @@ impl StartCommand {
     }
 }
 
-struct StandaloneInformationExtension {
+pub struct StandaloneInformationExtension {
     region_server: RegionServer,
     procedure_manager: ProcedureManagerRef,
     start_time_ms: u64,

src/common/base/src/plugins.rs

@@ -38,6 +38,18 @@ impl Plugins {
         self.read().get::<T>().cloned()
     }
 
+    pub fn get_or_insert<T, F>(&self, f: F) -> T
+    where
+        T: 'static + Send + Sync + Clone,
+        F: FnOnce() -> T,
+    {
+        let mut binding = self.write();
+        if !binding.contains::<T>() {
+            binding.insert(f());
+        }
+        binding.get::<T>().cloned().unwrap()
+    }
+
     pub fn map_mut<T: 'static + Send + Sync, F, R>(&self, mapper: F) -> R
     where
         F: FnOnce(Option<&mut T>) -> R,

src/common/function/Cargo.toml

@@ -9,7 +9,7 @@ workspace = true
 
 [features]
 default = ["geo"]
-geo = ["geohash", "h3o"]
+geo = ["geohash", "h3o", "s2"]
 
 [dependencies]
 api.workspace = true
@@ -35,6 +35,7 @@ num = "0.4"
 num-traits = "0.2"
 once_cell.workspace = true
 paste = "1.0"
+s2 = { version = "0.0.12", optional = true }
 serde.workspace = true
 serde_json.workspace = true
 session.workspace = true

src/common/function/src/scalars/date/date_add.rs

@@ -14,18 +14,19 @@
 
 use std::fmt;
 
-use common_query::error::{InvalidFuncArgsSnafu, Result, UnsupportedInputDataTypeSnafu};
+use common_query::error::{ArrowComputeSnafu, IntoVectorSnafu, InvalidFuncArgsSnafu, Result};
 use common_query::prelude::Signature;
-use datatypes::data_type::DataType;
+use datatypes::arrow::compute::kernels::numeric;
 use datatypes::prelude::ConcreteDataType;
-use datatypes::value::ValueRef;
+use datatypes::vectors::{Helper, VectorRef};
-use datatypes::vectors::VectorRef;
+use snafu::{ensure, ResultExt};
-use snafu::ensure;
 
 use crate::function::{Function, FunctionContext};
 use crate::helper;
 
-/// A function adds an interval value to Timestamp, Date or DateTime, and return the result.
+/// A function adds an interval value to Timestamp, Date, and return the result.
+/// The implementation of datetime type is based on Date64 which is incorrect so this function
+/// doesn't support the datetime type.
 #[derive(Clone, Debug, Default)]
 pub struct DateAddFunction;
 
@@ -44,7 +45,6 @@ impl Function for DateAddFunction {
         helper::one_of_sigs2(
             vec![
                 ConcreteDataType::date_datatype(),
-                ConcreteDataType::datetime_datatype(),
                 ConcreteDataType::timestamp_second_datatype(),
                 ConcreteDataType::timestamp_millisecond_datatype(),
                 ConcreteDataType::timestamp_microsecond_datatype(),
@@ -69,64 +69,14 @@ impl Function for DateAddFunction {
             }
         );
 
-        let left = &columns[0];
+        let left = columns[0].to_arrow_array();
-        let right = &columns[1];
+        let right = columns[1].to_arrow_array();
 
-        let size = left.len();
+        let result = numeric::add(&left, &right).context(ArrowComputeSnafu)?;
-        let left_datatype = columns[0].data_type();
+        let arrow_type = result.data_type().clone();
-        match left_datatype {
+        Helper::try_into_vector(result).context(IntoVectorSnafu {
-            ConcreteDataType::Timestamp(_) => {
+            data_type: arrow_type,
-                let mut result = left_datatype.create_mutable_vector(size);
+        })
-                for i in 0..size {
-                    let ts = left.get(i).as_timestamp();
-                    let interval = right.get(i).as_interval();
-
-                    let new_ts = match (ts, interval) {
-                        (Some(ts), Some(interval)) => ts.add_interval(interval),
-                        _ => ts,
-                    };
-
-                    result.push_value_ref(ValueRef::from(new_ts));
-                }
-
-                Ok(result.to_vector())
-            }
-            ConcreteDataType::Date(_) => {
-                let mut result = left_datatype.create_mutable_vector(size);
-                for i in 0..size {
-                    let date = left.get(i).as_date();
-                    let interval = right.get(i).as_interval();
-                    let new_date = match (date, interval) {
-                        (Some(date), Some(interval)) => date.add_interval(interval),
-                        _ => date,
-                    };
-
-                    result.push_value_ref(ValueRef::from(new_date));
-                }
-
-                Ok(result.to_vector())
-            }
-            ConcreteDataType::DateTime(_) => {
-                let mut result = left_datatype.create_mutable_vector(size);
-                for i in 0..size {
-                    let datetime = left.get(i).as_datetime();
-                    let interval = right.get(i).as_interval();
-                    let new_datetime = match (datetime, interval) {
-                        (Some(datetime), Some(interval)) => datetime.add_interval(interval),
-                        _ => datetime,
-                    };
-
-                    result.push_value_ref(ValueRef::from(new_datetime));
-                }
-
-                Ok(result.to_vector())
-            }
-            _ => UnsupportedInputDataTypeSnafu {
-                function: NAME,
-                datatypes: columns.iter().map(|c| c.data_type()).collect::<Vec<_>>(),
-            }
-            .fail(),
-        }
     }
 }
 
@@ -144,8 +94,7 @@ mod tests {
     use datatypes::prelude::ConcreteDataType;
     use datatypes::value::Value;
     use datatypes::vectors::{
-        DateTimeVector, DateVector, IntervalDayTimeVector, IntervalYearMonthVector,
+        DateVector, IntervalDayTimeVector, IntervalYearMonthVector, TimestampSecondVector,
-        TimestampSecondVector,
     };
 
     use super::{DateAddFunction, *};
@@ -168,16 +117,15 @@ mod tests {
             ConcreteDataType::date_datatype(),
             f.return_type(&[ConcreteDataType::date_datatype()]).unwrap()
         );
-        assert_eq!(
+        assert!(
-            ConcreteDataType::datetime_datatype(),
+            matches!(f.signature(),
-            f.return_type(&[ConcreteDataType::datetime_datatype()])
-                .unwrap()
-        );
-        assert!(matches!(f.signature(),
                          Signature {
                              type_signature: TypeSignature::OneOf(sigs),
                              volatility: Volatility::Immutable
-                         } if  sigs.len() == 18));
+                         } if  sigs.len() == 15),
+            "{:?}",
+            f.signature()
+        );
     }
 
     #[test]
@@ -243,36 +191,4 @@ mod tests {
             }
         }
     }
-
-    #[test]
-    fn test_datetime_date_add() {
-        let f = DateAddFunction;
-
-        let dates = vec![Some(123), None, Some(42), None];
-        // Intervals in months
-        let intervals = vec![1, 2, 3, 1];
-        let results = [Some(2678400123), None, Some(7776000042), None];
-
-        let date_vector = DateTimeVector::from(dates.clone());
-        let interval_vector = IntervalYearMonthVector::from_vec(intervals);
-        let args: Vec<VectorRef> = vec![Arc::new(date_vector), Arc::new(interval_vector)];
-        let vector = f.eval(FunctionContext::default(), &args).unwrap();
-
-        assert_eq!(4, vector.len());
-        for (i, _t) in dates.iter().enumerate() {
-            let v = vector.get(i);
-            let result = results.get(i).unwrap();
-
-            if result.is_none() {
-                assert_eq!(Value::Null, v);
-                continue;
-            }
-            match v {
-                Value::DateTime(date) => {
-                    assert_eq!(date.val(), result.unwrap());
-                }
-                _ => unreachable!(),
-            }
-        }
-    }
 }

src/common/function/src/scalars/date/date_sub.rs

@@ -14,18 +14,19 @@
 
 use std::fmt;
 
-use common_query::error::{InvalidFuncArgsSnafu, Result, UnsupportedInputDataTypeSnafu};
+use common_query::error::{ArrowComputeSnafu, IntoVectorSnafu, InvalidFuncArgsSnafu, Result};
 use common_query::prelude::Signature;
-use datatypes::data_type::DataType;
+use datatypes::arrow::compute::kernels::numeric;
 use datatypes::prelude::ConcreteDataType;
-use datatypes::value::ValueRef;
+use datatypes::vectors::{Helper, VectorRef};
-use datatypes::vectors::VectorRef;
+use snafu::{ensure, ResultExt};
-use snafu::ensure;
 
 use crate::function::{Function, FunctionContext};
 use crate::helper;
 
-/// A function subtracts an interval value to Timestamp, Date or DateTime, and return the result.
+/// A function subtracts an interval value to Timestamp, Date, and return the result.
+/// The implementation of datetime type is based on Date64 which is incorrect so this function
+/// doesn't support the datetime type.
 #[derive(Clone, Debug, Default)]
 pub struct DateSubFunction;
 
@@ -44,7 +45,6 @@ impl Function for DateSubFunction {
         helper::one_of_sigs2(
             vec![
                 ConcreteDataType::date_datatype(),
-                ConcreteDataType::datetime_datatype(),
                 ConcreteDataType::timestamp_second_datatype(),
                 ConcreteDataType::timestamp_millisecond_datatype(),
                 ConcreteDataType::timestamp_microsecond_datatype(),
@@ -69,65 +69,14 @@ impl Function for DateSubFunction {
             }
         );
 
-        let left = &columns[0];
+        let left = columns[0].to_arrow_array();
-        let right = &columns[1];
+        let right = columns[1].to_arrow_array();
 
-        let size = left.len();
+        let result = numeric::sub(&left, &right).context(ArrowComputeSnafu)?;
-        let left_datatype = columns[0].data_type();
+        let arrow_type = result.data_type().clone();
-
+        Helper::try_into_vector(result).context(IntoVectorSnafu {
-        match left_datatype {
+            data_type: arrow_type,
-            ConcreteDataType::Timestamp(_) => {
+        })
-                let mut result = left_datatype.create_mutable_vector(size);
-                for i in 0..size {
-                    let ts = left.get(i).as_timestamp();
-                    let interval = right.get(i).as_interval();
-
-                    let new_ts = match (ts, interval) {
-                        (Some(ts), Some(interval)) => ts.sub_interval(interval),
-                        _ => ts,
-                    };
-
-                    result.push_value_ref(ValueRef::from(new_ts));
-                }
-
-                Ok(result.to_vector())
-            }
-            ConcreteDataType::Date(_) => {
-                let mut result = left_datatype.create_mutable_vector(size);
-                for i in 0..size {
-                    let date = left.get(i).as_date();
-                    let interval = right.get(i).as_interval();
-                    let new_date = match (date, interval) {
-                        (Some(date), Some(interval)) => date.sub_interval(interval),
-                        _ => date,
-                    };
-
-                    result.push_value_ref(ValueRef::from(new_date));
-                }
-
-                Ok(result.to_vector())
-            }
-            ConcreteDataType::DateTime(_) => {
-                let mut result = left_datatype.create_mutable_vector(size);
-                for i in 0..size {
-                    let datetime = left.get(i).as_datetime();
-                    let interval = right.get(i).as_interval();
-                    let new_datetime = match (datetime, interval) {
-                        (Some(datetime), Some(interval)) => datetime.sub_interval(interval),
-                        _ => datetime,
-                    };
-
-                    result.push_value_ref(ValueRef::from(new_datetime));
-                }
-
-                Ok(result.to_vector())
-            }
-            _ => UnsupportedInputDataTypeSnafu {
-                function: NAME,
-                datatypes: columns.iter().map(|c| c.data_type()).collect::<Vec<_>>(),
-            }
-            .fail(),
-        }
     }
 }
 
@@ -145,8 +94,7 @@ mod tests {
     use datatypes::prelude::ConcreteDataType;
     use datatypes::value::Value;
     use datatypes::vectors::{
-        DateTimeVector, DateVector, IntervalDayTimeVector, IntervalYearMonthVector,
+        DateVector, IntervalDayTimeVector, IntervalYearMonthVector, TimestampSecondVector,
-        TimestampSecondVector,
     };
 
     use super::{DateSubFunction, *};
@@ -174,11 +122,15 @@ mod tests {
             f.return_type(&[ConcreteDataType::datetime_datatype()])
                 .unwrap()
         );
-        assert!(matches!(f.signature(),
+        assert!(
+            matches!(f.signature(),
                          Signature {
                              type_signature: TypeSignature::OneOf(sigs),
                              volatility: Volatility::Immutable
-                         } if  sigs.len() == 18));
+                         } if  sigs.len() == 15),
+            "{:?}",
+            f.signature()
+        );
     }
 
     #[test]
@@ -250,42 +202,4 @@ mod tests {
             }
         }
     }
-
-    #[test]
-    fn test_datetime_date_sub() {
-        let f = DateSubFunction;
-        let millis_per_month = 3600 * 24 * 30 * 1000;
-
-        let dates = vec![
-            Some(123 * millis_per_month),
-            None,
-            Some(42 * millis_per_month),
-            None,
-        ];
-        // Intervals in months
-        let intervals = vec![1, 2, 3, 1];
-        let results = [Some(316137600000), None, Some(100915200000), None];
-
-        let date_vector = DateTimeVector::from(dates.clone());
-        let interval_vector = IntervalYearMonthVector::from_vec(intervals);
-        let args: Vec<VectorRef> = vec![Arc::new(date_vector), Arc::new(interval_vector)];
-        let vector = f.eval(FunctionContext::default(), &args).unwrap();
-
-        assert_eq!(4, vector.len());
-        for (i, _t) in dates.iter().enumerate() {
-            let v = vector.get(i);
-            let result = results.get(i).unwrap();
-
-            if result.is_none() {
-                assert_eq!(Value::Null, v);
-                continue;
-            }
-            match v {
-                Value::DateTime(date) => {
-                    assert_eq!(date.val(), result.unwrap());
-                }
-                _ => unreachable!(),
-            }
-        }
-    }
 }

src/common/function/src/scalars/geo.rs

@@ -17,8 +17,7 @@ pub(crate) mod encoding;
 mod geohash;
 mod h3;
 mod helpers;
-
+mod s2;
-use geohash::{GeohashFunction, GeohashNeighboursFunction};
 
 use crate::function_registry::FunctionRegistry;
 
@@ -27,8 +26,8 @@ pub(crate) struct GeoFunctions;
 impl GeoFunctions {
     pub fn register(registry: &FunctionRegistry) {
         // geohash
-        registry.register(Arc::new(GeohashFunction));
+        registry.register(Arc::new(geohash::GeohashFunction));
-        registry.register(Arc::new(GeohashNeighboursFunction));
+        registry.register(Arc::new(geohash::GeohashNeighboursFunction));
 
         // h3 index
         registry.register(Arc::new(h3::H3LatLngToCell));
@@ -55,5 +54,11 @@ impl GeoFunctions {
         registry.register(Arc::new(h3::H3GridDiskDistances));
         registry.register(Arc::new(h3::H3GridDistance));
         registry.register(Arc::new(h3::H3GridPathCells));
+
+        // s2
+        registry.register(Arc::new(s2::S2LatLngToCell));
+        registry.register(Arc::new(s2::S2CellLevel));
+        registry.register(Arc::new(s2::S2CellToToken));
+        registry.register(Arc::new(s2::S2CellParent));
     }
 }

src/common/function/src/scalars/geo/encoding.rs

@@ -17,7 +17,7 @@ use std::sync::Arc;
 use common_error::ext::{BoxedError, PlainError};
 use common_error::status_code::StatusCode;
 use common_macro::{as_aggr_func_creator, AggrFuncTypeStore};
-use common_query::error::{self, InvalidFuncArgsSnafu, InvalidInputStateSnafu, Result};
+use common_query::error::{self, InvalidInputStateSnafu, Result};
 use common_query::logical_plan::accumulator::AggrFuncTypeStore;
 use common_query::logical_plan::{Accumulator, AggregateFunctionCreator};
 use common_query::prelude::AccumulatorCreatorFunction;

src/common/function/src/scalars/geo/h3.rs

@@ -16,7 +16,7 @@ use std::str::FromStr;
 
 use common_error::ext::{BoxedError, PlainError};
 use common_error::status_code::StatusCode;
-use common_query::error::{self, InvalidFuncArgsSnafu, Result};
+use common_query::error::{self, Result};
 use common_query::prelude::{Signature, TypeSignature};
 use datafusion::logical_expr::Volatility;
 use datatypes::prelude::ConcreteDataType;
@@ -29,9 +29,9 @@ use datatypes::vectors::{
 use derive_more::Display;
 use h3o::{CellIndex, LatLng, Resolution};
 use once_cell::sync::Lazy;
-use snafu::{ensure, ResultExt};
+use snafu::ResultExt;
 
-use super::helpers::{ensure_columns_len, ensure_columns_n};
+use super::helpers::{ensure_and_coerce, ensure_columns_len, ensure_columns_n};
 use crate::function::{Function, FunctionContext};
 
 static CELL_TYPES: Lazy<Vec<ConcreteDataType>> = Lazy::new(|| {
@@ -382,15 +382,7 @@ impl Function for H3CellResolution {
     }
 
     fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
-        ensure!(
+        ensure_columns_n!(columns, 1);
-            columns.len() == 1,
-            InvalidFuncArgsSnafu {
-                err_msg: format!(
-                    "The length of the args is not correct, expect 1, provided : {}",
-                    columns.len()
-                ),
-            }
-        );
 
         let cell_vec = &columns[0];
         let size = cell_vec.len();
@@ -982,18 +974,6 @@ fn value_to_resolution(v: Value) -> Result<Resolution> {
         .context(error::ExecuteSnafu)
 }
 
-macro_rules! ensure_and_coerce {
-    ($compare:expr, $coerce:expr) => {{
-        ensure!(
-            $compare,
-            InvalidFuncArgsSnafu {
-                err_msg: "Argument was outside of acceptable range "
-            }
-        );
-        Ok($coerce)
-    }};
-}
-
 fn value_to_position(v: Value) -> Result<u64> {
     match v {
         Value::Int8(v) => ensure_and_coerce!(v >= 0, v as u64),

src/common/function/src/scalars/geo/helpers.rs

@@ -14,15 +14,15 @@
 
 macro_rules! ensure_columns_len {
     ($columns:ident) => {
-        ensure!(
+        snafu::ensure!(
             $columns.windows(2).all(|c| c[0].len() == c[1].len()),
-            InvalidFuncArgsSnafu {
+            common_query::error::InvalidFuncArgsSnafu {
                 err_msg: "The length of input columns are in different size"
             }
         )
     };
     ($column_a:ident, $column_b:ident, $($column_n:ident),*) => {
-        ensure!(
+        snafu::ensure!(
             {
                 let mut result = $column_a.len() == $column_b.len();
                 $(
@@ -30,7 +30,7 @@ macro_rules! ensure_columns_len {
                 )*
                 result
             }
-            InvalidFuncArgsSnafu {
+            common_query::error::InvalidFuncArgsSnafu {
                 err_msg: "The length of input columns are in different size"
             }
         )
@@ -41,9 +41,9 @@ pub(super) use ensure_columns_len;
 
 macro_rules! ensure_columns_n {
     ($columns:ident, $n:literal) => {
-        ensure!(
+        snafu::ensure!(
             $columns.len() == $n,
-            InvalidFuncArgsSnafu {
+            common_query::error::InvalidFuncArgsSnafu {
                 err_msg: format!(
                     "The length of arguments is not correct, expect {}, provided : {}",
                     stringify!($n),
@@ -59,3 +59,17 @@ macro_rules! ensure_columns_n {
 }
 
 pub(super) use ensure_columns_n;
+
+macro_rules! ensure_and_coerce {
+    ($compare:expr, $coerce:expr) => {{
+        snafu::ensure!(
+            $compare,
+            common_query::error::InvalidFuncArgsSnafu {
+                err_msg: "Argument was outside of acceptable range "
+            }
+        );
+        Ok($coerce)
+    }};
+}
+
+pub(super) use ensure_and_coerce;

src/common/function/src/scalars/geo/s2.rs

@@ -0,0 +1,275 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use common_query::error::{InvalidFuncArgsSnafu, Result};
+use common_query::prelude::{Signature, TypeSignature};
+use datafusion::logical_expr::Volatility;
+use datatypes::prelude::ConcreteDataType;
+use datatypes::scalars::ScalarVectorBuilder;
+use datatypes::value::Value;
+use datatypes::vectors::{MutableVector, StringVectorBuilder, UInt64VectorBuilder, VectorRef};
+use derive_more::Display;
+use once_cell::sync::Lazy;
+use s2::cellid::{CellID, MAX_LEVEL};
+use s2::latlng::LatLng;
+use snafu::ensure;
+
+use crate::function::{Function, FunctionContext};
+use crate::scalars::geo::helpers::{ensure_and_coerce, ensure_columns_len, ensure_columns_n};
+
+static CELL_TYPES: Lazy<Vec<ConcreteDataType>> = Lazy::new(|| {
+    vec![
+        ConcreteDataType::int64_datatype(),
+        ConcreteDataType::uint64_datatype(),
+    ]
+});
+
+static COORDINATE_TYPES: Lazy<Vec<ConcreteDataType>> = Lazy::new(|| {
+    vec![
+        ConcreteDataType::float32_datatype(),
+        ConcreteDataType::float64_datatype(),
+    ]
+});
+
+static LEVEL_TYPES: Lazy<Vec<ConcreteDataType>> = Lazy::new(|| {
+    vec![
+        ConcreteDataType::int8_datatype(),
+        ConcreteDataType::int16_datatype(),
+        ConcreteDataType::int32_datatype(),
+        ConcreteDataType::int64_datatype(),
+        ConcreteDataType::uint8_datatype(),
+        ConcreteDataType::uint16_datatype(),
+        ConcreteDataType::uint32_datatype(),
+        ConcreteDataType::uint64_datatype(),
+    ]
+});
+
+/// Function that returns [s2] encoding cellid for a given geospatial coordinate.
+///
+/// [s2]: http://s2geometry.io
+#[derive(Clone, Debug, Default, Display)]
+#[display("{}", self.name())]
+pub struct S2LatLngToCell;
+
+impl Function for S2LatLngToCell {
+    fn name(&self) -> &str {
+        "s2_latlng_to_cell"
+    }
+
+    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
+        Ok(ConcreteDataType::uint64_datatype())
+    }
+
+    fn signature(&self) -> Signature {
+        let mut signatures = Vec::with_capacity(COORDINATE_TYPES.len());
+        for coord_type in COORDINATE_TYPES.as_slice() {
+            signatures.push(TypeSignature::Exact(vec![
+                // latitude
+                coord_type.clone(),
+                // longitude
+                coord_type.clone(),
+            ]));
+        }
+        Signature::one_of(signatures, Volatility::Stable)
+    }
+
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+        ensure_columns_n!(columns, 2);
+
+        let lat_vec = &columns[0];
+        let lon_vec = &columns[1];
+
+        let size = lat_vec.len();
+        let mut results = UInt64VectorBuilder::with_capacity(size);
+
+        for i in 0..size {
+            let lat = lat_vec.get(i).as_f64_lossy();
+            let lon = lon_vec.get(i).as_f64_lossy();
+
+            let result = match (lat, lon) {
+                (Some(lat), Some(lon)) => {
+                    let coord = LatLng::from_degrees(lat, lon);
+                    ensure!(
+                        coord.is_valid(),
+                        InvalidFuncArgsSnafu {
+                            err_msg: "The input coordinates are invalid",
+                        }
+                    );
+                    let cellid = CellID::from(coord);
+                    let encoded: u64 = cellid.0;
+                    Some(encoded)
+                }
+                _ => None,
+            };
+
+            results.push(result);
+        }
+
+        Ok(results.to_vector())
+    }
+}
+
+/// Return the level of current s2 cell
+#[derive(Clone, Debug, Default, Display)]
+#[display("{}", self.name())]
+pub struct S2CellLevel;
+
+impl Function for S2CellLevel {
+    fn name(&self) -> &str {
+        "s2_cell_level"
+    }
+
+    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
+        Ok(ConcreteDataType::uint64_datatype())
+    }
+
+    fn signature(&self) -> Signature {
+        signature_of_cell()
+    }
+
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+        ensure_columns_n!(columns, 1);
+
+        let cell_vec = &columns[0];
+        let size = cell_vec.len();
+        let mut results = UInt64VectorBuilder::with_capacity(size);
+
+        for i in 0..size {
+            let cell = cell_from_value(cell_vec.get(i));
+            let res = cell.map(|cell| cell.level());
+
+            results.push(res);
+        }
+
+        Ok(results.to_vector())
+    }
+}
+
+/// Return the string presentation of the cell
+#[derive(Clone, Debug, Default, Display)]
+#[display("{}", self.name())]
+pub struct S2CellToToken;
+
+impl Function for S2CellToToken {
+    fn name(&self) -> &str {
+        "s2_cell_to_token"
+    }
+
+    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
+        Ok(ConcreteDataType::string_datatype())
+    }
+
+    fn signature(&self) -> Signature {
+        signature_of_cell()
+    }
+
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+        ensure_columns_n!(columns, 1);
+
+        let cell_vec = &columns[0];
+        let size = cell_vec.len();
+        let mut results = StringVectorBuilder::with_capacity(size);
+
+        for i in 0..size {
+            let cell = cell_from_value(cell_vec.get(i));
+            let res = cell.map(|cell| cell.to_token());
+
+            results.push(res.as_deref());
+        }
+
+        Ok(results.to_vector())
+    }
+}
+
+/// Return parent at given level of current s2 cell
+#[derive(Clone, Debug, Default, Display)]
+#[display("{}", self.name())]
+pub struct S2CellParent;
+
+impl Function for S2CellParent {
+    fn name(&self) -> &str {
+        "s2_cell_parent"
+    }
+
+    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
+        Ok(ConcreteDataType::uint64_datatype())
+    }
+
+    fn signature(&self) -> Signature {
+        signature_of_cell_and_level()
+    }
+
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+        ensure_columns_n!(columns, 2);
+
+        let cell_vec = &columns[0];
+        let level_vec = &columns[1];
+        let size = cell_vec.len();
+        let mut results = UInt64VectorBuilder::with_capacity(size);
+
+        for i in 0..size {
+            let cell = cell_from_value(cell_vec.get(i));
+            let level = value_to_level(level_vec.get(i))?;
+            let result = cell.map(|cell| cell.parent(level).0);
+
+            results.push(result);
+        }
+
+        Ok(results.to_vector())
+    }
+}
+
+fn signature_of_cell() -> Signature {
+    let mut signatures = Vec::with_capacity(CELL_TYPES.len());
+    for cell_type in CELL_TYPES.as_slice() {
+        signatures.push(TypeSignature::Exact(vec![cell_type.clone()]));
+    }
+
+    Signature::one_of(signatures, Volatility::Stable)
+}
+
+fn signature_of_cell_and_level() -> Signature {
+    let mut signatures = Vec::with_capacity(CELL_TYPES.len() * LEVEL_TYPES.len());
+    for cell_type in CELL_TYPES.as_slice() {
+        for level_type in LEVEL_TYPES.as_slice() {
+            signatures.push(TypeSignature::Exact(vec![
+                cell_type.clone(),
+                level_type.clone(),
+            ]));
+        }
+    }
+    Signature::one_of(signatures, Volatility::Stable)
+}
+
+fn cell_from_value(v: Value) -> Option<CellID> {
+    match v {
+        Value::Int64(v) => Some(CellID(v as u64)),
+        Value::UInt64(v) => Some(CellID(v)),
+        _ => None,
+    }
+}
+
+fn value_to_level(v: Value) -> Result<u64> {
+    match v {
+        Value::Int8(v) => ensure_and_coerce!(v >= 0 && v <= MAX_LEVEL as i8, v as u64),
+        Value::Int16(v) => ensure_and_coerce!(v >= 0 && v <= MAX_LEVEL as i16, v as u64),
+        Value::Int32(v) => ensure_and_coerce!(v >= 0 && v <= MAX_LEVEL as i32, v as u64),
+        Value::Int64(v) => ensure_and_coerce!(v >= 0 && v <= MAX_LEVEL as i64, v as u64),
+        Value::UInt8(v) => ensure_and_coerce!(v <= MAX_LEVEL as u8, v as u64),
+        Value::UInt16(v) => ensure_and_coerce!(v <= MAX_LEVEL as u16, v as u64),
+        Value::UInt32(v) => ensure_and_coerce!(v <= MAX_LEVEL as u32, v as u64),
+        Value::UInt64(v) => ensure_and_coerce!(v <= MAX_LEVEL, v),
+        _ => unreachable!(),
+    }
+}

src/common/grpc/src/select.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use api::helper::{convert_i128_to_interval, convert_to_pb_decimal128};
+use api::helper::{convert_month_day_nano_to_pb, convert_to_pb_decimal128};
 use api::v1::column::Values;
 use common_base::BitVec;
 use datatypes::types::{IntervalType, TimeType, TimestampType, WrapperType};
@@ -211,7 +211,7 @@ pub fn values(arrays: &[VectorRef]) -> Result<Values> {
             ConcreteDataType::Interval(IntervalType::MonthDayNano(_)),
             IntervalMonthDayNanoVector,
             interval_month_day_nano_values,
-            |x| { convert_i128_to_interval(x.into_native()) }
+            |x| { convert_month_day_nano_to_pb(x) }
         ),
         (
             ConcreteDataType::Decimal128(_),

src/common/meta/src/leadership_notifier.rs

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::sync::Arc;
+use std::sync::{Arc, Mutex};
 
 use async_trait::async_trait;
-use common_telemetry::error;
+use common_telemetry::{error, info};
 
 use crate::error::Result;
 
@@ -24,6 +24,8 @@ pub type LeadershipChangeNotifierCustomizerRef = Arc<dyn LeadershipChangeNotifie
 /// A trait for customizing the leadership change notifier.
 pub trait LeadershipChangeNotifierCustomizer: Send + Sync {
     fn customize(&self, notifier: &mut LeadershipChangeNotifier);
+
+    fn add_listener(&self, listener: Arc<dyn LeadershipChangeListener>);
 }
 
 /// A trait for handling leadership change events in a distributed system.
@@ -45,6 +47,31 @@ pub struct LeadershipChangeNotifier {
     listeners: Vec<Arc<dyn LeadershipChangeListener>>,
 }
 
+#[derive(Default)]
+pub struct DefaultLeadershipChangeNotifierCustomizer {
+    listeners: Mutex<Vec<Arc<dyn LeadershipChangeListener>>>,
+}
+
+impl DefaultLeadershipChangeNotifierCustomizer {
+    pub fn new() -> Self {
+        Self {
+            listeners: Mutex::new(Vec::new()),
+        }
+    }
+}
+
+impl LeadershipChangeNotifierCustomizer for DefaultLeadershipChangeNotifierCustomizer {
+    fn customize(&self, notifier: &mut LeadershipChangeNotifier) {
+        info!("Customizing leadership change notifier");
+        let listeners = self.listeners.lock().unwrap().clone();
+        notifier.listeners.extend(listeners);
+    }
+
+    fn add_listener(&self, listener: Arc<dyn LeadershipChangeListener>) {
+        self.listeners.lock().unwrap().push(listener);
+    }
+}
+
 impl LeadershipChangeNotifier {
     /// Adds a listener to the notifier.
     pub fn add_listener(&mut self, listener: Arc<dyn LeadershipChangeListener>) {

src/common/pprof/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+name = "common-pprof"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+
+[dependencies]
+common-error.workspace = true
+common-macro.workspace = true
+prost.workspace = true
+snafu.workspace = true
+tokio.workspace = true
+
+[target.'cfg(unix)'.dependencies]
+pprof = { version = "0.13", features = [
+    "flamegraph",
+    "prost-codec",
+    "protobuf",
+] }
+
+[lints]
+workspace = true

src/common/pprof/src/lib.rs

@@ -0,0 +1,99 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#[cfg(unix)]
+pub mod nix;
+
+pub mod error {
+    use std::any::Any;
+
+    use common_error::ext::ErrorExt;
+    use common_error::status_code::StatusCode;
+    use common_macro::stack_trace_debug;
+    use snafu::{Location, Snafu};
+
+    #[derive(Snafu)]
+    #[stack_trace_debug]
+    #[snafu(visibility(pub(crate)))]
+    pub enum Error {
+        #[cfg(unix)]
+        #[snafu(display("Pprof error"))]
+        Pprof {
+            #[snafu(source)]
+            error: pprof::Error,
+            #[snafu(implicit)]
+            location: Location,
+        },
+
+        #[snafu(display("Pprof is unsupported on this platform"))]
+        Unsupported {
+            #[snafu(implicit)]
+            location: Location,
+        },
+    }
+
+    pub type Result<T> = std::result::Result<T, Error>;
+
+    impl ErrorExt for Error {
+        fn status_code(&self) -> StatusCode {
+            match self {
+                #[cfg(unix)]
+                Error::Pprof { .. } => StatusCode::Unexpected,
+                Error::Unsupported { .. } => StatusCode::Unsupported,
+            }
+        }
+
+        fn as_any(&self) -> &dyn Any {
+            self
+        }
+    }
+}
+
+#[cfg(not(unix))]
+pub mod dummy {
+    use std::time::Duration;
+
+    use crate::error::{Result, UnsupportedSnafu};
+
+    /// Dummpy CPU profiler utility.
+    #[derive(Debug)]
+    pub struct Profiling {}
+
+    impl Profiling {
+        /// Creates a new profiler.
+        pub fn new(_duration: Duration, _frequency: i32) -> Profiling {
+            Profiling {}
+        }
+
+        /// Profiles and returns a generated text.
+        pub async fn dump_text(&self) -> Result<String> {
+            UnsupportedSnafu {}.fail()
+        }
+
+        /// Profiles and returns a generated flamegraph.
+        pub async fn dump_flamegraph(&self) -> Result<Vec<u8>> {
+            UnsupportedSnafu {}.fail()
+        }
+
+        /// Profiles and returns a generated proto.
+        pub async fn dump_proto(&self) -> Result<Vec<u8>> {
+            UnsupportedSnafu {}.fail()
+        }
+    }
+}
+
+#[cfg(not(unix))]
+pub use dummy::Profiling;
+#[cfg(unix)]
+pub use nix::Profiling;

src/common/pprof/src/nix.rs

@@ -0,0 +1,78 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::time::Duration;
+
+use pprof::protos::Message;
+use snafu::ResultExt;
+
+use crate::error::{PprofSnafu, Result};
+
+/// CPU profiler utility.
+// Inspired by https://github.com/datafuselabs/databend/blob/67f445e83cd4eceda98f6c1c114858929d564029/src/common/base/src/base/profiling.rs
+#[derive(Debug)]
+pub struct Profiling {
+    /// Sample duration.
+    duration: Duration,
+    /// Sample frequency.
+    frequency: i32,
+}
+
+impl Profiling {
+    /// Creates a new profiler.
+    pub fn new(duration: Duration, frequency: i32) -> Profiling {
+        Profiling {
+            duration,
+            frequency,
+        }
+    }
+
+    /// Profiles and returns a generated pprof report.
+    pub async fn report(&self) -> Result<pprof::Report> {
+        let guard = pprof::ProfilerGuardBuilder::default()
+            .frequency(self.frequency)
+            .blocklist(&["libc", "libgcc", "pthread", "vdso"])
+            .build()
+            .context(PprofSnafu)?;
+        tokio::time::sleep(self.duration).await;
+        guard.report().build().context(PprofSnafu)
+    }
+
+    /// Profiles and returns a generated text.
+    pub async fn dump_text(&self) -> Result<String> {
+        let report = self.report().await?;
+        let text = format!("{report:?}");
+        Ok(text)
+    }
+
+    /// Profiles and returns a generated flamegraph.
+    pub async fn dump_flamegraph(&self) -> Result<Vec<u8>> {
+        let mut body: Vec<u8> = Vec::new();
+
+        let report = self.report().await?;
+        report.flamegraph(&mut body).context(PprofSnafu)?;
+
+        Ok(body)
+    }
+
+    /// Profiles and returns a generated proto.
+    pub async fn dump_proto(&self) -> Result<Vec<u8>> {
+        let report = self.report().await?;
+        // Generate google’s pprof format report.
+        let profile = report.pprof().context(PprofSnafu)?;
+        let body = profile.encode_to_vec();
+
+        Ok(body)
+    }
+}

src/common/time/src/date.rs

@@ -14,13 +14,13 @@
 
 use std::fmt::{Display, Formatter, Write};
 
-use chrono::{Datelike, Days, LocalResult, Months, NaiveDate, NaiveTime, TimeZone};
+use chrono::{Datelike, Days, LocalResult, Months, NaiveDate, NaiveTime, TimeDelta, TimeZone};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use snafu::ResultExt;
 
 use crate::error::{InvalidDateStrSnafu, ParseDateStrSnafu, Result};
-use crate::interval::Interval;
+use crate::interval::{IntervalDayTime, IntervalMonthDayNano, IntervalYearMonth};
 use crate::timezone::get_timezone;
 use crate::util::datetime_to_utc;
 use crate::Timezone;
@@ -134,29 +134,64 @@ impl Date {
         (self.0 as i64) * 24 * 3600
     }
 
-    /// Adds given Interval to the current date.
+    // FIXME(yingwen): remove add/sub intervals later
-    /// Returns None if the resulting date would be out of range.
+    /// Adds given [IntervalYearMonth] to the current date.
-    pub fn add_interval(&self, interval: Interval) -> Option<Date> {
+    pub fn add_year_month(&self, interval: IntervalYearMonth) -> Option<Date> {
         let naive_date = self.to_chrono_date()?;
 
-        let (months, days, _) = interval.to_month_day_nano();
-
         naive_date
-            .checked_add_months(Months::new(months as u32))?
+            .checked_add_months(Months::new(interval.months as u32))
-            .checked_add_days(Days::new(days as u64))
             .map(Into::into)
     }
 
-    /// Subtracts given Interval to the current date.
+    /// Adds given [IntervalDayTime] to the current date.
-    /// Returns None if the resulting date would be out of range.
+    pub fn add_day_time(&self, interval: IntervalDayTime) -> Option<Date> {
-    pub fn sub_interval(&self, interval: Interval) -> Option<Date> {
         let naive_date = self.to_chrono_date()?;
 
-        let (months, days, _) = interval.to_month_day_nano();
+        naive_date
+            .checked_add_days(Days::new(interval.days as u64))?
+            .checked_add_signed(TimeDelta::milliseconds(interval.milliseconds as i64))
+            .map(Into::into)
+    }
+
+    /// Adds given [IntervalMonthDayNano] to the current date.
+    pub fn add_month_day_nano(&self, interval: IntervalMonthDayNano) -> Option<Date> {
+        let naive_date = self.to_chrono_date()?;
 
         naive_date
-            .checked_sub_months(Months::new(months as u32))?
+            .checked_add_months(Months::new(interval.months as u32))?
-            .checked_sub_days(Days::new(days as u64))
+            .checked_add_days(Days::new(interval.days as u64))?
+            .checked_add_signed(TimeDelta::nanoseconds(interval.nanoseconds))
+            .map(Into::into)
+    }
+
+    /// Subtracts given [IntervalYearMonth] to the current date.
+    pub fn sub_year_month(&self, interval: IntervalYearMonth) -> Option<Date> {
+        let naive_date = self.to_chrono_date()?;
+
+        naive_date
+            .checked_sub_months(Months::new(interval.months as u32))
+            .map(Into::into)
+    }
+
+    /// Subtracts given [IntervalDayTime] to the current date.
+    pub fn sub_day_time(&self, interval: IntervalDayTime) -> Option<Date> {
+        let naive_date = self.to_chrono_date()?;
+
+        naive_date
+            .checked_sub_days(Days::new(interval.days as u64))?
+            .checked_sub_signed(TimeDelta::milliseconds(interval.milliseconds as i64))
+            .map(Into::into)
+    }
+
+    /// Subtracts given [IntervalMonthDayNano] to the current date.
+    pub fn sub_month_day_nano(&self, interval: IntervalMonthDayNano) -> Option<Date> {
+        let naive_date = self.to_chrono_date()?;
+
+        naive_date
+            .checked_sub_months(Months::new(interval.months as u32))?
+            .checked_sub_days(Days::new(interval.days as u64))?
+            .checked_sub_signed(TimeDelta::nanoseconds(interval.nanoseconds))
             .map(Into::into)
     }
 
@@ -246,12 +281,12 @@ mod tests {
     fn test_add_sub_interval() {
         let date = Date::new(1000);
 
-        let interval = Interval::from_year_month(3);
+        let interval = IntervalYearMonth::new(3);
 
-        let new_date = date.add_interval(interval).unwrap();
+        let new_date = date.add_year_month(interval).unwrap();
         assert_eq!(new_date.val(), 1091);
 
-        assert_eq!(date, new_date.sub_interval(interval).unwrap());
+        assert_eq!(date, new_date.sub_year_month(interval).unwrap());
     }
 
     #[test]

src/common/time/src/datetime.rs

@@ -13,16 +13,18 @@
 // limitations under the License.
 
 use std::fmt::{Display, Formatter, Write};
-use std::time::Duration;
 
-use chrono::{Days, LocalResult, Months, NaiveDateTime, TimeZone as ChronoTimeZone, Utc};
+use chrono::{
+    Days, LocalResult, Months, NaiveDateTime, TimeDelta, TimeZone as ChronoTimeZone, Utc,
+};
 use serde::{Deserialize, Serialize};
 use snafu::ResultExt;
 
 use crate::error::{InvalidDateStrSnafu, Result};
+use crate::interval::{IntervalDayTime, IntervalMonthDayNano, IntervalYearMonth};
 use crate::timezone::{get_timezone, Timezone};
 use crate::util::{datetime_to_utc, format_utc_datetime};
-use crate::{Date, Interval};
+use crate::Date;
 
 const DATETIME_FORMAT: &str = "%F %H:%M:%S%.f";
 const DATETIME_FORMAT_WITH_TZ: &str = "%F %H:%M:%S%.f%z";
@@ -160,32 +162,66 @@ impl DateTime {
             None => Utc.from_utc_datetime(&v).naive_local(),
         })
     }
-    /// Adds given Interval to the current datetime.
+
-    /// Returns None if the resulting datetime would be out of range.
+    // FIXME(yingwen): remove add/sub intervals later
-    pub fn add_interval(&self, interval: Interval) -> Option<Self> {
+    /// Adds given [IntervalYearMonth] to the current datetime.
+    pub fn add_year_month(&self, interval: IntervalYearMonth) -> Option<Self> {
         let naive_datetime = self.to_chrono_datetime()?;
-        let (months, days, nsecs) = interval.to_month_day_nano();
 
-        let naive_datetime = naive_datetime
+        naive_datetime
-            .checked_add_months(Months::new(months as u32))?
+            .checked_add_months(Months::new(interval.months as u32))
-            .checked_add_days(Days::new(days as u64))?
+            .map(Into::into)
-            + Duration::from_nanos(nsecs as u64);
-
-        Some(naive_datetime.into())
     }
 
-    /// Subtracts given Interval to the current datetime.
+    /// Adds given [IntervalDayTime] to the current datetime.
-    /// Returns None if the resulting datetime would be out of range.
+    pub fn add_day_time(&self, interval: IntervalDayTime) -> Option<Self> {
-    pub fn sub_interval(&self, interval: Interval) -> Option<Self> {
         let naive_datetime = self.to_chrono_datetime()?;
-        let (months, days, nsecs) = interval.to_month_day_nano();
 
-        let naive_datetime = naive_datetime
+        naive_datetime
-            .checked_sub_months(Months::new(months as u32))?
+            .checked_add_days(Days::new(interval.days as u64))?
-            .checked_sub_days(Days::new(days as u64))?
+            .checked_add_signed(TimeDelta::milliseconds(interval.milliseconds as i64))
-            - Duration::from_nanos(nsecs as u64);
+            .map(Into::into)
+    }
 
-        Some(naive_datetime.into())
+    /// Adds given [IntervalMonthDayNano] to the current datetime.
+    pub fn add_month_day_nano(&self, interval: IntervalMonthDayNano) -> Option<Self> {
+        let naive_datetime = self.to_chrono_datetime()?;
+
+        naive_datetime
+            .checked_add_months(Months::new(interval.months as u32))?
+            .checked_add_days(Days::new(interval.days as u64))?
+            .checked_add_signed(TimeDelta::nanoseconds(interval.nanoseconds))
+            .map(Into::into)
+    }
+
+    /// Subtracts given [IntervalYearMonth] to the current datetime.
+    pub fn sub_year_month(&self, interval: IntervalYearMonth) -> Option<Self> {
+        let naive_datetime = self.to_chrono_datetime()?;
+
+        naive_datetime
+            .checked_sub_months(Months::new(interval.months as u32))
+            .map(Into::into)
+    }
+
+    /// Subtracts given [IntervalDayTime] to the current datetime.
+    pub fn sub_day_time(&self, interval: IntervalDayTime) -> Option<Self> {
+        let naive_datetime = self.to_chrono_datetime()?;
+
+        naive_datetime
+            .checked_sub_days(Days::new(interval.days as u64))?
+            .checked_sub_signed(TimeDelta::milliseconds(interval.milliseconds as i64))
+            .map(Into::into)
+    }
+
+    /// Subtracts given [IntervalMonthDayNano] to the current datetime.
+    pub fn sub_month_day_nano(&self, interval: IntervalMonthDayNano) -> Option<Self> {
+        let naive_datetime = self.to_chrono_datetime()?;
+
+        naive_datetime
+            .checked_sub_months(Months::new(interval.months as u32))?
+            .checked_sub_days(Days::new(interval.days as u64))?
+            .checked_sub_signed(TimeDelta::nanoseconds(interval.nanoseconds))
+            .map(Into::into)
     }
 
     /// Convert to [common_time::date].
@@ -231,12 +267,12 @@ mod tests {
     fn test_add_sub_interval() {
         let datetime = DateTime::new(1000);
 
-        let interval = Interval::from_day_time(1, 200);
+        let interval = IntervalDayTime::new(1, 200);
 
-        let new_datetime = datetime.add_interval(interval).unwrap();
+        let new_datetime = datetime.add_day_time(interval).unwrap();
         assert_eq!(new_datetime.val(), 1000 + 3600 * 24 * 1000 + 200);
 
-        assert_eq!(datetime, new_datetime.sub_interval(interval).unwrap());
+        assert_eq!(datetime, new_datetime.sub_day_time(interval).unwrap());
     }
 
     #[test]

src/common/time/src/interval.rs

@@ -12,18 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::cmp::Ordering;
+use std::hash::Hash;
-use std::default::Default;
-use std::fmt::{self, Display, Formatter, Write};
-use std::hash::{Hash, Hasher};
 
 use arrow::datatypes::IntervalUnit as ArrowIntervalUnit;
 use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use snafu::ResultExt;
-
-use crate::duration::Duration;
-use crate::error::{Result, TimestampOverflowSnafu};
 
 #[derive(
     Debug, Default, Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize,
@@ -61,268 +53,269 @@ impl From<ArrowIntervalUnit> for IntervalUnit {
     }
 }
 
-/// Interval Type represents a period of time.
+// The `Value` type requires Serialize, Deserialize.
-/// It is composed of months, days and nanoseconds.
+#[derive(
-/// 3 kinds of interval are supported: year-month, day-time and
+    Debug, Default, Copy, Clone, Eq, PartialEq, Hash, Ord, PartialOrd, Serialize, Deserialize,
-/// month-day-nano, which will be stored in the following format.
+)]
-/// Interval data format:
+#[repr(C)]
-/// | months | days   | nsecs      |
+pub struct IntervalYearMonth {
-/// | 4bytes | 4bytes | 8bytes     |
+    /// Number of months
-#[derive(Debug, Clone, Default, Copy, Serialize, Deserialize)]
+    pub months: i32,
-pub struct Interval {
-    months: i32,
-    days: i32,
-    nsecs: i64,
-    unit: IntervalUnit,
 }
 
-// Nanosecond convert to other time unit
+impl IntervalYearMonth {
-pub const NANOS_PER_SEC: i64 = 1_000_000_000;
+    pub fn new(months: i32) -> Self {
-pub const NANOS_PER_MILLI: i64 = 1_000_000;
+        Self { months }
-pub const NANOS_PER_MICRO: i64 = 1_000;
-pub const NANOS_PER_HOUR: i64 = 60 * 60 * NANOS_PER_SEC;
-pub const NANOS_PER_DAY: i64 = 24 * NANOS_PER_HOUR;
-pub const NANOS_PER_MONTH: i64 = 30 * NANOS_PER_DAY;
-
-pub const DAYS_PER_MONTH: i64 = 30;
-
-impl Interval {
-    /// Creates a new interval from months, days and nanoseconds.
-    /// Precision is nanosecond.
-    pub fn from_month_day_nano(months: i32, days: i32, nsecs: i64) -> Self {
-        Interval {
-            months,
-            days,
-            nsecs,
-            unit: IntervalUnit::MonthDayNano,
-        }
-    }
-
-    /// Creates a new interval from months.
-    pub fn from_year_month(months: i32) -> Self {
-        Interval {
-            months,
-            days: 0,
-            nsecs: 0,
-            unit: IntervalUnit::YearMonth,
-        }
-    }
-
-    /// Creates a new interval from days and milliseconds.
-    pub fn from_day_time(days: i32, millis: i32) -> Self {
-        Interval {
-            months: 0,
-            days,
-            nsecs: (millis as i64) * NANOS_PER_MILLI,
-            unit: IntervalUnit::DayTime,
-        }
-    }
-
-    pub fn to_duration(&self) -> Result<Duration> {
-        Ok(Duration::new_nanosecond(
-            self.to_nanosecond()
-                .try_into()
-                .context(TimestampOverflowSnafu)?,
-        ))
-    }
-
-    /// Return a tuple(months, days, nanoseconds) from the interval.
-    pub fn to_month_day_nano(&self) -> (i32, i32, i64) {
-        (self.months, self.days, self.nsecs)
-    }
-
-    /// Converts the interval to nanoseconds.
-    pub fn to_nanosecond(&self) -> i128 {
-        let days = (self.days as i64) + DAYS_PER_MONTH * (self.months as i64);
-        (self.nsecs as i128) + (NANOS_PER_DAY as i128) * (days as i128)
-    }
-
-    /// Smallest interval value.
-    pub const MIN: Self = Self {
-        months: i32::MIN,
-        days: i32::MIN,
-        nsecs: i64::MIN,
-        unit: IntervalUnit::MonthDayNano,
-    };
-
-    /// Largest interval value.
-    pub const MAX: Self = Self {
-        months: i32::MAX,
-        days: i32::MAX,
-        nsecs: i64::MAX,
-        unit: IntervalUnit::MonthDayNano,
-    };
-
-    /// Returns the justified interval.
-    /// allows you to adjust the interval of 30-day as one month and the interval of 24-hour as one day
-    pub fn justified_interval(&self) -> Self {
-        let mut result = *self;
-        let extra_months_d = self.days as i64 / DAYS_PER_MONTH;
-        let extra_months_nsecs = self.nsecs / NANOS_PER_MONTH;
-        result.days -= (extra_months_d * DAYS_PER_MONTH) as i32;
-        result.nsecs -= extra_months_nsecs * NANOS_PER_MONTH;
-
-        let extra_days = self.nsecs / NANOS_PER_DAY;
-        result.nsecs -= extra_days * NANOS_PER_DAY;
-
-        result.months += extra_months_d as i32 + extra_months_nsecs as i32;
-        result.days += extra_days as i32;
-
-        result
-    }
-
-    /// Convert Interval to nanoseconds,
-    /// to check whether Interval is positive
-    pub fn is_positive(&self) -> bool {
-        self.to_nanosecond() > 0
-    }
-
-    /// is_zero
-    pub fn is_zero(&self) -> bool {
-        self.months == 0 && self.days == 0 && self.nsecs == 0
-    }
-
-    /// get unit
-    pub fn unit(&self) -> IntervalUnit {
-        self.unit
-    }
-
-    /// Multiple Interval by an integer with overflow check.
-    /// Returns justified Interval, or `None` if overflow occurred.
-    pub fn checked_mul_int<I>(&self, rhs: I) -> Option<Self>
-    where
-        I: TryInto<i32>,
-    {
-        let rhs = rhs.try_into().ok()?;
-        let months = self.months.checked_mul(rhs)?;
-        let days = self.days.checked_mul(rhs)?;
-        let nsecs = self.nsecs.checked_mul(rhs as i64)?;
-
-        Some(
-            Self {
-                months,
-                days,
-                nsecs,
-                unit: self.unit,
-            }
-            .justified_interval(),
-        )
-    }
-
-    /// Convert Interval to ISO 8601 string
-    pub fn to_iso8601_string(self) -> String {
-        IntervalFormat::from(self).to_iso8601_string()
-    }
-
-    /// Convert Interval to postgres verbose string
-    pub fn to_postgres_string(self) -> String {
-        IntervalFormat::from(self).to_postgres_string()
-    }
-
-    /// Convert Interval to sql_standard string
-    pub fn to_sql_standard_string(self) -> String {
-        IntervalFormat::from(self).to_sql_standard_string()
-    }
-
-    /// Interval Type and i128 [IntervalUnit::MonthDayNano] Convert
-    /// v consists of months(i32) | days(i32) | nsecs(i64)
-    pub fn from_i128(v: i128) -> Self {
-        Interval {
-            nsecs: v as i64,
-            days: (v >> 64) as i32,
-            months: (v >> 96) as i32,
-            unit: IntervalUnit::MonthDayNano,
-        }
-    }
-
-    /// `Interval` Type and i64 [IntervalUnit::DayTime] Convert
-    /// v consists of days(i32) | milliseconds(i32)
-    pub fn from_i64(v: i64) -> Self {
-        Interval {
-            nsecs: ((v as i32) as i64) * NANOS_PER_MILLI,
-            days: (v >> 32) as i32,
-            months: 0,
-            unit: IntervalUnit::DayTime,
-        }
-    }
-
-    /// `Interval` Type and i32 [IntervalUnit::YearMonth] Convert
-    /// v consists of months(i32)
-    pub fn from_i32(v: i32) -> Self {
-        Interval {
-            nsecs: 0,
-            days: 0,
-            months: v,
-            unit: IntervalUnit::YearMonth,
-        }
-    }
-
-    pub fn to_i128(&self) -> i128 {
-        // 128            96              64                               0
-        // +-------+-------+-------+-------+-------+-------+-------+-------+
-        // |     months    |      days     |          nanoseconds          |
-        // +-------+-------+-------+-------+-------+-------+-------+-------+
-        let months = (self.months as u128 & u32::MAX as u128) << 96;
-        let days = (self.days as u128 & u32::MAX as u128) << 64;
-        let nsecs = self.nsecs as u128 & u64::MAX as u128;
-        (months | days | nsecs) as i128
-    }
-
-    pub fn to_i64(&self) -> i64 {
-        // 64                              32                              0
-        // +-------+-------+-------+-------+-------+-------+-------+-------+
-        // |             days              |         milliseconds          |
-        // +-------+-------+-------+-------+-------+-------+-------+-------+
-        let days = (self.days as u64 & u32::MAX as u64) << 32;
-        let milliseconds = (self.nsecs / NANOS_PER_MILLI) as u64 & u32::MAX as u64;
-        (days | milliseconds) as i64
     }
 
     pub fn to_i32(&self) -> i32 {
         self.months
     }
 
+    pub fn from_i32(months: i32) -> Self {
+        Self { months }
+    }
+
     pub fn negative(&self) -> Self {
-        Self {
+        Self::new(-self.months)
-            months: -self.months,
+    }
-            days: -self.days,
+
-            nsecs: -self.nsecs,
+    pub fn to_iso8601_string(&self) -> String {
-            unit: self.unit,
+        IntervalFormat::from(*self).to_iso8601_string()
+    }
+}
+
+impl From<IntervalYearMonth> for IntervalFormat {
+    fn from(interval: IntervalYearMonth) -> Self {
+        IntervalFormat {
+            years: interval.months / 12,
+            months: interval.months % 12,
+            ..Default::default()
         }
     }
 }
 
-impl From<i128> for Interval {
+impl From<i32> for IntervalYearMonth {
+    fn from(v: i32) -> Self {
+        Self::from_i32(v)
+    }
+}
+
+impl From<IntervalYearMonth> for i32 {
+    fn from(v: IntervalYearMonth) -> Self {
+        v.to_i32()
+    }
+}
+
+impl From<IntervalYearMonth> for serde_json::Value {
+    fn from(v: IntervalYearMonth) -> Self {
+        serde_json::Value::from(v.to_i32())
+    }
+}
+
+#[derive(
+    Debug, Default, Copy, Clone, Eq, PartialEq, Hash, Ord, PartialOrd, Serialize, Deserialize,
+)]
+#[repr(C)]
+pub struct IntervalDayTime {
+    /// Number of days
+    pub days: i32,
+    /// Number of milliseconds
+    pub milliseconds: i32,
+}
+
+impl IntervalDayTime {
+    /// The additive identity i.e. `0`.
+    pub const ZERO: Self = Self::new(0, 0);
+
+    /// The multiplicative inverse, i.e. `-1`.
+    pub const MINUS_ONE: Self = Self::new(-1, -1);
+
+    /// The maximum value that can be represented
+    pub const MAX: Self = Self::new(i32::MAX, i32::MAX);
+
+    /// The minimum value that can be represented
+    pub const MIN: Self = Self::new(i32::MIN, i32::MIN);
+
+    pub const fn new(days: i32, milliseconds: i32) -> Self {
+        Self { days, milliseconds }
+    }
+
+    pub fn to_i64(&self) -> i64 {
+        let d = (self.days as u64 & u32::MAX as u64) << 32;
+        let m = self.milliseconds as u64 & u32::MAX as u64;
+        (d | m) as i64
+    }
+
+    pub fn from_i64(value: i64) -> Self {
+        let days = (value >> 32) as i32;
+        let milliseconds = value as i32;
+        Self { days, milliseconds }
+    }
+
+    pub fn negative(&self) -> Self {
+        Self::new(-self.days, -self.milliseconds)
+    }
+
+    pub fn to_iso8601_string(&self) -> String {
+        IntervalFormat::from(*self).to_iso8601_string()
+    }
+
+    pub fn as_millis(&self) -> i64 {
+        self.days as i64 * MS_PER_DAY + self.milliseconds as i64
+    }
+}
+
+impl From<i64> for IntervalDayTime {
+    fn from(v: i64) -> Self {
+        Self::from_i64(v)
+    }
+}
+
+impl From<IntervalDayTime> for i64 {
+    fn from(v: IntervalDayTime) -> Self {
+        v.to_i64()
+    }
+}
+
+impl From<IntervalDayTime> for serde_json::Value {
+    fn from(v: IntervalDayTime) -> Self {
+        serde_json::Value::from(v.to_i64())
+    }
+}
+
+// Millisecond convert to other time unit
+pub const MS_PER_SEC: i64 = 1_000;
+pub const MS_PER_MINUTE: i64 = 60 * MS_PER_SEC;
+pub const MS_PER_HOUR: i64 = 60 * MS_PER_MINUTE;
+pub const MS_PER_DAY: i64 = 24 * MS_PER_HOUR;
+pub const NANOS_PER_MILLI: i64 = 1_000_000;
+
+impl From<IntervalDayTime> for IntervalFormat {
+    fn from(interval: IntervalDayTime) -> Self {
+        IntervalFormat {
+            days: interval.days,
+            hours: interval.milliseconds as i64 / MS_PER_HOUR,
+            minutes: (interval.milliseconds as i64 % MS_PER_HOUR) / MS_PER_MINUTE,
+            seconds: (interval.milliseconds as i64 % MS_PER_MINUTE) / MS_PER_SEC,
+            microseconds: (interval.milliseconds as i64 % MS_PER_SEC) * MS_PER_SEC,
+            ..Default::default()
+        }
+    }
+}
+
+#[derive(
+    Debug, Default, Copy, Clone, Eq, PartialEq, Hash, Ord, PartialOrd, Serialize, Deserialize,
+)]
+#[repr(C)]
+pub struct IntervalMonthDayNano {
+    /// Number of months
+    pub months: i32,
+    /// Number of days
+    pub days: i32,
+    /// Number of nanoseconds
+    pub nanoseconds: i64,
+}
+
+impl IntervalMonthDayNano {
+    /// The additive identity i.e. `0`.
+    pub const ZERO: Self = Self::new(0, 0, 0);
+
+    /// The multiplicative inverse, i.e. `-1`.
+    pub const MINUS_ONE: Self = Self::new(-1, -1, -1);
+
+    /// The maximum value that can be represented
+    pub const MAX: Self = Self::new(i32::MAX, i32::MAX, i64::MAX);
+
+    /// The minimum value that can be represented
+    pub const MIN: Self = Self::new(i32::MIN, i32::MIN, i64::MIN);
+
+    pub const fn new(months: i32, days: i32, nanoseconds: i64) -> Self {
+        Self {
+            months,
+            days,
+            nanoseconds,
+        }
+    }
+
+    pub fn to_i128(&self) -> i128 {
+        let m = (self.months as u128 & u32::MAX as u128) << 96;
+        let d = (self.days as u128 & u32::MAX as u128) << 64;
+        let n = self.nanoseconds as u128 & u64::MAX as u128;
+        (m | d | n) as i128
+    }
+
+    pub fn from_i128(value: i128) -> Self {
+        let months = (value >> 96) as i32;
+        let days = (value >> 64) as i32;
+        let nanoseconds = value as i64;
+        Self {
+            months,
+            days,
+            nanoseconds,
+        }
+    }
+
+    pub fn negative(&self) -> Self {
+        Self::new(-self.months, -self.days, -self.nanoseconds)
+    }
+
+    pub fn to_iso8601_string(&self) -> String {
+        IntervalFormat::from(*self).to_iso8601_string()
+    }
+}
+
+impl From<i128> for IntervalMonthDayNano {
     fn from(v: i128) -> Self {
         Self::from_i128(v)
     }
 }
 
-impl From<Interval> for i128 {
+impl From<IntervalMonthDayNano> for i128 {
-    fn from(v: Interval) -> Self {
+    fn from(v: IntervalMonthDayNano) -> Self {
         v.to_i128()
     }
 }
 
-impl From<Interval> for serde_json::Value {
+impl From<IntervalMonthDayNano> for serde_json::Value {
-    fn from(v: Interval) -> Self {
+    fn from(v: IntervalMonthDayNano) -> Self {
-        Value::String(v.to_string())
+        serde_json::Value::from(v.to_i128().to_string())
     }
 }
 
-impl Display for Interval {
+// Nanosecond convert to other time unit
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+pub const NS_PER_SEC: i64 = 1_000_000_000;
-        let mut s = String::new();
+pub const NS_PER_MINUTE: i64 = 60 * NS_PER_SEC;
-        if self.months != 0 {
+pub const NS_PER_HOUR: i64 = 60 * NS_PER_MINUTE;
-            write!(s, "{} months ", self.months)?;
+pub const NS_PER_DAY: i64 = 24 * NS_PER_HOUR;
+
+impl From<IntervalMonthDayNano> for IntervalFormat {
+    fn from(interval: IntervalMonthDayNano) -> Self {
+        IntervalFormat {
+            years: interval.months / 12,
+            months: interval.months % 12,
+            days: interval.days,
+            hours: interval.nanoseconds / NS_PER_HOUR,
+            minutes: (interval.nanoseconds % NS_PER_HOUR) / NS_PER_MINUTE,
+            seconds: (interval.nanoseconds % NS_PER_MINUTE) / NS_PER_SEC,
+            microseconds: (interval.nanoseconds % NS_PER_SEC) / 1_000,
         }
-        if self.days != 0 {
+    }
-            write!(s, "{} days ", self.days)?;
+}
-        }
+
-        if self.nsecs != 0 {
+pub fn interval_year_month_to_month_day_nano(interval: IntervalYearMonth) -> IntervalMonthDayNano {
-            write!(s, "{} nsecs", self.nsecs)?;
+    IntervalMonthDayNano {
-        }
+        months: interval.months,
-        write!(f, "{}", s.trim())
+        days: 0,
+        nanoseconds: 0,
+    }
+}
+
+pub fn interval_day_time_to_month_day_nano(interval: IntervalDayTime) -> IntervalMonthDayNano {
+    IntervalMonthDayNano {
+        months: 0,
+        days: interval.days,
+        nanoseconds: interval.milliseconds as i64 * NANOS_PER_MILLI,
     }
 }
 
@@ -339,31 +332,6 @@ pub struct IntervalFormat {
     pub microseconds: i64,
 }
 
-impl From<Interval> for IntervalFormat {
-    fn from(val: Interval) -> IntervalFormat {
-        let months = val.months;
-        let days = val.days;
-        let microseconds = val.nsecs / NANOS_PER_MICRO;
-        let years = (months - (months % 12)) / 12;
-        let months = months - years * 12;
-        let hours = (microseconds - (microseconds % 3_600_000_000)) / 3_600_000_000;
-        let microseconds = microseconds - hours * 3_600_000_000;
-        let minutes = (microseconds - (microseconds % 60_000_000)) / 60_000_000;
-        let microseconds = microseconds - minutes * 60_000_000;
-        let seconds = (microseconds - (microseconds % 1_000_000)) / 1_000_000;
-        let microseconds = microseconds - seconds * 1_000_000;
-        IntervalFormat {
-            years,
-            months,
-            days,
-            hours,
-            minutes,
-            seconds,
-            microseconds,
-        }
-    }
-}
-
 impl IntervalFormat {
     /// All the field in the interval is 0
     pub fn is_zero(&self) -> bool {
@@ -540,117 +508,37 @@ fn get_time_part(
     interval
 }
 
-/// IntervalCompare is used to compare two intervals
-/// It makes interval into nanoseconds style.
-#[derive(PartialEq, Eq, Hash, PartialOrd, Ord)]
-struct IntervalCompare(i128);
-
-impl From<Interval> for IntervalCompare {
-    fn from(interval: Interval) -> Self {
-        Self(interval.to_nanosecond())
-    }
-}
-
-impl Ord for Interval {
-    fn cmp(&self, other: &Self) -> Ordering {
-        IntervalCompare::from(*self).cmp(&IntervalCompare::from(*other))
-    }
-}
-
-impl PartialOrd for Interval {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Eq for Interval {}
-
-impl PartialEq for Interval {
-    fn eq(&self, other: &Self) -> bool {
-        self.cmp(other).is_eq()
-    }
-}
-
-impl Hash for Interval {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        IntervalCompare::from(*self).hash(state)
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use std::collections::HashMap;
-
     use super::*;
-    use crate::timestamp::TimeUnit;
 
     #[test]
     fn test_from_year_month() {
-        let interval = Interval::from_year_month(1);
+        let interval = IntervalYearMonth::new(1);
         assert_eq!(interval.months, 1);
     }
 
     #[test]
     fn test_from_date_time() {
-        let interval = Interval::from_day_time(1, 2);
+        let interval = IntervalDayTime::new(1, 2);
         assert_eq!(interval.days, 1);
-        assert_eq!(interval.nsecs, 2_000_000);
+        assert_eq!(interval.milliseconds, 2);
     }
 
     #[test]
-    fn test_to_duration() {
+    fn test_from_month_day_nano() {
-        let interval = Interval::from_day_time(1, 2);
+        let interval = IntervalMonthDayNano::new(1, 2, 3);
-
+        assert_eq!(interval.months, 1);
-        let duration = interval.to_duration().unwrap();
+        assert_eq!(interval.days, 2);
-        assert_eq!(86400002000000, duration.value());
+        assert_eq!(interval.nanoseconds, 3);
-        assert_eq!(TimeUnit::Nanosecond, duration.unit());
-
-        let interval = Interval::from_year_month(12);
-
-        let duration = interval.to_duration().unwrap();
-        assert_eq!(31104000000000000, duration.value());
-        assert_eq!(TimeUnit::Nanosecond, duration.unit());
-    }
-
-    #[test]
-    fn test_interval_is_positive() {
-        let interval = Interval::from_year_month(1);
-        assert!(interval.is_positive());
-        let interval = Interval::from_year_month(-1);
-        assert!(!interval.is_positive());
-
-        let interval = Interval::from_day_time(1, i32::MIN);
-        assert!(!interval.is_positive());
-    }
-
-    #[test]
-    fn test_to_nanosecond() {
-        let interval = Interval::from_year_month(1);
-        assert_eq!(interval.to_nanosecond(), 2592000000000000);
-        let interval = Interval::from_day_time(1, 2);
-        assert_eq!(interval.to_nanosecond(), 86400002000000);
-
-        let max_interval = Interval::from_month_day_nano(i32::MAX, i32::MAX, i64::MAX);
-        assert_eq!(max_interval.to_nanosecond(), 5751829423496836854775807);
-
-        let min_interval = Interval::from_month_day_nano(i32::MIN, i32::MIN, i64::MIN);
-        assert_eq!(min_interval.to_nanosecond(), -5751829426175236854775808);
-    }
-
-    #[test]
-    fn test_interval_is_zero() {
-        let interval = Interval::from_month_day_nano(1, 1, 1);
-        assert!(!interval.is_zero());
-        let interval = Interval::from_month_day_nano(0, 0, 0);
-        assert!(interval.is_zero());
     }
 
     #[test]
     fn test_interval_i128_convert() {
         let test_interval_eq = |month, day, nano| {
-            let interval = Interval::from_month_day_nano(month, day, nano);
+            let interval = IntervalMonthDayNano::new(month, day, nano);
             let interval_i128 = interval.to_i128();
-            let interval2 = Interval::from_i128(interval_i128);
+            let interval2 = IntervalMonthDayNano::from_i128(interval_i128);
             assert_eq!(interval, interval2);
         };
 
@@ -666,11 +554,26 @@ mod tests {
         test_interval_eq(i32::MAX, i32::MIN, i64::MIN);
         test_interval_eq(i32::MIN, i32::MAX, i64::MIN);
         test_interval_eq(i32::MIN, i32::MIN, i64::MIN);
+
+        let interval = IntervalMonthDayNano::from_i128(1);
+        assert_eq!(interval, IntervalMonthDayNano::new(0, 0, 1));
+        assert_eq!(1, IntervalMonthDayNano::new(0, 0, 1).to_i128());
+    }
+
+    #[test]
+    fn test_interval_i64_convert() {
+        let interval = IntervalDayTime::from_i64(1);
+        assert_eq!(interval, IntervalDayTime::new(0, 1));
+        assert_eq!(1, IntervalDayTime::new(0, 1).to_i64());
     }
 
     #[test]
     fn test_convert_interval_format() {
-        let interval = Interval::from_month_day_nano(14, 160, 1000000);
+        let interval = IntervalMonthDayNano {
+            months: 14,
+            days: 160,
+            nanoseconds: 1000000,
+        };
         let interval_format = IntervalFormat::from(interval);
         assert_eq!(interval_format.years, 1);
         assert_eq!(interval_format.months, 2);
@@ -681,94 +584,34 @@ mod tests {
         assert_eq!(interval_format.microseconds, 1000);
     }
 
-    #[test]
-    fn test_interval_hash() {
-        let interval = Interval::from_month_day_nano(1, 31, 1);
-        let interval2 = Interval::from_month_day_nano(2, 1, 1);
-        let mut map = HashMap::new();
-        map.insert(interval, 1);
-        assert_eq!(map.get(&interval2), Some(&1));
-    }
-
-    #[test]
-    fn test_interval_mul_int() {
-        let interval = Interval::from_month_day_nano(1, 1, 1);
-        let interval2 = interval.checked_mul_int(2).unwrap();
-        assert_eq!(interval2.months, 2);
-        assert_eq!(interval2.days, 2);
-        assert_eq!(interval2.nsecs, 2);
-
-        // test justified interval
-        let interval = Interval::from_month_day_nano(1, 31, 1);
-        let interval2 = interval.checked_mul_int(2).unwrap();
-        assert_eq!(interval2.months, 4);
-        assert_eq!(interval2.days, 2);
-        assert_eq!(interval2.nsecs, 2);
-
-        // test overflow situation
-        let interval = Interval::from_month_day_nano(i32::MAX, 1, 1);
-        let interval2 = interval.checked_mul_int(2);
-        assert!(interval2.is_none());
-    }
-
-    #[test]
-    fn test_display() {
-        let interval = Interval::from_month_day_nano(1, 1, 1);
-        assert_eq!(interval.to_string(), "1 months 1 days 1 nsecs");
-
-        let interval = Interval::from_month_day_nano(14, 31, 10000000000);
-        assert_eq!(interval.to_string(), "14 months 31 days 10000000000 nsecs");
-    }
-
-    #[test]
-    fn test_interval_justified() {
-        let interval = Interval::from_month_day_nano(1, 131, 1).justified_interval();
-        let interval2 = Interval::from_month_day_nano(5, 11, 1);
-        assert_eq!(interval, interval2);
-
-        let interval = Interval::from_month_day_nano(1, 1, NANOS_PER_MONTH + 2 * NANOS_PER_DAY)
-            .justified_interval();
-        let interval2 = Interval::from_month_day_nano(2, 3, 0);
-        assert_eq!(interval, interval2);
-    }
-
-    #[test]
-    fn test_serde_json() {
-        let interval = Interval::from_month_day_nano(1, 1, 1);
-        let json = serde_json::to_string(&interval).unwrap();
-        assert_eq!(
-            json,
-            "{\"months\":1,\"days\":1,\"nsecs\":1,\"unit\":\"MonthDayNano\"}"
-        );
-        let interval2: Interval = serde_json::from_str(&json).unwrap();
-        assert_eq!(interval, interval2);
-    }
-
     #[test]
     fn test_to_iso8601_string() {
         // Test interval zero
-        let interval = Interval::from_month_day_nano(0, 0, 0);
+        let interval = IntervalMonthDayNano::new(0, 0, 0);
         assert_eq!(interval.to_iso8601_string(), "PT0S");
 
-        let interval = Interval::from_month_day_nano(1, 1, 1);
+        let interval = IntervalMonthDayNano::new(1, 1, 1);
         assert_eq!(interval.to_iso8601_string(), "P0Y1M1DT0H0M0S");
 
-        let interval = Interval::from_month_day_nano(14, 31, 10000000000);
+        let interval = IntervalMonthDayNano::new(14, 31, 10000000000);
         assert_eq!(interval.to_iso8601_string(), "P1Y2M31DT0H0M10S");
 
-        let interval = Interval::from_month_day_nano(14, 31, 23210200000000);
+        let interval = IntervalMonthDayNano::new(14, 31, 23210200000000);
         assert_eq!(interval.to_iso8601_string(), "P1Y2M31DT6H26M50.2S");
     }
 
     #[test]
     fn test_to_postgres_string() {
         // Test interval zero
-        let interval = Interval::from_month_day_nano(0, 0, 0);
+        let interval = IntervalMonthDayNano::new(0, 0, 0);
-        assert_eq!(interval.to_postgres_string(), "00:00:00");
-
-        let interval = Interval::from_month_day_nano(23, 100, 23210200000000);
         assert_eq!(
-            interval.to_postgres_string(),
+            IntervalFormat::from(interval).to_postgres_string(),
+            "00:00:00"
+        );
+
+        let interval = IntervalMonthDayNano::new(23, 100, 23210200000000);
+        assert_eq!(
+            IntervalFormat::from(interval).to_postgres_string(),
             "1 year 11 mons 100 days 06:26:50.200000"
         );
     }
@@ -776,18 +619,21 @@ mod tests {
     #[test]
     fn test_to_sql_standard_string() {
         // Test zero interval
-        let interval = Interval::from_month_day_nano(0, 0, 0);
+        let interval = IntervalMonthDayNano::new(0, 0, 0);
-        assert_eq!(interval.to_sql_standard_string(), "0");
+        assert_eq!(IntervalFormat::from(interval).to_sql_standard_string(), "0");
 
-        let interval = Interval::from_month_day_nano(23, 100, 23210200000000);
+        let interval = IntervalMonthDayNano::new(23, 100, 23210200000000);
         assert_eq!(
-            interval.to_sql_standard_string(),
+            IntervalFormat::from(interval).to_sql_standard_string(),
             "+1-11 +100 +6:26:50.200000"
         );
 
         // Test interval without year, month, day
-        let interval = Interval::from_month_day_nano(0, 0, 23210200000000);
+        let interval = IntervalMonthDayNano::new(0, 0, 23210200000000);
-        assert_eq!(interval.to_sql_standard_string(), "6:26:50.200000");
+        assert_eq!(
+            IntervalFormat::from(interval).to_sql_standard_string(),
+            "6:26:50.200000"
+        );
     }
 
     #[test]

src/common/time/src/lib.rs

@@ -27,7 +27,7 @@ pub mod util;
 pub use date::Date;
 pub use datetime::DateTime;
 pub use duration::Duration;
-pub use interval::Interval;
+pub use interval::{IntervalDayTime, IntervalMonthDayNano, IntervalYearMonth};
 pub use range::RangeMillis;
 pub use timestamp::Timestamp;
 pub use timestamp_millis::TimestampMillis;

src/common/time/src/timestamp.rs

@@ -20,16 +20,17 @@ use std::time::Duration;
 
 use arrow::datatypes::TimeUnit as ArrowTimeUnit;
 use chrono::{
-    DateTime, Days, LocalResult, Months, NaiveDate, NaiveDateTime, NaiveTime,
+    DateTime, Days, LocalResult, Months, NaiveDate, NaiveDateTime, NaiveTime, TimeDelta,
     TimeZone as ChronoTimeZone, Utc,
 };
 use serde::{Deserialize, Serialize};
 use snafu::{OptionExt, ResultExt};
 
+use crate::error;
 use crate::error::{ArithmeticOverflowSnafu, ParseTimestampSnafu, Result, TimestampOverflowSnafu};
+use crate::interval::{IntervalDayTime, IntervalMonthDayNano, IntervalYearMonth};
 use crate::timezone::{get_timezone, Timezone};
 use crate::util::{datetime_to_utc, div_ceil};
-use crate::{error, Interval};
 
 /// Timestamp represents the value of units(seconds/milliseconds/microseconds/nanoseconds) elapsed
 /// since UNIX epoch. The valid value range of [Timestamp] depends on it's unit (all in UTC timezone):
@@ -140,40 +141,77 @@ impl Timestamp {
         })
     }
 
-    /// Adds given Interval to the current timestamp.
+    // FIXME(yingwen): remove add/sub intervals later
-    /// Returns None if the resulting timestamp would be out of range.
+    /// Adds given [IntervalYearMonth] to the current timestamp.
-    pub fn add_interval(&self, interval: Interval) -> Option<Timestamp> {
+    pub fn add_year_month(&self, interval: IntervalYearMonth) -> Option<Timestamp> {
         let naive_datetime = self.to_chrono_datetime()?;
-        let (months, days, nsecs) = interval.to_month_day_nano();
 
-        let naive_datetime = naive_datetime
+        let naive_datetime =
-            .checked_add_months(Months::new(months as u32))?
+            naive_datetime.checked_add_months(Months::new(interval.months as u32))?;
-            .checked_add_days(Days::new(days as u64))?
-            + Duration::from_nanos(nsecs as u64);
 
-        match Timestamp::from_chrono_datetime(naive_datetime) {
+        // Have to convert the new timestamp by the current unit.
-            // Have to convert the new timestamp by the current unit.
+        Timestamp::from_chrono_datetime(naive_datetime).and_then(|ts| ts.convert_to(self.unit))
-            Some(ts) => ts.convert_to(self.unit),
-            None => None,
-        }
     }
 
-    /// Subtracts given Interval to the current timestamp.
+    /// Adds given [IntervalDayTime] to the current timestamp.
-    /// Returns None if the resulting timestamp would be out of range.
+    pub fn add_day_time(&self, interval: IntervalDayTime) -> Option<Timestamp> {
-    pub fn sub_interval(&self, interval: Interval) -> Option<Timestamp> {
         let naive_datetime = self.to_chrono_datetime()?;
-        let (months, days, nsecs) = interval.to_month_day_nano();
 
         let naive_datetime = naive_datetime
-            .checked_sub_months(Months::new(months as u32))?
+            .checked_add_days(Days::new(interval.days as u64))?
-            .checked_sub_days(Days::new(days as u64))?
+            .checked_add_signed(TimeDelta::milliseconds(interval.milliseconds as i64))?;
-            - Duration::from_nanos(nsecs as u64);
 
-        match Timestamp::from_chrono_datetime(naive_datetime) {
+        // Have to convert the new timestamp by the current unit.
-            // Have to convert the new timestamp by the current unit.
+        Timestamp::from_chrono_datetime(naive_datetime).and_then(|ts| ts.convert_to(self.unit))
-            Some(ts) => ts.convert_to(self.unit),
+    }
-            None => None,
+
-        }
+    /// Adds given [IntervalMonthDayNano] to the current timestamp.
+    pub fn add_month_day_nano(&self, interval: IntervalMonthDayNano) -> Option<Timestamp> {
+        let naive_datetime = self.to_chrono_datetime()?;
+
+        let naive_datetime = naive_datetime
+            .checked_add_months(Months::new(interval.months as u32))?
+            .checked_add_days(Days::new(interval.days as u64))?
+            .checked_add_signed(TimeDelta::nanoseconds(interval.nanoseconds))?;
+
+        // Have to convert the new timestamp by the current unit.
+        Timestamp::from_chrono_datetime(naive_datetime).and_then(|ts| ts.convert_to(self.unit))
+    }
+
+    /// Subtracts given [IntervalYearMonth] to the current timestamp.
+    pub fn sub_year_month(&self, interval: IntervalYearMonth) -> Option<Timestamp> {
+        let naive_datetime = self.to_chrono_datetime()?;
+
+        let naive_datetime =
+            naive_datetime.checked_sub_months(Months::new(interval.months as u32))?;
+
+        // Have to convert the new timestamp by the current unit.
+        Timestamp::from_chrono_datetime(naive_datetime).and_then(|ts| ts.convert_to(self.unit))
+    }
+
+    /// Subtracts given [IntervalDayTime] to the current timestamp.
+    pub fn sub_day_time(&self, interval: IntervalDayTime) -> Option<Timestamp> {
+        let naive_datetime = self.to_chrono_datetime()?;
+
+        let naive_datetime = naive_datetime
+            .checked_sub_days(Days::new(interval.days as u64))?
+            .checked_sub_signed(TimeDelta::milliseconds(interval.milliseconds as i64))?;
+
+        // Have to convert the new timestamp by the current unit.
+        Timestamp::from_chrono_datetime(naive_datetime).and_then(|ts| ts.convert_to(self.unit))
+    }
+
+    /// Subtracts given [IntervalMonthDayNano] to the current timestamp.
+    pub fn sub_month_day_nano(&self, interval: IntervalMonthDayNano) -> Option<Timestamp> {
+        let naive_datetime = self.to_chrono_datetime()?;
+
+        let naive_datetime = naive_datetime
+            .checked_sub_months(Months::new(interval.months as u32))?
+            .checked_sub_days(Days::new(interval.days as u64))?
+            .checked_sub_signed(TimeDelta::nanoseconds(interval.nanoseconds))?;
+
+        // Have to convert the new timestamp by the current unit.
+        Timestamp::from_chrono_datetime(naive_datetime).and_then(|ts| ts.convert_to(self.unit))
     }
 
     /// Subtracts current timestamp with another timestamp, yielding a duration.
@@ -688,13 +726,13 @@ mod tests {
     fn test_add_sub_interval() {
         let ts = Timestamp::new(1000, TimeUnit::Millisecond);
 
-        let interval = Interval::from_day_time(1, 200);
+        let interval = IntervalDayTime::new(1, 200);
 
-        let new_ts = ts.add_interval(interval).unwrap();
+        let new_ts = ts.add_day_time(interval).unwrap();
         assert_eq!(new_ts.unit(), TimeUnit::Millisecond);
         assert_eq!(new_ts.value(), 1000 + 3600 * 24 * 1000 + 200);
 
-        assert_eq!(ts, new_ts.sub_interval(interval).unwrap());
+        assert_eq!(ts, new_ts.sub_day_time(interval).unwrap());
     }
 
     #[test]

src/datanode/src/region_server.rs

@@ -32,7 +32,7 @@ use common_recordbatch::SendableRecordBatchStream;
 use common_runtime::Runtime;
 use common_telemetry::tracing::{self, info_span};
 use common_telemetry::tracing_context::{FutureExt, TracingContext};
-use common_telemetry::{error, info, warn};
+use common_telemetry::{debug, error, info, warn};
 use dashmap::DashMap;
 use datafusion::datasource::{provider_as_source, TableProvider};
 use datafusion::error::Result as DfResult;
@@ -893,7 +893,7 @@ impl RegionServerInner {
         for region in logical_regions {
             self.region_map
                 .insert(region, RegionEngineWithStatus::Ready(engine.clone()));
-            info!("Logical region {} is registered!", region);
+            debug!("Logical region {} is registered!", region);
         }
         Ok(())
     }
@@ -935,17 +935,19 @@ impl RegionServerInner {
             .iter()
             .map(|x| (*x.key(), x.value().clone()))
             .collect::<Vec<_>>();
+        let num_regions = regions.len();
 
         for (region_id, engine) in regions {
             let closed = engine
                 .handle_request(region_id, RegionRequest::Close(RegionCloseRequest {}))
                 .await;
             match closed {
-                Ok(_) => info!("Region {region_id} is closed"),
+                Ok(_) => debug!("Region {region_id} is closed"),
                 Err(e) => warn!("Failed to close region {region_id}, err: {e}"),
             }
         }
         self.region_map.clear();
+        info!("closed {num_regions} regions");
 
         let engines = self.engines.write().unwrap().drain().collect::<Vec<_>>();
         for (engine_name, engine) in engines {

src/datatypes/src/interval.rs

@@ -12,11 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use common_time::interval::Interval;
+use common_time::{IntervalDayTime, IntervalMonthDayNano, IntervalYearMonth};
 use paste::paste;
-use serde::{Deserialize, Serialize};
 
-use crate::prelude::{Scalar, Value, ValueRef};
+use crate::prelude::Scalar;
 use crate::scalars::ScalarRef;
 use crate::types::{
     IntervalDayTimeType, IntervalMonthDayNanoType, IntervalYearMonthType, WrapperType,
@@ -26,39 +25,6 @@ use crate::vectors::{IntervalDayTimeVector, IntervalMonthDayNanoVector, Interval
 macro_rules! define_interval_with_unit {
     ($unit: ident, $native_ty: ty) => {
         paste! {
-            #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-            pub struct [<Interval $unit>](pub Interval);
-
-            impl [<Interval $unit>] {
-                pub fn new(val: $native_ty) -> Self {
-                    Self(Interval:: [<from_ $native_ty>](val))
-                }
-            }
-
-            impl Default for [<Interval $unit>] {
-                fn default() -> Self {
-                    Self::new(0)
-                }
-            }
-
-            impl From<[<Interval $unit>]> for Value {
-                fn from(t: [<Interval $unit>]) -> Value {
-                    Value::Interval(t.0)
-                }
-            }
-
-            impl From<[<Interval $unit>]> for serde_json::Value {
-                fn from(t: [<Interval $unit>]) -> Self {
-                    t.0.into()
-                }
-            }
-
-            impl From<[<Interval $unit>]> for ValueRef<'static> {
-                fn from(t: [<Interval $unit>]) -> Self {
-                    ValueRef::Interval(t.0)
-                }
-            }
-
             impl Scalar for [<Interval $unit>] {
                 type VectorType = [<Interval $unit Vector>];
                 type RefType<'a> = [<Interval $unit>];
@@ -87,41 +53,11 @@ macro_rules! define_interval_with_unit {
                 type Native = $native_ty;
 
                 fn from_native(value: Self::Native) -> Self {
-                    Self::new(value)
+                    Self::[<from_ $native_ty>](value)
                 }
 
                 fn into_native(self) -> Self::Native {
-                    self.0.[<to_ $native_ty>]()
+                    self.[<to_ $native_ty>]()
-                }
-            }
-
-            impl From<$native_ty> for [<Interval $unit>] {
-                fn from(val: $native_ty) -> Self {
-                    [<Interval $unit>]::from_native(val as $native_ty)
-                }
-            }
-
-            impl From<[<Interval $unit>]> for $native_ty {
-                fn from(val: [<Interval $unit>]) -> Self {
-                    val.0.[<to_ $native_ty>]()
-                }
-            }
-
-            impl TryFrom<Value> for Option<[<Interval $unit>]> {
-                type Error = $crate::error::Error;
-
-                #[inline]
-                fn try_from(from: Value) -> std::result::Result<Self, Self::Error> {
-                    match from {
-                        Value::Interval(v) if v.unit() == common_time::interval::IntervalUnit::$unit => {
-                            Ok(Some([<Interval $unit>](v)))
-                        },
-                        Value::Null => Ok(None),
-                        _ => $crate::error::TryFromValueSnafu {
-                            reason: format!("{:?} is not a {}", from, stringify!([<Interval $unit>])),
-                        }
-                        .fail(),
-                    }
                 }
             }
         }
@@ -138,17 +74,17 @@ mod tests {
 
     #[test]
     fn test_interval_scalar() {
-        let interval = IntervalYearMonth::new(1000);
+        let interval = IntervalYearMonth::from(1000);
         assert_eq!(interval, interval.as_scalar_ref());
         assert_eq!(interval, interval.to_owned_scalar());
         assert_eq!(1000, interval.into_native());
 
-        let interval = IntervalDayTime::new(1000);
+        let interval = IntervalDayTime::from(1000);
         assert_eq!(interval, interval.as_scalar_ref());
         assert_eq!(interval, interval.to_owned_scalar());
         assert_eq!(1000, interval.into_native());
 
-        let interval = IntervalMonthDayNano::new(1000);
+        let interval = IntervalMonthDayNano::from(1000);
         assert_eq!(interval, interval.as_scalar_ref());
         assert_eq!(interval, interval.to_owned_scalar());
         assert_eq!(1000, interval.into_native());
@@ -156,15 +92,15 @@ mod tests {
 
     #[test]
     fn test_interval_convert_to_native_type() {
-        let interval = IntervalMonthDayNano::new(1000);
+        let interval = IntervalMonthDayNano::from(1000);
         let native_value: i128 = interval.into();
         assert_eq!(native_value, 1000);
 
-        let interval = IntervalDayTime::new(1000);
+        let interval = IntervalDayTime::from(1000);
         let native_interval: i64 = interval.into();
         assert_eq!(native_interval, 1000);
 
-        let interval = IntervalYearMonth::new(1000);
+        let interval = IntervalYearMonth::from(1000);
         let native_interval: i32 = interval.into();
         assert_eq!(native_interval, 1000);
     }

src/datatypes/src/types/interval_type.rs

@@ -17,8 +17,9 @@ use arrow::datatypes::{
     IntervalMonthDayNanoType as ArrowIntervalMonthDayNanoType, IntervalUnit as ArrowIntervalUnit,
     IntervalYearMonthType as ArrowIntervalYearMonthType,
 };
-use common_time::interval::IntervalUnit;
+use common_time::interval::{
-use common_time::Interval;
+    IntervalDayTime, IntervalMonthDayNano, IntervalUnit, IntervalYearMonth,
+};
 use enum_dispatch::enum_dispatch;
 use paste::paste;
 use serde::{Deserialize, Serialize};
@@ -26,7 +27,6 @@ use snafu::OptionExt;
 
 use crate::data_type::ConcreteDataType;
 use crate::error;
-use crate::interval::{IntervalDayTime, IntervalMonthDayNano, IntervalYearMonth};
 use crate::prelude::{
     DataType, LogicalTypeId, MutableVector, ScalarVectorBuilder, Value, ValueRef, Vector,
 };
@@ -75,7 +75,7 @@ macro_rules! impl_data_type_for_interval {
                 }
 
                 fn default_value(&self) -> Value {
-                    Value::Interval(Interval::from_i128(0))
+                    Value::[<Interval $unit>]([<Interval $unit>]::default())
                 }
 
                 fn as_arrow_type(&self) -> ArrowDataType {
@@ -124,7 +124,7 @@ macro_rules! impl_data_type_for_interval {
                 fn cast_value_ref(value: ValueRef) -> crate::Result<Option<Self::Wrapper>> {
                     match value {
                         ValueRef::Null => Ok(None),
-                        ValueRef::Interval(t) => Ok(Some([<Interval $unit>](t))),
+                        ValueRef::[<Interval $unit>](t) => Ok(Some(t)),
                         other => error::CastTypeSnafu {
                             msg: format!("Failed to cast value {:?} to {}", other, stringify!([<Interval $unit>])),
                         }

src/datatypes/src/types/primitive_type.rs

@@ -16,7 +16,6 @@ use std::cmp::Ordering;
 use std::fmt;
 
 use arrow::datatypes::{ArrowNativeType, ArrowPrimitiveType, DataType as ArrowDataType};
-use common_time::interval::IntervalUnit;
 use common_time::{Date, DateTime};
 use serde::{Deserialize, Serialize};
 use snafu::OptionExt;
@@ -30,6 +29,7 @@ use crate::types::{DateTimeType, DateType};
 use crate::value::{Value, ValueRef};
 use crate::vectors::{MutableVector, PrimitiveVector, PrimitiveVectorBuilder, Vector};
 
+// TODO(yingwen): Can we remove `Into<serde_json::Value>`?
 /// Represents the wrapper type that wraps a native type using the `newtype pattern`,
 /// such as [Date](`common_time::Date`) is a wrapper type for the underlying native
 /// type `i32`.
@@ -364,11 +364,7 @@ impl DataType for Int64Type {
             Value::DateTime(v) => Some(Value::Int64(v.val())),
             Value::Timestamp(v) => Some(Value::Int64(v.value())),
             Value::Time(v) => Some(Value::Int64(v.value())),
-            Value::Interval(v) => match v.unit() {
+            // We don't allow casting interval type to int.
-                IntervalUnit::DayTime => Some(Value::Int64(v.to_i64())),
-                IntervalUnit::YearMonth => None,
-                IntervalUnit::MonthDayNano => None,
-            },
             _ => None,
         }
     }
@@ -410,11 +406,7 @@ impl DataType for Int32Type {
             Value::Float64(v) => num::cast::cast(v).map(Value::Int32),
             Value::String(v) => v.as_utf8().parse::<i32>().map(Value::Int32).ok(),
             Value::Date(v) => Some(Value::Int32(v.val())),
-            Value::Interval(v) => match v.unit() {
+            // We don't allow casting interval type to int.
-                IntervalUnit::YearMonth => Some(Value::Int32(v.to_i32())),
-                IntervalUnit::DayTime => None,
-                IntervalUnit::MonthDayNano => None,
-            },
             _ => None,
         }
     }

src/datatypes/src/types/string_type.rs

@@ -78,7 +78,15 @@ impl DataType for StringType {
             Value::DateTime(v) => Some(Value::String(StringBytes::from(v.to_string()))),
             Value::Timestamp(v) => Some(Value::String(StringBytes::from(v.to_iso8601_string()))),
             Value::Time(v) => Some(Value::String(StringBytes::from(v.to_iso8601_string()))),
-            Value::Interval(v) => Some(Value::String(StringBytes::from(v.to_iso8601_string()))),
+            Value::IntervalYearMonth(v) => {
+                Some(Value::String(StringBytes::from(v.to_iso8601_string())))
+            }
+            Value::IntervalDayTime(v) => {
+                Some(Value::String(StringBytes::from(v.to_iso8601_string())))
+            }
+            Value::IntervalMonthDayNano(v) => {
+                Some(Value::String(StringBytes::from(v.to_iso8601_string())))
+            }
             Value::Duration(v) => Some(Value::String(StringBytes::from(v.to_string()))),
             Value::Decimal128(v) => Some(Value::String(StringBytes::from(v.to_string()))),
 

src/datatypes/src/value.rs

@@ -28,7 +28,7 @@ use common_time::datetime::DateTime;
 use common_time::interval::IntervalUnit;
 use common_time::time::Time;
 use common_time::timestamp::{TimeUnit, Timestamp};
-use common_time::{Duration, Interval, Timezone};
+use common_time::{Duration, IntervalDayTime, IntervalMonthDayNano, IntervalYearMonth, Timezone};
 use datafusion_common::ScalarValue;
 use greptime_proto::v1::value::ValueData;
 pub use ordered_float::OrderedFloat;
@@ -78,7 +78,10 @@ pub enum Value {
     Timestamp(Timestamp),
     Time(Time),
     Duration(Duration),
-    Interval(Interval),
+    // Interval types:
+    IntervalYearMonth(IntervalYearMonth),
+    IntervalDayTime(IntervalDayTime),
+    IntervalMonthDayNano(IntervalMonthDayNano),
 
     List(ListValue),
 }
@@ -111,7 +114,15 @@ impl Display for Value {
             Value::DateTime(v) => write!(f, "{v}"),
             Value::Timestamp(v) => write!(f, "{}", v.to_iso8601_string()),
             Value::Time(t) => write!(f, "{}", t.to_iso8601_string()),
-            Value::Interval(v) => write!(f, "{}", v.to_iso8601_string()),
+            Value::IntervalYearMonth(v) => {
+                write!(f, "{}", v.to_iso8601_string())
+            }
+            Value::IntervalDayTime(v) => {
+                write!(f, "{}", v.to_iso8601_string())
+            }
+            Value::IntervalMonthDayNano(v) => {
+                write!(f, "{}", v.to_iso8601_string())
+            }
             Value::Duration(d) => write!(f, "{d}"),
             Value::List(v) => {
                 let items = v
@@ -153,7 +164,15 @@ macro_rules! define_data_type_func {
                 $struct::DateTime(_) => ConcreteDataType::datetime_datatype(),
                 $struct::Time(t) => ConcreteDataType::time_datatype(*t.unit()),
                 $struct::Timestamp(v) => ConcreteDataType::timestamp_datatype(v.unit()),
-                $struct::Interval(v) => ConcreteDataType::interval_datatype(v.unit()),
+                $struct::IntervalYearMonth(_) => {
+                    ConcreteDataType::interval_datatype(IntervalUnit::YearMonth)
+                }
+                $struct::IntervalDayTime(_) => {
+                    ConcreteDataType::interval_datatype(IntervalUnit::DayTime)
+                }
+                $struct::IntervalMonthDayNano(_) => {
+                    ConcreteDataType::interval_datatype(IntervalUnit::MonthDayNano)
+                }
                 $struct::List(list) => ConcreteDataType::list_datatype(list.datatype().clone()),
                 $struct::Duration(d) => ConcreteDataType::duration_datatype(d.unit()),
                 $struct::Decimal128(d) => {
@@ -206,7 +225,9 @@ impl Value {
             Value::List(v) => ValueRef::List(ListValueRef::Ref { val: v }),
             Value::Timestamp(v) => ValueRef::Timestamp(*v),
             Value::Time(v) => ValueRef::Time(*v),
-            Value::Interval(v) => ValueRef::Interval(*v),
+            Value::IntervalYearMonth(v) => ValueRef::IntervalYearMonth(*v),
+            Value::IntervalDayTime(v) => ValueRef::IntervalDayTime(*v),
+            Value::IntervalMonthDayNano(v) => ValueRef::IntervalMonthDayNano(*v),
             Value::Duration(v) => ValueRef::Duration(*v),
             Value::Decimal128(v) => ValueRef::Decimal128(*v),
         }
@@ -220,14 +241,6 @@ impl Value {
         }
     }
 
-    /// Cast Value to Interval. Return None if value is not a valid interval data type.
-    pub fn as_interval(&self) -> Option<Interval> {
-        match self {
-            Value::Interval(i) => Some(*i),
-            _ => None,
-        }
-    }
-
     /// Cast Value to utf8 String. Return None if value is not a valid string data type.
     pub fn as_string(&self) -> Option<String> {
         match self {
@@ -255,12 +268,35 @@ impl Value {
     /// Cast Value to [Time]. Return None if value is not a valid time data type.
     pub fn as_time(&self) -> Option<Time> {
         match self {
-            Value::Int64(v) => Some(Time::new_millisecond(*v)),
             Value::Time(t) => Some(*t),
             _ => None,
         }
     }
 
+    /// Cast Value to [IntervalYearMonth]. Return None if value is not a valid interval year month data type.
+    pub fn as_interval_year_month(&self) -> Option<IntervalYearMonth> {
+        match self {
+            Value::IntervalYearMonth(v) => Some(*v),
+            _ => None,
+        }
+    }
+
+    /// Cast Value to [IntervalDayTime]. Return None if value is not a valid interval day time data type.
+    pub fn as_interval_day_time(&self) -> Option<IntervalDayTime> {
+        match self {
+            Value::IntervalDayTime(v) => Some(*v),
+            _ => None,
+        }
+    }
+
+    /// Cast Value to [IntervalMonthDayNano]. Return None if value is not a valid interval month day nano data type.
+    pub fn as_interval_month_day_nano(&self) -> Option<IntervalMonthDayNano> {
+        match self {
+            Value::IntervalMonthDayNano(v) => Some(*v),
+            _ => None,
+        }
+    }
+
     /// Cast Value to u64. Return None if value is not a valid uint64 data type.
     pub fn as_u64(&self) -> Option<u64> {
         match self {
@@ -321,11 +357,9 @@ impl Value {
                 TimeUnit::Microsecond => LogicalTypeId::TimeMicrosecond,
                 TimeUnit::Nanosecond => LogicalTypeId::TimeNanosecond,
             },
-            Value::Interval(v) => match v.unit() {
+            Value::IntervalYearMonth(_) => LogicalTypeId::IntervalYearMonth,
-                IntervalUnit::YearMonth => LogicalTypeId::IntervalYearMonth,
+            Value::IntervalDayTime(_) => LogicalTypeId::IntervalDayTime,
-                IntervalUnit::DayTime => LogicalTypeId::IntervalDayTime,
+            Value::IntervalMonthDayNano(_) => LogicalTypeId::IntervalMonthDayNano,
-                IntervalUnit::MonthDayNano => LogicalTypeId::IntervalMonthDayNano,
-            },
             Value::Duration(d) => match d.unit() {
                 TimeUnit::Second => LogicalTypeId::DurationSecond,
                 TimeUnit::Millisecond => LogicalTypeId::DurationMillisecond,
@@ -375,11 +409,9 @@ impl Value {
             }
             Value::Timestamp(t) => timestamp_to_scalar_value(t.unit(), Some(t.value())),
             Value::Time(t) => time_to_scalar_value(*t.unit(), Some(t.value()))?,
-            Value::Interval(v) => match v.unit() {
+            Value::IntervalYearMonth(v) => ScalarValue::IntervalYearMonth(Some(v.to_i32())),
-                IntervalUnit::YearMonth => ScalarValue::IntervalYearMonth(Some(v.to_i32())),
+            Value::IntervalDayTime(v) => ScalarValue::IntervalDayTime(Some(v.to_i64())),
-                IntervalUnit::DayTime => ScalarValue::IntervalDayTime(Some(v.to_i64())),
+            Value::IntervalMonthDayNano(v) => ScalarValue::IntervalMonthDayNano(Some(v.to_i128())),
-                IntervalUnit::MonthDayNano => ScalarValue::IntervalMonthDayNano(Some(v.to_i128())),
-            },
             Value::Duration(d) => duration_to_scalar_value(d.unit(), Some(d.value())),
             Value::Decimal128(d) => {
                 let (v, p, s) = d.to_scalar_value();
@@ -434,7 +466,9 @@ impl Value {
             Value::Timestamp(x) => Some(Value::Timestamp(x.negative())),
             Value::Time(x) => Some(Value::Time(x.negative())),
             Value::Duration(x) => Some(Value::Duration(x.negative())),
-            Value::Interval(x) => Some(Value::Interval(x.negative())),
+            Value::IntervalYearMonth(x) => Some(Value::IntervalYearMonth(x.negative())),
+            Value::IntervalDayTime(x) => Some(Value::IntervalDayTime(x.negative())),
+            Value::IntervalMonthDayNano(x) => Some(Value::IntervalMonthDayNano(x.negative())),
 
             Value::Binary(_) | Value::String(_) | Value::Boolean(_) | Value::List(_) => None,
         }
@@ -571,16 +605,6 @@ pub fn scalar_value_to_timestamp(
     }
 }
 
-/// Convert [ScalarValue] to [Interval].
-pub fn scalar_value_to_interval(scalar: &ScalarValue) -> Option<Interval> {
-    match scalar {
-        ScalarValue::IntervalYearMonth(v) => v.map(Interval::from_i32),
-        ScalarValue::IntervalDayTime(v) => v.map(Interval::from_i64),
-        ScalarValue::IntervalMonthDayNano(v) => v.map(Interval::from_i128),
-        _ => None,
-    }
-}
-
 macro_rules! impl_ord_for_value_like {
     ($Type: ident, $left: ident, $right: ident) => {
         if $left.is_null() && !$right.is_null() {
@@ -607,7 +631,9 @@ macro_rules! impl_ord_for_value_like {
                 ($Type::DateTime(v1), $Type::DateTime(v2)) => v1.cmp(v2),
                 ($Type::Timestamp(v1), $Type::Timestamp(v2)) => v1.cmp(v2),
                 ($Type::Time(v1), $Type::Time(v2)) => v1.cmp(v2),
-                ($Type::Interval(v1), $Type::Interval(v2)) => v1.cmp(v2),
+                ($Type::IntervalYearMonth(v1), $Type::IntervalYearMonth(v2)) => v1.cmp(v2),
+                ($Type::IntervalDayTime(v1), $Type::IntervalDayTime(v2)) => v1.cmp(v2),
+                ($Type::IntervalMonthDayNano(v1), $Type::IntervalMonthDayNano(v2)) => v1.cmp(v2),
                 ($Type::Duration(v1), $Type::Duration(v2)) => v1.cmp(v2),
                 ($Type::List(v1), $Type::List(v2)) => v1.cmp(v2),
                 _ => panic!(
@@ -685,7 +711,9 @@ impl_try_from_value!(Date, Date);
 impl_try_from_value!(Time, Time);
 impl_try_from_value!(DateTime, DateTime);
 impl_try_from_value!(Timestamp, Timestamp);
-impl_try_from_value!(Interval, Interval);
+impl_try_from_value!(IntervalYearMonth, IntervalYearMonth);
+impl_try_from_value!(IntervalDayTime, IntervalDayTime);
+impl_try_from_value!(IntervalMonthDayNano, IntervalMonthDayNano);
 impl_try_from_value!(Duration, Duration);
 impl_try_from_value!(Decimal128, Decimal128);
 
@@ -727,7 +755,9 @@ impl_value_from!(Date, Date);
 impl_value_from!(Time, Time);
 impl_value_from!(DateTime, DateTime);
 impl_value_from!(Timestamp, Timestamp);
-impl_value_from!(Interval, Interval);
+impl_value_from!(IntervalYearMonth, IntervalYearMonth);
+impl_value_from!(IntervalDayTime, IntervalDayTime);
+impl_value_from!(IntervalMonthDayNano, IntervalMonthDayNano);
 impl_value_from!(Duration, Duration);
 impl_value_from!(String, String);
 impl_value_from!(Decimal128, Decimal128);
@@ -774,7 +804,9 @@ impl TryFrom<Value> for serde_json::Value {
             Value::List(v) => serde_json::to_value(v)?,
             Value::Timestamp(v) => serde_json::to_value(v.value())?,
             Value::Time(v) => serde_json::to_value(v.value())?,
-            Value::Interval(v) => serde_json::to_value(v.to_i128())?,
+            Value::IntervalYearMonth(v) => serde_json::to_value(v.to_i32())?,
+            Value::IntervalDayTime(v) => serde_json::to_value(v.to_i64())?,
+            Value::IntervalMonthDayNano(v) => serde_json::to_value(v.to_i128())?,
             Value::Duration(v) => serde_json::to_value(v.value())?,
             Value::Decimal128(v) => serde_json::to_value(v.to_string())?,
         };
@@ -926,13 +958,13 @@ impl TryFrom<ScalarValue> for Value {
                 .unwrap_or(Value::Null),
 
             ScalarValue::IntervalYearMonth(t) => t
-                .map(|x| Value::Interval(Interval::from_i32(x)))
+                .map(|x| Value::IntervalYearMonth(IntervalYearMonth::from_i32(x)))
                 .unwrap_or(Value::Null),
             ScalarValue::IntervalDayTime(t) => t
-                .map(|x| Value::Interval(Interval::from_i64(x)))
+                .map(|x| Value::IntervalDayTime(IntervalDayTime::from_i64(x)))
                 .unwrap_or(Value::Null),
             ScalarValue::IntervalMonthDayNano(t) => t
-                .map(|x| Value::Interval(Interval::from_i128(x)))
+                .map(|x| Value::IntervalMonthDayNano(IntervalMonthDayNano::from_i128(x)))
                 .unwrap_or(Value::Null),
             ScalarValue::DurationSecond(d) => d
                 .map(|x| Value::Duration(Duration::new(x, TimeUnit::Second)))
@@ -987,7 +1019,9 @@ impl From<ValueRef<'_>> for Value {
             ValueRef::DateTime(v) => Value::DateTime(v),
             ValueRef::Timestamp(v) => Value::Timestamp(v),
             ValueRef::Time(v) => Value::Time(v),
-            ValueRef::Interval(v) => Value::Interval(v),
+            ValueRef::IntervalYearMonth(v) => Value::IntervalYearMonth(v),
+            ValueRef::IntervalDayTime(v) => Value::IntervalDayTime(v),
+            ValueRef::IntervalMonthDayNano(v) => Value::IntervalMonthDayNano(v),
             ValueRef::Duration(v) => Value::Duration(v),
             ValueRef::List(v) => v.to_value(),
             ValueRef::Decimal128(v) => Value::Decimal128(v),
@@ -1026,7 +1060,10 @@ pub enum ValueRef<'a> {
     Timestamp(Timestamp),
     Time(Time),
     Duration(Duration),
-    Interval(Interval),
+    // Interval types:
+    IntervalYearMonth(IntervalYearMonth),
+    IntervalDayTime(IntervalDayTime),
+    IntervalMonthDayNano(IntervalMonthDayNano),
 
     // Compound types:
     List(ListValueRef<'a>),
@@ -1150,9 +1187,19 @@ impl<'a> ValueRef<'a> {
         impl_as_for_value_ref!(self, Duration)
     }
 
-    /// Cast itself to [Interval].
+    /// Cast itself to [IntervalYearMonth].
-    pub fn as_interval(&self) -> Result<Option<Interval>> {
+    pub fn as_interval_year_month(&self) -> Result<Option<IntervalYearMonth>> {
-        impl_as_for_value_ref!(self, Interval)
+        impl_as_for_value_ref!(self, IntervalYearMonth)
+    }
+
+    /// Cast itself to [IntervalDayTime].
+    pub fn as_interval_day_time(&self) -> Result<Option<IntervalDayTime>> {
+        impl_as_for_value_ref!(self, IntervalDayTime)
+    }
+
+    /// Cast itself to [IntervalMonthDayNano].
+    pub fn as_interval_month_day_nano(&self) -> Result<Option<IntervalMonthDayNano>> {
+        impl_as_for_value_ref!(self, IntervalMonthDayNano)
     }
 
     /// Cast itself to [ListValueRef].
@@ -1212,7 +1259,9 @@ impl_value_ref_from!(Date, Date);
 impl_value_ref_from!(DateTime, DateTime);
 impl_value_ref_from!(Timestamp, Timestamp);
 impl_value_ref_from!(Time, Time);
-impl_value_ref_from!(Interval, Interval);
+impl_value_ref_from!(IntervalYearMonth, IntervalYearMonth);
+impl_value_ref_from!(IntervalDayTime, IntervalDayTime);
+impl_value_ref_from!(IntervalMonthDayNano, IntervalMonthDayNano);
 impl_value_ref_from!(Duration, Duration);
 impl_value_ref_from!(Decimal128, Decimal128);
 
@@ -1261,7 +1310,9 @@ impl<'a> TryFrom<ValueRef<'a>> for serde_json::Value {
             ValueRef::List(v) => serde_json::to_value(v)?,
             ValueRef::Timestamp(v) => serde_json::to_value(v.value())?,
             ValueRef::Time(v) => serde_json::to_value(v.value())?,
-            ValueRef::Interval(v) => serde_json::to_value(v.to_i128())?,
+            ValueRef::IntervalYearMonth(v) => serde_json::Value::from(v),
+            ValueRef::IntervalDayTime(v) => serde_json::Value::from(v),
+            ValueRef::IntervalMonthDayNano(v) => serde_json::Value::from(v),
             ValueRef::Duration(v) => serde_json::to_value(v.value())?,
             ValueRef::Decimal128(v) => serde_json::to_value(v.to_string())?,
         };
@@ -1359,7 +1410,9 @@ impl<'a> ValueRef<'a> {
             ValueRef::Timestamp(_) => 16,
             ValueRef::Time(_) => 16,
             ValueRef::Duration(_) => 16,
-            ValueRef::Interval(_) => 24,
+            ValueRef::IntervalYearMonth(_) => 4,
+            ValueRef::IntervalDayTime(_) => 8,
+            ValueRef::IntervalMonthDayNano(_) => 16,
             ValueRef::Decimal128(_) => 32,
             ValueRef::List(v) => match v {
                 ListValueRef::Indexed { vector, .. } => vector.memory_size() / vector.len(),
@@ -1428,7 +1481,9 @@ pub fn column_data_to_json(data: ValueData) -> JsonValue {
 mod tests {
     use arrow::datatypes::DataType as ArrowDataType;
     use common_time::timezone::set_default_timezone;
-    use greptime_proto::v1::{Decimal128 as ProtoDecimal128, IntervalMonthDayNano};
+    use greptime_proto::v1::{
+        Decimal128 as ProtoDecimal128, IntervalMonthDayNano as ProtoIntervalMonthDayNano,
+    };
     use num_traits::Float;
 
     use super::*;
@@ -1525,11 +1580,13 @@ mod tests {
             JsonValue::String("interval year [12]".to_string())
         );
         assert_eq!(
-            column_data_to_json(ValueData::IntervalMonthDayNanoValue(IntervalMonthDayNano {
+            column_data_to_json(ValueData::IntervalMonthDayNanoValue(
-                months: 1,
+                ProtoIntervalMonthDayNano {
-                days: 2,
+                    months: 1,
-                nanoseconds: 3,
+                    days: 2,
-            })),
+                    nanoseconds: 3,
+                }
+            )),
             JsonValue::String("interval month [1][2][3]".to_string())
         );
         assert_eq!(
@@ -1740,12 +1797,10 @@ mod tests {
             ScalarValue::IntervalMonthDayNano(None).try_into().unwrap()
         );
         assert_eq!(
-            Value::Interval(Interval::from_month_day_nano(1, 1, 1)),
+            Value::IntervalMonthDayNano(IntervalMonthDayNano::new(1, 1, 1)),
-            ScalarValue::IntervalMonthDayNano(Some(
+            ScalarValue::IntervalMonthDayNano(Some(IntervalMonthDayNano::new(1, 1, 1).to_i128()))
-                Interval::from_month_day_nano(1, 1, 1).to_i128()
+                .try_into()
-            ))
+                .unwrap()
-            .try_into()
-            .unwrap()
         );
 
         assert_eq!(
@@ -1975,9 +2030,17 @@ mod tests {
             &ConcreteDataType::time_nanosecond_datatype(),
             &Value::Time(Time::new_nanosecond(1)),
         );
+        check_type_and_value(
+            &ConcreteDataType::interval_year_month_datatype(),
+            &Value::IntervalYearMonth(IntervalYearMonth::new(1)),
+        );
+        check_type_and_value(
+            &ConcreteDataType::interval_day_time_datatype(),
+            &Value::IntervalDayTime(IntervalDayTime::new(1, 2)),
+        );
         check_type_and_value(
             &ConcreteDataType::interval_month_day_nano_datatype(),
-            &Value::Interval(Interval::from_month_day_nano(1, 2, 3)),
+            &Value::IntervalMonthDayNano(IntervalMonthDayNano::new(1, 2, 3)),
         );
         check_type_and_value(
             &ConcreteDataType::duration_second_datatype(),
@@ -2160,7 +2223,9 @@ mod tests {
         check_as_value_ref!(Float64, OrderedF64::from(16.0));
         check_as_value_ref!(Timestamp, Timestamp::new_millisecond(1));
         check_as_value_ref!(Time, Time::new_millisecond(1));
-        check_as_value_ref!(Interval, Interval::from_month_day_nano(1, 2, 3));
+        check_as_value_ref!(IntervalYearMonth, IntervalYearMonth::new(1));
+        check_as_value_ref!(IntervalDayTime, IntervalDayTime::new(1, 2));
+        check_as_value_ref!(IntervalMonthDayNano, IntervalMonthDayNano::new(1, 2, 3));
         check_as_value_ref!(Duration, Duration::new_millisecond(1));
 
         assert_eq!(
@@ -2672,9 +2737,11 @@ mod tests {
         check_value_ref_size_eq(&ValueRef::DateTime(DateTime::new(1)), 8);
         check_value_ref_size_eq(&ValueRef::Timestamp(Timestamp::new_millisecond(1)), 16);
         check_value_ref_size_eq(&ValueRef::Time(Time::new_millisecond(1)), 16);
+        check_value_ref_size_eq(&ValueRef::IntervalYearMonth(IntervalYearMonth::new(1)), 4);
+        check_value_ref_size_eq(&ValueRef::IntervalDayTime(IntervalDayTime::new(1, 2)), 8);
         check_value_ref_size_eq(
-            &ValueRef::Interval(Interval::from_month_day_nano(1, 2, 3)),
+            &ValueRef::IntervalMonthDayNano(IntervalMonthDayNano::new(1, 2, 3)),
-            24,
+            16,
         );
         check_value_ref_size_eq(&ValueRef::Duration(Duration::new_millisecond(1)), 16);
         check_value_ref_size_eq(

src/datatypes/src/vectors/helper.rs

@@ -421,7 +421,7 @@ mod tests {
     use common_decimal::Decimal128;
     use common_time::time::Time;
     use common_time::timestamp::TimeUnit;
-    use common_time::{Date, DateTime, Duration, Interval};
+    use common_time::{Date, DateTime, Duration, IntervalMonthDayNano};
 
     use super::*;
     use crate::value::Value;
@@ -689,7 +689,10 @@ mod tests {
         );
         assert_eq!(3, vector.len());
         for i in 0..vector.len() {
-            assert_eq!(Value::Interval(Interval::from_i128(2000)), vector.get(i));
+            assert_eq!(
+                Value::IntervalMonthDayNano(IntervalMonthDayNano::from_i128(2000)),
+                vector.get(i)
+            );
         }
     }
 

src/flow/src/compute/render/reduce.rs

@@ -560,7 +560,7 @@ fn reduce_batch_subgraph(
                     .get_mut(i)
                     .context(InternalSnafu{
                         reason: format!(
-                            "Output builder should have the same length as the row, expected at most {} but got {}", 
+                            "Output builder should have the same length as the row, expected at most {} but got {}",
                             column_cnt - 1,
                             i
                         )
@@ -1162,7 +1162,9 @@ fn from_val_to_slice_idx(
 #[cfg(test)]
 mod test {
 
-    use common_time::{DateTime, Interval, Timestamp};
+    use std::time::Duration;
+
+    use common_time::Timestamp;
     use datatypes::data_type::{ConcreteDataType, ConcreteDataType as CDT};
     use hydroflow::scheduled::graph::Hydroflow;
 
@@ -1214,8 +1216,8 @@ mod test {
         let expected = TypedPlan {
             schema: RelationType::new(vec![
                 ColumnType::new(CDT::uint64_datatype(), true), // sum(number)
-                ColumnType::new(CDT::datetime_datatype(), false), // window start
+                ColumnType::new(CDT::timestamp_millisecond_datatype(), false), // window start
-                ColumnType::new(CDT::datetime_datatype(), false), // window end
+                ColumnType::new(CDT::timestamp_millisecond_datatype(), false), // window end
             ])
             .into_unnamed(),
             // TODO(discord9): mfp indirectly ref to key columns
@@ -1232,7 +1234,10 @@ mod test {
                             .with_types(
                                 RelationType::new(vec![
                                     ColumnType::new(ConcreteDataType::uint32_datatype(), false),
-                                    ColumnType::new(ConcreteDataType::datetime_datatype(), false),
+                                    ColumnType::new(
+                                        ConcreteDataType::timestamp_millisecond_datatype(),
+                                        false,
+                                    ),
                                 ])
                                 .into_unnamed(),
                             ),
@@ -1242,22 +1247,18 @@ mod test {
                                 .map(vec![
                                     ScalarExpr::Column(1).call_unary(
                                         UnaryFunc::TumbleWindowFloor {
-                                            window_size: Interval::from_month_day_nano(
+                                            window_size: Duration::from_nanos(1_000_000_000),
-                                                0,
+                                            start_time: Some(Timestamp::new_millisecond(
-                                                0,
+                                                1625097600000,
-                                                1_000_000_000,
+                                            )),
-                                            ),
-                                            start_time: Some(DateTime::new(1625097600000)),
                                         },
                                     ),
                                     ScalarExpr::Column(1).call_unary(
                                         UnaryFunc::TumbleWindowCeiling {
-                                            window_size: Interval::from_month_day_nano(
+                                            window_size: Duration::from_nanos(1_000_000_000),
-                                                0,
+                                            start_time: Some(Timestamp::new_millisecond(
-                                                0,
+                                                1625097600000,
-                                                1_000_000_000,
+                                            )),
-                                            ),
-                                            start_time: Some(DateTime::new(1625097600000)),
                                         },
                                     ),
                                 ])
@@ -1278,9 +1279,9 @@ mod test {
                     }
                     .with_types(
                         RelationType::new(vec![
-                            ColumnType::new(CDT::datetime_datatype(), false), // window start
+                            ColumnType::new(CDT::timestamp_millisecond_datatype(), false), // window start
-                            ColumnType::new(CDT::datetime_datatype(), false), // window end
+                            ColumnType::new(CDT::timestamp_millisecond_datatype(), false), // window end
-                            ColumnType::new(CDT::uint64_datatype(), true),    //sum(number)
+                            ColumnType::new(CDT::uint64_datatype(), true), //sum(number)
                         ])
                         .with_key(vec![1])
                         .with_time_index(Some(0))

src/flow/src/expr/df_func.rs

@@ -171,9 +171,13 @@ impl DfScalarFunction {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct RawDfScalarFn {
-    /// The raw bytes encoded datafusion scalar function
+    /// The raw bytes encoded datafusion scalar function,
+    /// due to substrait have too many layers of nested struct and `ScalarFunction` 's derive is different
+    /// for simplicity's sake
+    /// so we store bytes instead of `ScalarFunction` here
+    /// but in unit test we will still compare decoded struct(using `f_decoded` field in Debug impl)
     pub(crate) f: bytes::BytesMut,
     /// The input schema of the function
     pub(crate) input_schema: RelationDesc,
@@ -181,6 +185,17 @@ pub struct RawDfScalarFn {
     pub(crate) extensions: FunctionExtensions,
 }
 
+impl std::fmt::Debug for RawDfScalarFn {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("RawDfScalarFn")
+            .field("f", &self.f)
+            .field("f_decoded", &ScalarFunction::decode(&mut self.f.as_ref()))
+            .field("df_schema", &self.input_schema)
+            .field("extensions", &self.extensions)
+            .finish()
+    }
+}
+
 impl RawDfScalarFn {
     pub fn from_proto(
         f: &substrait::substrait_proto_df::proto::expression::ScalarFunction,

src/flow/src/expr/func.rs

@@ -16,19 +16,18 @@
 
 use std::collections::HashMap;
 use std::sync::{Arc, OnceLock};
+use std::time::Duration;
 
 use arrow::array::{ArrayRef, BooleanArray};
 use common_error::ext::BoxedError;
 use common_time::timestamp::TimeUnit;
-use common_time::{DateTime, Timestamp};
+use common_time::Timestamp;
 use datafusion_expr::Operator;
 use datatypes::data_type::ConcreteDataType;
 use datatypes::prelude::DataType;
 use datatypes::types::cast;
 use datatypes::value::Value;
-use datatypes::vectors::{
+use datatypes::vectors::{BooleanVector, Helper, TimestampMillisecondVector, VectorRef};
-    BooleanVector, DateTimeVector, Helper, TimestampMillisecondVector, VectorRef,
-};
 use serde::{Deserialize, Serialize};
 use smallvec::smallvec;
 use snafu::{ensure, OptionExt, ResultExt};
@@ -52,8 +51,8 @@ pub enum UnmaterializableFunc {
     CurrentSchema,
     TumbleWindow {
         ts: Box<TypedExpr>,
-        window_size: common_time::Interval,
+        window_size: Duration,
-        start_time: Option<DateTime>,
+        start_time: Option<Timestamp>,
     },
 }
 
@@ -63,7 +62,8 @@ impl UnmaterializableFunc {
         match self {
             Self::Now => Signature {
                 input: smallvec![],
-                output: ConcreteDataType::datetime_datatype(),
+                // TODO(yingwen): Maybe return timestamp.
+                output: ConcreteDataType::timestamp_millisecond_datatype(),
                 generic_fn: GenericFn::Now,
             },
             Self::CurrentSchema => Signature {
@@ -110,12 +110,12 @@ pub enum UnaryFunc {
     StepTimestamp,
     Cast(ConcreteDataType),
     TumbleWindowFloor {
-        window_size: common_time::Interval,
+        window_size: Duration,
-        start_time: Option<DateTime>,
+        start_time: Option<Timestamp>,
     },
     TumbleWindowCeiling {
-        window_size: common_time::Interval,
+        window_size: Duration,
-        start_time: Option<DateTime>,
+        start_time: Option<Timestamp>,
     },
 }
 
@@ -139,8 +139,8 @@ impl UnaryFunc {
                 },
             },
             Self::StepTimestamp => Signature {
-                input: smallvec![ConcreteDataType::datetime_datatype()],
+                input: smallvec![ConcreteDataType::timestamp_millisecond_datatype()],
-                output: ConcreteDataType::datetime_datatype(),
+                output: ConcreteDataType::timestamp_millisecond_datatype(),
                 generic_fn: GenericFn::StepTimestamp,
             },
             Self::Cast(to) => Signature {
@@ -238,19 +238,19 @@ impl UnaryFunc {
                 }
             }
             Self::StepTimestamp => {
-                let datetime_array = get_datetime_array(&arg_col)?;
+                let timestamp_array = get_timestamp_array(&arg_col)?;
-                let date_array_ref = datetime_array
+                let timestamp_array_ref = timestamp_array
                     .as_any()
-                    .downcast_ref::<arrow::array::Date64Array>()
+                    .downcast_ref::<arrow::array::TimestampMillisecondArray>()
                     .context({
                         TypeMismatchSnafu {
                             expected: ConcreteDataType::boolean_datatype(),
-                            actual: ConcreteDataType::from_arrow_type(datetime_array.data_type()),
+                            actual: ConcreteDataType::from_arrow_type(timestamp_array.data_type()),
                         }
                     })?;
 
-                let ret = arrow::compute::unary(date_array_ref, |arr| arr + 1);
+                let ret = arrow::compute::unary(timestamp_array_ref, |arr| arr + 1);
-                let ret = DateTimeVector::from(ret);
+                let ret = TimestampMillisecondVector::from(ret);
                 Ok(Arc::new(ret))
             }
             Self::Cast(to) => {
@@ -266,19 +266,19 @@ impl UnaryFunc {
                 window_size,
                 start_time,
             } => {
-                let datetime_array = get_datetime_array(&arg_col)?;
+                let timestamp_array = get_timestamp_array(&arg_col)?;
-                let date_array_ref = datetime_array
+                let date_array_ref = timestamp_array
                     .as_any()
-                    .downcast_ref::<arrow::array::Date64Array>()
+                    .downcast_ref::<arrow::array::TimestampMillisecondArray>()
                     .context({
                         TypeMismatchSnafu {
                             expected: ConcreteDataType::boolean_datatype(),
-                            actual: ConcreteDataType::from_arrow_type(datetime_array.data_type()),
+                            actual: ConcreteDataType::from_arrow_type(timestamp_array.data_type()),
                         }
                     })?;
 
-                let start_time = start_time.map(|t| t.val());
+                let start_time = start_time.map(|t| t.value());
-                let window_size = (window_size.to_nanosecond() / 1_000_000) as repr::Duration; // nanosecond to millisecond
+                let window_size = window_size.as_millis() as repr::Duration;
 
                 let ret = arrow::compute::unary(date_array_ref, |ts| {
                     get_window_start(ts, window_size, start_time)
@@ -291,19 +291,19 @@ impl UnaryFunc {
                 window_size,
                 start_time,
             } => {
-                let datetime_array = get_datetime_array(&arg_col)?;
+                let timestamp_array = get_timestamp_array(&arg_col)?;
-                let date_array_ref = datetime_array
+                let date_array_ref = timestamp_array
                     .as_any()
-                    .downcast_ref::<arrow::array::Date64Array>()
+                    .downcast_ref::<arrow::array::TimestampMillisecondArray>()
                     .context({
                         TypeMismatchSnafu {
                             expected: ConcreteDataType::boolean_datatype(),
-                            actual: ConcreteDataType::from_arrow_type(datetime_array.data_type()),
+                            actual: ConcreteDataType::from_arrow_type(timestamp_array.data_type()),
                         }
                     })?;
 
-                let start_time = start_time.map(|t| t.val());
+                let start_time = start_time.map(|t| t.value());
-                let window_size = (window_size.to_nanosecond() / 1_000_000) as repr::Duration; // nanosecond to millisecond
+                let window_size = window_size.as_millis() as repr::Duration;
 
                 let ret = arrow::compute::unary(date_array_ref, |ts| {
                     get_window_start(ts, window_size, start_time) + window_size
@@ -330,19 +330,20 @@ impl UnaryFunc {
                     })?;
                     if let Some(window_size) = window_size_untyped.as_string() {
                         // cast as interval
-                        cast(
+                        let interval = cast(
                             Value::from(window_size),
-                            &ConcreteDataType::interval_month_day_nano_datatype(),
+                            &ConcreteDataType::interval_day_time_datatype(),
                         )
                         .map_err(BoxedError::new)
                         .context(ExternalSnafu)?
-                        .as_interval()
+                        .as_interval_day_time()
                         .context(UnexpectedSnafu {
                             reason: "Expect window size arg to be interval after successful cast"
                                 .to_string(),
-                        })?
+                        })?;
-                    } else if let Some(interval) = window_size_untyped.as_interval() {
+                        Duration::from_millis(interval.as_millis() as u64)
-                        interval
+                    } else if let Some(interval) = window_size_untyped.as_interval_day_time() {
+                        Duration::from_millis(interval.as_millis() as u64)
                     } else {
                         InvalidQuerySnafu {
                                 reason: format!(
@@ -357,16 +358,19 @@ impl UnaryFunc {
                 let start_time = match args.get(2) {
                     Some(start_time) => {
                         if let Some(value) = start_time.expr.as_literal() {
-                            // cast as DateTime
+                            // cast as timestamp
-                            let ret = cast(value, &ConcreteDataType::datetime_datatype())
+                            let ret = cast(
-                                .map_err(BoxedError::new)
+                                value,
-                                .context(ExternalSnafu)?
+                                &ConcreteDataType::timestamp_millisecond_datatype(),
-                                .as_datetime()
+                            )
-                                .context(UnexpectedSnafu {
+                            .map_err(BoxedError::new)
-                                    reason:
+                            .context(ExternalSnafu)?
-                                        "Expect start time arg to be datetime after successful cast"
+                            .as_timestamp()
-                                            .to_string(),
+                            .context(UnexpectedSnafu {
-                                })?;
+                                reason:
+                                    "Expect start time arg to be timestamp after successful cast"
+                                        .to_string(),
+                            })?;
                             Some(ret)
                         } else {
                             UnexpectedSnafu {
@@ -446,15 +450,15 @@ impl UnaryFunc {
             }
             Self::StepTimestamp => {
                 let ty = arg.data_type();
-                if let Value::DateTime(datetime) = arg {
+                if let Value::Timestamp(timestamp) = arg {
-                    let datetime = DateTime::from(datetime.val() + 1);
+                    let timestamp = Timestamp::new_millisecond(timestamp.value() + 1);
-                    Ok(Value::from(datetime))
+                    Ok(Value::from(timestamp))
                 } else if let Ok(v) = value_to_internal_ts(arg) {
-                    let datetime = DateTime::from(v + 1);
+                    let timestamp = Timestamp::new_millisecond(v + 1);
-                    Ok(Value::from(datetime))
+                    Ok(Value::from(timestamp))
                 } else {
                     TypeMismatchSnafu {
-                        expected: ConcreteDataType::datetime_datatype(),
+                        expected: ConcreteDataType::timestamp_millisecond_datatype(),
                         actual: ty,
                     }
                     .fail()?
@@ -474,8 +478,8 @@ impl UnaryFunc {
                 start_time,
             } => {
                 let ts = get_ts_as_millisecond(arg)?;
-                let start_time = start_time.map(|t| t.val());
+                let start_time = start_time.map(|t| t.value());
-                let window_size = (window_size.to_nanosecond() / 1_000_000) as repr::Duration; // nanosecond to millisecond
+                let window_size = window_size.as_millis() as repr::Duration;
                 let window_start = get_window_start(ts, window_size, start_time);
 
                 let ret = Timestamp::new_millisecond(window_start);
@@ -486,8 +490,8 @@ impl UnaryFunc {
                 start_time,
             } => {
                 let ts = get_ts_as_millisecond(arg)?;
-                let start_time = start_time.map(|t| t.val());
+                let start_time = start_time.map(|t| t.value());
-                let window_size = (window_size.to_nanosecond() / 1_000_000) as repr::Duration; // nanosecond to millisecond
+                let window_size = window_size.as_millis() as repr::Duration;
                 let window_start = get_window_start(ts, window_size, start_time);
 
                 let window_end = window_start + window_size;
@@ -498,21 +502,22 @@ impl UnaryFunc {
     }
 }
 
-fn get_datetime_array(vector: &VectorRef) -> Result<arrow::array::ArrayRef, EvalError> {
+fn get_timestamp_array(vector: &VectorRef) -> Result<arrow::array::ArrayRef, EvalError> {
     let arrow_array = vector.to_arrow_array();
-    let datetime_array =
+    let timestamp_array = if *arrow_array.data_type()
-        if *arrow_array.data_type() == ConcreteDataType::datetime_datatype().as_arrow_type() {
+        == ConcreteDataType::timestamp_millisecond_datatype().as_arrow_type()
-            arrow_array
+    {
-        } else {
+        arrow_array
-            arrow::compute::cast(
+    } else {
-                &arrow_array,
+        arrow::compute::cast(
-                &ConcreteDataType::datetime_datatype().as_arrow_type(),
+            &arrow_array,
-            )
+            &ConcreteDataType::timestamp_millisecond_datatype().as_arrow_type(),
-            .context(ArrowSnafu {
+        )
-                context: "Trying to cast to datetime in StepTimestamp",
+        .context(ArrowSnafu {
-            })?
+            context: "Trying to cast to timestamp in StepTimestamp",
-        };
+        })?
-    Ok(datetime_array)
+    };
+    Ok(timestamp_array)
 }
 
 fn get_window_start(
@@ -1284,7 +1289,6 @@ where
 mod test {
     use std::sync::Arc;
 
-    use common_time::Interval;
     use datatypes::vectors::Vector;
     use pretty_assertions::assert_eq;
 
@@ -1292,18 +1296,18 @@ mod test {
 
     #[test]
     fn test_tumble_batch() {
-        let datetime_vector = DateTimeVector::from_vec(vec![1, 2, 10, 13, 14, 20, 25]);
+        let timestamp_vector = TimestampMillisecondVector::from_vec(vec![1, 2, 10, 13, 14, 20, 25]);
         let tumble_start = UnaryFunc::TumbleWindowFloor {
-            window_size: Interval::from_day_time(0, 10),
+            window_size: Duration::from_millis(10),
             start_time: None,
         };
         let tumble_end = UnaryFunc::TumbleWindowCeiling {
-            window_size: Interval::from_day_time(0, 10),
+            window_size: Duration::from_millis(10),
             start_time: None,
         };
 
-        let len = datetime_vector.len();
+        let len = timestamp_vector.len();
-        let batch = Batch::try_new(vec![Arc::new(datetime_vector)], len).unwrap();
+        let batch = Batch::try_new(vec![Arc::new(timestamp_vector)], len).unwrap();
         let arg = ScalarExpr::Column(0);
 
         let start = tumble_start.eval_batch(&batch, &arg).unwrap();
@@ -1459,4 +1463,17 @@ mod test {
             Err(Error::InvalidQuery { .. })
         );
     }
+
+    #[test]
+    fn test_cast_int() {
+        let interval = cast(
+            Value::from("1 second"),
+            &ConcreteDataType::interval_day_time_datatype(),
+        )
+        .unwrap();
+        assert_eq!(
+            interval,
+            Value::from(common_time::IntervalDayTime::new(0, 1000))
+        );
+    }
 }

src/flow/src/repr.rs

@@ -61,7 +61,7 @@ pub const BATCH_SIZE: usize = 32 * 16384;
 /// Convert a value that is or can be converted to Datetime to internal timestamp
 ///
 /// support types are: `Date`, `DateTime`, `TimeStamp`, `i64`
-pub fn value_to_internal_ts(value: Value) -> Result<Timestamp, EvalError> {
+pub fn value_to_internal_ts(value: Value) -> Result<i64, EvalError> {
     let is_supported_time_type = |arg: &Value| {
         let ty = arg.data_type();
         matches!(
@@ -76,14 +76,14 @@ pub fn value_to_internal_ts(value: Value) -> Result<Timestamp, EvalError> {
         Value::Int64(ts) => Ok(ts),
         arg if is_supported_time_type(&arg) => {
             let arg_ty = arg.data_type();
-            let res = cast(arg, &ConcreteDataType::datetime_datatype()).context({
+            let res = cast(arg, &ConcreteDataType::timestamp_millisecond_datatype()).context({
                 CastValueSnafu {
                     from: arg_ty,
-                    to: ConcreteDataType::datetime_datatype(),
+                    to: ConcreteDataType::timestamp_millisecond_datatype(),
                 }
             })?;
-            if let Value::DateTime(ts) = res {
+            if let Value::Timestamp(ts) = res {
-                Ok(ts.val())
+                Ok(ts.value())
             } else {
                 unreachable!()
             }

src/flow/src/transform.rs

@@ -156,10 +156,10 @@ mod test {
 
     use catalog::RegisterTableRequest;
     use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, NUMBERS_TABLE_ID};
-    use common_time::DateTime;
     use datatypes::prelude::*;
     use datatypes::schema::Schema;
-    use datatypes::vectors::VectorRef;
+    use datatypes::timestamp::TimestampMillisecond;
+    use datatypes::vectors::{TimestampMillisecondVectorBuilder, VectorRef};
     use itertools::Itertools;
     use prost::Message;
     use query::parser::QueryLanguageParser;
@@ -202,7 +202,7 @@ mod test {
             ];
             let schema = RelationType::new(vec![
                 ColumnType::new(CDT::uint32_datatype(), false),
-                ColumnType::new(CDT::datetime_datatype(), false),
+                ColumnType::new(CDT::timestamp_millisecond_datatype(), false),
             ]);
             schemas.insert(
                 gid,
@@ -232,7 +232,11 @@ mod test {
 
         let schema = vec![
             datatypes::schema::ColumnSchema::new("number", CDT::uint32_datatype(), false),
-            datatypes::schema::ColumnSchema::new("ts", CDT::datetime_datatype(), false),
+            datatypes::schema::ColumnSchema::new(
+                "ts",
+                CDT::timestamp_millisecond_datatype(),
+                false,
+            ),
         ];
         let mut columns = vec![];
         let numbers = (1..=10).collect_vec();
@@ -240,7 +244,11 @@ mod test {
         columns.push(column);
 
         let ts = (1..=10).collect_vec();
-        let column: VectorRef = Arc::new(<DateTime as Scalar>::VectorType::from_vec(ts));
+        let mut builder = TimestampMillisecondVectorBuilder::with_capacity(10);
+        ts.into_iter()
+            .map(|v| builder.push(Some(TimestampMillisecond::new(v))))
+            .count();
+        let column: VectorRef = builder.to_vector_cloned();
         columns.push(column);
 
         let schema = Arc::new(Schema::new(schema));

src/flow/src/transform/aggr.rs

@@ -345,9 +345,10 @@ impl TypedPlan {
 #[cfg(test)]
 mod test {
     use std::collections::BTreeMap;
+    use std::time::Duration;
 
     use bytes::BytesMut;
-    use common_time::{DateTime, Interval};
+    use common_time::{IntervalMonthDayNano, Timestamp};
     use datatypes::prelude::ConcreteDataType;
     use datatypes::value::Value;
     use pretty_assertions::assert_eq;
@@ -398,7 +399,10 @@ mod test {
                             .with_types(
                                 RelationType::new(vec![
                                     ColumnType::new(ConcreteDataType::uint32_datatype(), false),
-                                    ColumnType::new(ConcreteDataType::datetime_datatype(), false),
+                                    ColumnType::new(
+                                        ConcreteDataType::timestamp_millisecond_datatype(),
+                                        false,
+                                    ),
                                 ])
                                 .into_named(vec![
                                     Some("number".to_string()),
@@ -413,22 +417,18 @@ mod test {
                                 .map(vec![
                                     ScalarExpr::Column(1).call_unary(
                                         UnaryFunc::TumbleWindowFloor {
-                                            window_size: Interval::from_month_day_nano(
+                                            window_size: Duration::from_nanos(1_000_000_000),
-                                                0,
+                                            start_time: Some(Timestamp::new_millisecond(
-                                                0,
+                                                1625097600000,
-                                                1_000_000_000,
+                                            )),
-                                            ),
-                                            start_time: Some(DateTime::new(1625097600000)),
                                         },
                                     ),
                                     ScalarExpr::Column(1).call_unary(
                                         UnaryFunc::TumbleWindowCeiling {
-                                            window_size: Interval::from_month_day_nano(
+                                            window_size: Duration::from_nanos(1_000_000_000),
-                                                0,
+                                            start_time: Some(Timestamp::new_millisecond(
-                                                0,
+                                                1625097600000,
-                                                1_000_000_000,
+                                            )),
-                                            ),
-                                            start_time: Some(DateTime::new(1625097600000)),
                                         },
                                     ),
                                 ])
@@ -539,7 +539,10 @@ mod test {
                             .with_types(
                                 RelationType::new(vec![
                                     ColumnType::new(ConcreteDataType::uint32_datatype(), false),
-                                    ColumnType::new(ConcreteDataType::datetime_datatype(), false),
+                                    ColumnType::new(
+                                        ConcreteDataType::timestamp_millisecond_datatype(),
+                                        false,
+                                    ),
                                 ])
                                 .into_named(vec![
                                     Some("number".to_string()),
@@ -554,22 +557,18 @@ mod test {
                                 .map(vec![
                                     ScalarExpr::Column(1).call_unary(
                                         UnaryFunc::TumbleWindowFloor {
-                                            window_size: Interval::from_month_day_nano(
+                                            window_size: Duration::from_nanos(1_000_000_000),
-                                                0,
+                                            start_time: Some(Timestamp::new_millisecond(
-                                                0,
+                                                1625097600000,
-                                                1_000_000_000,
+                                            )),
-                                            ),
-                                            start_time: Some(DateTime::new(1625097600000)),
                                         },
                                     ),
                                     ScalarExpr::Column(1).call_unary(
                                         UnaryFunc::TumbleWindowCeiling {
-                                            window_size: Interval::from_month_day_nano(
+                                            window_size: Duration::from_nanos(1_000_000_000),
-                                                0,
+                                            start_time: Some(Timestamp::new_millisecond(
-                                                0,
+                                                1625097600000,
-                                                1_000_000_000,
+                                            )),
-                                            ),
-                                            start_time: Some(DateTime::new(1625097600000)),
                                         },
                                     ),
                                 ])
@@ -686,7 +685,10 @@ mod test {
                             .with_types(
                                 RelationType::new(vec![
                                     ColumnType::new(ConcreteDataType::uint32_datatype(), false),
-                                    ColumnType::new(ConcreteDataType::datetime_datatype(), false),
+                                    ColumnType::new(
+                                        ConcreteDataType::timestamp_millisecond_datatype(),
+                                        false,
+                                    ),
                                 ])
                                 .into_named(vec![
                                     Some("number".to_string()),
@@ -701,21 +703,13 @@ mod test {
                                 .map(vec![
                                     ScalarExpr::Column(1).call_unary(
                                         UnaryFunc::TumbleWindowFloor {
-                                            window_size: Interval::from_month_day_nano(
+                                            window_size: Duration::from_nanos(3_600_000_000_000),
-                                                0,
-                                                0,
-                                                3_600_000_000_000,
-                                            ),
                                             start_time: None,
                                         },
                                     ),
                                     ScalarExpr::Column(1).call_unary(
                                         UnaryFunc::TumbleWindowCeiling {
-                                            window_size: Interval::from_month_day_nano(
+                                            window_size: Duration::from_nanos(3_600_000_000_000),
-                                                0,
-                                                0,
-                                                3_600_000_000_000,
-                                            ),
                                             start_time: None,
                                         },
                                     ),
@@ -833,7 +827,10 @@ mod test {
                             .with_types(
                                 RelationType::new(vec![
                                     ColumnType::new(ConcreteDataType::uint32_datatype(), false),
-                                    ColumnType::new(ConcreteDataType::datetime_datatype(), false),
+                                    ColumnType::new(
+                                        ConcreteDataType::timestamp_millisecond_datatype(),
+                                        false,
+                                    ),
                                 ])
                                 .into_named(vec![
                                     Some("number".to_string()),
@@ -848,21 +845,13 @@ mod test {
                                 .map(vec![
                                     ScalarExpr::Column(1).call_unary(
                                         UnaryFunc::TumbleWindowFloor {
-                                            window_size: Interval::from_month_day_nano(
+                                            window_size: Duration::from_nanos(3_600_000_000_000),
-                                                0,
-                                                0,
-                                                3_600_000_000_000,
-                                            ),
                                             start_time: None,
                                         },
                                     ),
                                     ScalarExpr::Column(1).call_unary(
                                         UnaryFunc::TumbleWindowCeiling {
-                                            window_size: Interval::from_month_day_nano(
+                                            window_size: Duration::from_nanos(3_600_000_000_000),
-                                                0,
-                                                0,
-                                                3_600_000_000_000,
-                                            ),
                                             start_time: None,
                                         },
                                     ),
@@ -948,7 +937,10 @@ mod test {
                             .with_types(
                                 RelationType::new(vec![
                                     ColumnType::new(ConcreteDataType::uint32_datatype(), false),
-                                    ColumnType::new(ConcreteDataType::datetime_datatype(), false),
+                                    ColumnType::new(
+                                        ConcreteDataType::timestamp_millisecond_datatype(),
+                                        false,
+                                    ),
                                 ])
                                 .into_named(vec![
                                     Some("number".to_string()),
@@ -963,22 +955,18 @@ mod test {
                                 .map(vec![
                                     ScalarExpr::Column(1).call_unary(
                                         UnaryFunc::TumbleWindowFloor {
-                                            window_size: Interval::from_month_day_nano(
+                                            window_size: Duration::from_nanos(3_600_000_000_000),
-                                                0,
+                                            start_time: Some(Timestamp::new_millisecond(
-                                                0,
+                                                1625097600000,
-                                                3_600_000_000_000,
+                                            )),
-                                            ),
-                                            start_time: Some(DateTime::new(1625097600000)),
                                         },
                                     ),
                                     ScalarExpr::Column(1).call_unary(
                                         UnaryFunc::TumbleWindowCeiling {
-                                            window_size: Interval::from_month_day_nano(
+                                            window_size: Duration::from_nanos(3_600_000_000_000),
-                                                0,
+                                            start_time: Some(Timestamp::new_millisecond(
-                                                0,
+                                                1625097600000,
-                                                3_600_000_000_000,
+                                            )),
-                                            ),
-                                            start_time: Some(DateTime::new(1625097600000)),
                                         },
                                     ),
                                 ])
@@ -1512,7 +1500,7 @@ mod test {
                             .with_types(
                                 RelationType::new(vec![
                                     ColumnType::new(ConcreteDataType::uint32_datatype(), false),
-                                    ColumnType::new(ConcreteDataType::datetime_datatype(), false),
+                                    ColumnType::new(ConcreteDataType::timestamp_millisecond_datatype(), false),
                                 ])
                                 .into_named(vec![
                                     Some("number".to_string()),
@@ -1536,7 +1524,7 @@ mod test {
                                                 true,
                                             ),ColumnType::new(
                                                 ConcreteDataType::timestamp_millisecond_datatype(),
-                                                true,
+                                                false,
                                             )])
                                             .into_unnamed(),
                                             extensions: FunctionExtensions {
@@ -1554,10 +1542,10 @@ mod test {
                                     .unwrap(),
                                     exprs: vec![
                                         ScalarExpr::Literal(
-                                            Value::Interval(Interval::from_month_day_nano(0, 0, 30000000000)),
+                                            Value::IntervalMonthDayNano(IntervalMonthDayNano::new(0, 0, 30000000000)),
                                             CDT::interval_month_day_nano_datatype()
                                         ),
-                                        ScalarExpr::Column(1).cast(CDT::timestamp_millisecond_datatype())
+                                        ScalarExpr::Column(1)
                                         ],
                                 }])
                                 .unwrap()

src/flow/src/transform/literal.rs

@@ -178,14 +178,14 @@ pub(crate) fn from_substrait_literal(lit: &Literal) -> Result<(Value, CDT), Erro
             let (days, seconds, microseconds) =
                 (interval.days, interval.seconds, interval.microseconds);
             let millis = microseconds / 1000 + seconds * 1000;
-            let value_interval = common_time::Interval::from_day_time(days, millis);
+            let value_interval = common_time::IntervalDayTime::new(days, millis);
             (
-                Value::Interval(value_interval),
+                Value::IntervalDayTime(value_interval),
                 CDT::interval_day_time_datatype(),
             )
         }
         Some(LiteralType::IntervalYearToMonth(interval)) => (
-            Value::Interval(common_time::Interval::from_year_month(
+            Value::IntervalYearMonth(common_time::IntervalYearMonth::new(
                 interval.years * 12 + interval.months,
             )),
             CDT::interval_year_month_datatype(),
@@ -239,9 +239,9 @@ fn from_substrait_user_defined_type(user_defined: &UserDefined) -> Result<(Value
                     }
                 );
                 let i: i32 = from_bytes(&val.value)?;
-                let value_interval = common_time::Interval::from_year_month(i);
+                let value_interval = common_time::IntervalYearMonth::new(i);
                 (
-                    Value::Interval(value_interval),
+                    Value::IntervalYearMonth(value_interval),
                     CDT::interval_year_month_datatype(),
                 )
             }
@@ -255,12 +255,12 @@ fn from_substrait_user_defined_type(user_defined: &UserDefined) -> Result<(Value
                         )
                     }
                 );
+                // TODO(yingwen): Datafusion may change the representation of the interval type.
                 let i: i128 = from_bytes(&val.value)?;
                 let (months, days, nsecs) = ((i >> 96) as i32, (i >> 64) as i32, i as i64);
-                let value_interval =
+                let value_interval = common_time::IntervalMonthDayNano::new(months, days, nsecs);
-                    common_time::Interval::from_month_day_nano(months, days, nsecs);
                 (
-                    Value::Interval(value_interval),
+                    Value::IntervalMonthDayNano(value_interval),
                     CDT::interval_month_day_nano_datatype(),
                 )
             }
@@ -274,11 +274,12 @@ fn from_substrait_user_defined_type(user_defined: &UserDefined) -> Result<(Value
                         )
                     }
                 );
+                // TODO(yingwen): Datafusion may change the representation of the interval type.
                 let i: i64 = from_bytes(&val.value)?;
                 let (days, millis) = ((i >> 32) as i32, i as i32);
-                let value_interval = common_time::Interval::from_day_time(days, millis);
+                let value_interval = common_time::IntervalDayTime::new(days, millis);
                 (
-                    Value::Interval(value_interval),
+                    Value::IntervalDayTime(value_interval),
                     CDT::interval_day_time_datatype(),
                 )
             }

src/meta-client/examples/lock.rs

@@ -1,129 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::sync::Arc;
-use std::time::Duration;
-
-use api::v1::meta::Role;
-use common_grpc::channel_manager::{ChannelConfig, ChannelManager};
-use common_meta::rpc::lock::{LockRequest, UnlockRequest};
-use meta_client::client::MetaClientBuilder;
-use meta_client::MetaClientRef;
-use tracing::{info, subscriber};
-use tracing_subscriber::FmtSubscriber;
-
-fn main() {
-    subscriber::set_global_default(FmtSubscriber::builder().finish()).unwrap();
-    run();
-}
-
-#[tokio::main]
-async fn run() {
-    let id = (1000u64, 2000u64);
-    let config = ChannelConfig::new()
-        .timeout(Duration::from_secs(30))
-        .connect_timeout(Duration::from_secs(5))
-        .tcp_nodelay(true);
-    let channel_manager = ChannelManager::with_config(config);
-    let mut meta_client = MetaClientBuilder::new(id.0, id.1, Role::Datanode)
-        .enable_lock()
-        .channel_manager(channel_manager)
-        .build();
-    meta_client.start(&["127.0.0.1:3002"]).await.unwrap();
-    let meta_client = Arc::new(meta_client);
-
-    run_normal(meta_client.clone()).await;
-
-    run_multi_thread(meta_client.clone()).await;
-
-    run_multi_thread_with_one_timeout(meta_client).await;
-}
-
-async fn run_normal(meta_client: MetaClientRef) {
-    let name = "lock_name".as_bytes().to_vec();
-    let expire_secs = 60;
-
-    let lock_req = LockRequest { name, expire_secs };
-
-    let lock_result = meta_client.lock(lock_req).await.unwrap();
-    let key = lock_result.key;
-    info!(
-        "lock success! Returned key: {}",
-        String::from_utf8(key.clone()).unwrap()
-    );
-
-    // It is recommended that time of holding lock is less than the timeout of the grpc channel
-    info!("do some work, take 3 seconds");
-    tokio::time::sleep(Duration::from_secs(3)).await;
-
-    let unlock_req = UnlockRequest { key };
-
-    meta_client.unlock(unlock_req).await.unwrap();
-    info!("unlock success!");
-}
-
-async fn run_multi_thread(meta_client: MetaClientRef) {
-    let meta_client_clone = meta_client.clone();
-    let join1 = tokio::spawn(async move {
-        run_normal(meta_client_clone.clone()).await;
-    });
-
-    tokio::time::sleep(Duration::from_secs(1)).await;
-
-    let join2 = tokio::spawn(async move {
-        run_normal(meta_client).await;
-    });
-
-    join1.await.unwrap();
-    join2.await.unwrap();
-}
-
-async fn run_multi_thread_with_one_timeout(meta_client: MetaClientRef) {
-    let meta_client_clone = meta_client.clone();
-    let join1 = tokio::spawn(async move {
-        run_with_timeout(meta_client_clone.clone()).await;
-    });
-
-    tokio::time::sleep(Duration::from_secs(1)).await;
-
-    let join2 = tokio::spawn(async move {
-        run_normal(meta_client).await;
-    });
-
-    join1.await.unwrap();
-    join2.await.unwrap();
-}
-
-async fn run_with_timeout(meta_client: MetaClientRef) {
-    let name = "lock_name".as_bytes().to_vec();
-    let expire_secs = 5;
-
-    let lock_req = LockRequest { name, expire_secs };
-
-    let lock_result = meta_client.lock(lock_req).await.unwrap();
-    let key = lock_result.key;
-    info!(
-        "lock success! Returned key: {}",
-        String::from_utf8(key.clone()).unwrap()
-    );
-
-    // It is recommended that time of holding lock is less than the timeout of the grpc channel
-    info!("do some work, take 20 seconds");
-    tokio::time::sleep(Duration::from_secs(20)).await;
-
-    let unlock_req = UnlockRequest { key };
-
-    meta_client.unlock(unlock_req).await.unwrap();
-    info!("unlock success!");
-}

src/meta-client/src/client.rs

@@ -15,7 +15,6 @@
 mod ask_leader;
 mod heartbeat;
 mod load_balance;
-mod lock;
 mod procedure;
 
 mod cluster;
@@ -33,7 +32,6 @@ use common_meta::datanode::{DatanodeStatKey, DatanodeStatValue, RegionStat};
 use common_meta::ddl::{ExecutorContext, ProcedureExecutor};
 use common_meta::error::{self as meta_error, Result as MetaResult};
 use common_meta::rpc::ddl::{SubmitDdlTaskRequest, SubmitDdlTaskResponse};
-use common_meta::rpc::lock::{LockRequest, LockResponse, UnlockRequest};
 use common_meta::rpc::procedure::{
     MigrateRegionRequest, MigrateRegionResponse, ProcedureStateResponse,
 };
@@ -45,7 +43,6 @@ use common_meta::rpc::store::{
 use common_meta::ClusterId;
 use common_telemetry::info;
 use heartbeat::Client as HeartbeatClient;
-use lock::Client as LockClient;
 use procedure::Client as ProcedureClient;
 use snafu::{OptionExt, ResultExt};
 use store::Client as StoreClient;
@@ -67,7 +64,6 @@ pub struct MetaClientBuilder {
     role: Role,
     enable_heartbeat: bool,
     enable_store: bool,
-    enable_lock: bool,
     enable_procedure: bool,
     enable_access_cluster_info: bool,
     channel_manager: Option<ChannelManager>,
@@ -123,13 +119,6 @@ impl MetaClientBuilder {
         }
     }
 
-    pub fn enable_lock(self) -> Self {
-        Self {
-            enable_lock: true,
-            ..self
-        }
-    }
-
     pub fn enable_procedure(self) -> Self {
         Self {
             enable_procedure: true,
@@ -188,10 +177,6 @@ impl MetaClientBuilder {
             client.store = Some(StoreClient::new(self.id, self.role, mgr.clone()));
         }
 
-        if self.enable_lock {
-            client.lock = Some(LockClient::new(self.id, self.role, mgr.clone()));
-        }
-
         if self.enable_procedure {
             let mgr = self.ddl_channel_manager.unwrap_or(mgr.clone());
             client.procedure = Some(ProcedureClient::new(
@@ -221,7 +206,6 @@ pub struct MetaClient {
     channel_manager: ChannelManager,
     heartbeat: Option<HeartbeatClient>,
     store: Option<StoreClient>,
-    lock: Option<LockClient>,
     procedure: Option<ProcedureClient>,
     cluster: Option<ClusterClient>,
 }
@@ -383,10 +367,6 @@ impl MetaClient {
             client.start(urls.clone()).await?;
             info!("Store client started");
         }
-        if let Some(client) = &mut self.lock {
-            client.start(urls.clone()).await?;
-            info!("Lock client started");
-        }
         if let Some(client) = &mut self.procedure {
             client.start(urls.clone()).await?;
             info!("DDL client started");
@@ -482,15 +462,6 @@ impl MetaClient {
             .context(ConvertMetaResponseSnafu)
     }
 
-    pub async fn lock(&self, req: LockRequest) -> Result<LockResponse> {
-        self.lock_client()?.lock(req.into()).await.map(Into::into)
-    }
-
-    pub async fn unlock(&self, req: UnlockRequest) -> Result<()> {
-        let _ = self.lock_client()?.unlock(req.into()).await?;
-        Ok(())
-    }
-
     /// Query the procedure state by its id.
     pub async fn query_procedure_state(&self, pid: &str) -> Result<ProcedureStateResponse> {
         self.procedure_client()?.query_procedure_state(pid).await
@@ -538,12 +509,6 @@ impl MetaClient {
         })
     }
 
-    pub fn lock_client(&self) -> Result<LockClient> {
-        self.lock.clone().context(NotStartedSnafu {
-            name: "lock_client",
-        })
-    }
-
     pub fn procedure_client(&self) -> Result<ProcedureClient> {
         self.procedure.clone().context(NotStartedSnafu {
             name: "procedure_client",

src/meta-client/src/client/lock.rs

@@ -1,178 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::collections::HashSet;
-use std::sync::Arc;
-
-use api::v1::meta::lock_client::LockClient;
-use api::v1::meta::{LockRequest, LockResponse, Role, UnlockRequest, UnlockResponse};
-use common_grpc::channel_manager::ChannelManager;
-use common_telemetry::tracing_context::TracingContext;
-use snafu::{ensure, OptionExt, ResultExt};
-use tokio::sync::RwLock;
-use tonic::transport::Channel;
-
-use crate::client::{load_balance, Id};
-use crate::error;
-use crate::error::Result;
-
-#[derive(Clone, Debug)]
-pub struct Client {
-    inner: Arc<RwLock<Inner>>,
-}
-
-impl Client {
-    pub fn new(id: Id, role: Role, channel_manager: ChannelManager) -> Self {
-        let inner = Arc::new(RwLock::new(Inner {
-            id,
-            role,
-            channel_manager,
-            peers: vec![],
-        }));
-
-        Self { inner }
-    }
-
-    pub async fn start<U, A>(&mut self, urls: A) -> Result<()>
-    where
-        U: AsRef<str>,
-        A: AsRef<[U]>,
-    {
-        let mut inner = self.inner.write().await;
-        inner.start(urls).await
-    }
-
-    pub async fn lock(&self, req: LockRequest) -> Result<LockResponse> {
-        let inner = self.inner.read().await;
-        inner.lock(req).await
-    }
-
-    pub async fn unlock(&self, req: UnlockRequest) -> Result<UnlockResponse> {
-        let inner = self.inner.read().await;
-        inner.unlock(req).await
-    }
-}
-
-#[derive(Debug)]
-struct Inner {
-    id: Id,
-    role: Role,
-    channel_manager: ChannelManager,
-    peers: Vec<String>,
-}
-
-impl Inner {
-    async fn start<U, A>(&mut self, urls: A) -> Result<()>
-    where
-        U: AsRef<str>,
-        A: AsRef<[U]>,
-    {
-        ensure!(
-            !self.is_started(),
-            error::IllegalGrpcClientStateSnafu {
-                err_msg: "Lock client already started",
-            }
-        );
-
-        self.peers = urls
-            .as_ref()
-            .iter()
-            .map(|url| url.as_ref().to_string())
-            .collect::<HashSet<_>>()
-            .drain()
-            .collect::<Vec<_>>();
-
-        Ok(())
-    }
-
-    fn random_client(&self) -> Result<LockClient<Channel>> {
-        let len = self.peers.len();
-        let peer = load_balance::random_get(len, |i| Some(&self.peers[i])).context(
-            error::IllegalGrpcClientStateSnafu {
-                err_msg: "Empty peers, lock client may not start yet",
-            },
-        )?;
-
-        self.make_client(peer)
-    }
-
-    fn make_client(&self, addr: impl AsRef<str>) -> Result<LockClient<Channel>> {
-        let channel = self
-            .channel_manager
-            .get(addr)
-            .context(error::CreateChannelSnafu)?;
-
-        Ok(LockClient::new(channel))
-    }
-
-    #[inline]
-    fn is_started(&self) -> bool {
-        !self.peers.is_empty()
-    }
-
-    async fn lock(&self, mut req: LockRequest) -> Result<LockResponse> {
-        let mut client = self.random_client()?;
-        req.set_header(
-            self.id,
-            self.role,
-            TracingContext::from_current_span().to_w3c(),
-        );
-        let res = client.lock(req).await.map_err(error::Error::from)?;
-
-        Ok(res.into_inner())
-    }
-
-    async fn unlock(&self, mut req: UnlockRequest) -> Result<UnlockResponse> {
-        let mut client = self.random_client()?;
-        req.set_header(
-            self.id,
-            self.role,
-            TracingContext::from_current_span().to_w3c(),
-        );
-        let res = client.unlock(req).await.map_err(error::Error::from)?;
-
-        Ok(res.into_inner())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[tokio::test]
-    async fn test_already_start() {
-        let mut client = Client::new((0, 0), Role::Datanode, ChannelManager::default());
-        client
-            .start(&["127.0.0.1:1000", "127.0.0.1:1001"])
-            .await
-            .unwrap();
-        let res = client.start(&["127.0.0.1:1002"]).await;
-        assert!(res.is_err());
-        assert!(matches!(
-            res.err(),
-            Some(error::Error::IllegalGrpcClientState { .. })
-        ));
-    }
-
-    #[tokio::test]
-    async fn test_start_with_duplicate_peers() {
-        let mut client = Client::new((0, 0), Role::Datanode, ChannelManager::default());
-        client
-            .start(&["127.0.0.1:1000", "127.0.0.1:1000", "127.0.0.1:1000"])
-            .await
-            .unwrap();
-
-        assert_eq!(1, client.inner.write().await.peers.len());
-    }
-}

src/meta-srv/src/bootstrap.rs

@@ -16,7 +16,6 @@ use std::sync::Arc;
 
 use api::v1::meta::cluster_server::ClusterServer;
 use api::v1::meta::heartbeat_server::HeartbeatServer;
-use api::v1::meta::lock_server::LockServer;
 use api::v1::meta::procedure_service_server::ProcedureServiceServer;
 use api::v1::meta::store_server::StoreServer;
 use common_base::Plugins;
@@ -48,8 +47,6 @@ use crate::election::etcd::EtcdElection;
 #[cfg(feature = "pg_kvbackend")]
 use crate::error::InvalidArgumentsSnafu;
 use crate::error::{InitExportMetricsTaskSnafu, TomlFormatSnafu};
-use crate::lock::etcd::EtcdLock;
-use crate::lock::memory::MemLock;
 use crate::metasrv::builder::MetasrvBuilder;
 use crate::metasrv::{BackendImpl, Metasrv, MetasrvOptions, SelectorRef};
 use crate::selector::lease_based::LeaseBasedSelector;
@@ -151,6 +148,10 @@ impl MetasrvInstance {
     pub fn plugins(&self) -> Plugins {
         self.plugins.clone()
     }
+
+    pub fn get_inner(&self) -> &Metasrv {
+        &self.metasrv
+    }
 }
 
 pub async fn bootstrap_metasrv_with_router(
@@ -183,7 +184,6 @@ pub fn router(metasrv: Metasrv) -> Router {
         .add_service(HeartbeatServer::new(metasrv.clone()))
         .add_service(StoreServer::new(metasrv.clone()))
         .add_service(ClusterServer::new(metasrv.clone()))
-        .add_service(LockServer::new(metasrv.clone()))
         .add_service(ProcedureServiceServer::new(metasrv.clone()))
         .add_service(admin::make_admin_service(metasrv))
 }
@@ -193,13 +193,9 @@ pub async fn metasrv_builder(
     plugins: Plugins,
     kv_backend: Option<KvBackendRef>,
 ) -> Result<MetasrvBuilder> {
-    let (kv_backend, election, lock) = match (kv_backend, &opts.backend) {
+    let (kv_backend, election) = match (kv_backend, &opts.backend) {
-        (Some(kv_backend), _) => (kv_backend, None, Some(Arc::new(MemLock::default()) as _)),
+        (Some(kv_backend), _) => (kv_backend, None),
-        (None, BackendImpl::MemoryStore) => (
+        (None, BackendImpl::MemoryStore) => (Arc::new(MemoryKvBackend::new()) as _, None),
-            Arc::new(MemoryKvBackend::new()) as _,
-            None,
-            Some(Arc::new(MemLock::default()) as _),
-        ),
         (None, BackendImpl::EtcdStore) => {
             let etcd_client = create_etcd_client(opts).await?;
             let kv_backend = {
@@ -224,18 +220,13 @@ pub async fn metasrv_builder(
                     )
                     .await?,
                 ),
-                Some(EtcdLock::with_etcd_client(
-                    etcd_client,
-                    opts.store_key_prefix.clone(),
-                )?),
             )
         }
         #[cfg(feature = "pg_kvbackend")]
         (None, BackendImpl::PostgresStore) => {
             let pg_client = create_postgres_client(opts).await?;
             let kv_backend = PgStore::with_pg_client(pg_client).await.unwrap();
-            // TODO: implement locking and leader election for pg backend.
+            (kv_backend, None)
-            (kv_backend, None, None)
         }
     };
 
@@ -253,7 +244,6 @@ pub async fn metasrv_builder(
         .in_memory(in_memory)
         .selector(selector)
         .election(election)
-        .lock(lock)
         .plugins(plugins))
 }
 

src/meta-srv/src/error.rs

@@ -448,30 +448,6 @@ pub enum Error {
         location: Location,
     },
 
-    #[snafu(display("Failed to lock based on etcd"))]
-    Lock {
-        #[snafu(source)]
-        error: etcd_client::Error,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[snafu(display("Failed to unlock based on etcd"))]
-    Unlock {
-        #[snafu(source)]
-        error: etcd_client::Error,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[snafu(display("Failed to grant lease"))]
-    LeaseGrant {
-        #[snafu(source)]
-        error: etcd_client::Error,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
     #[snafu(display("Invalid utf-8 value"))]
     InvalidUtf8Value {
         #[snafu(source)]
@@ -770,9 +746,6 @@ impl ErrorExt for Error {
             | Error::ResponseHeaderNotFound { .. }
             | Error::IsNotLeader { .. }
             | Error::InvalidHttpBody { .. }
-            | Error::Lock { .. }
-            | Error::Unlock { .. }
-            | Error::LeaseGrant { .. }
             | Error::ExceededRetryLimit { .. }
             | Error::SendShutdownSignal { .. }
             | Error::PusherNotFound { .. }

src/meta-srv/src/handler.rs

@@ -14,7 +14,7 @@
 
 use std::collections::{BTreeMap, HashSet};
 use std::ops::Range;
-use std::sync::Arc;
+use std::sync::{Arc, Mutex};
 use std::time::{Duration, Instant};
 
 use api::v1::meta::mailbox_message::Payload;
@@ -209,15 +209,16 @@ impl Pushers {
     }
 }
 
-struct NameCachedHandler {
+#[derive(Clone)]
+pub struct NameCachedHandler {
     name: &'static str,
-    handler: Box<dyn HeartbeatHandler>,
+    handler: Arc<dyn HeartbeatHandler>,
 }
 
 impl NameCachedHandler {
     fn new(handler: impl HeartbeatHandler + 'static) -> Self {
         let name = handler.name();
-        let handler = Box::new(handler);
+        let handler = Arc::new(handler);
         Self { name, handler }
     }
 }
@@ -225,7 +226,7 @@ impl NameCachedHandler {
 pub type HeartbeatHandlerGroupRef = Arc<HeartbeatHandlerGroup>;
 
 /// The group of heartbeat handlers.
-#[derive(Default)]
+#[derive(Default, Clone)]
 pub struct HeartbeatHandlerGroup {
     handlers: Vec<NameCachedHandler>,
     pushers: Pushers,
@@ -442,6 +443,7 @@ impl Mailbox for HeartbeatMailbox {
 }
 
 /// The builder to build the group of heartbeat handlers.
+#[derive(Clone)]
 pub struct HeartbeatHandlerGroupBuilder {
     /// The handler to handle region failure.
     region_failure_handler: Option<RegionFailureHandler>,
@@ -540,20 +542,32 @@ impl HeartbeatHandlerGroupBuilder {
         }
 
         Ok(HeartbeatHandlerGroup {
-            handlers: self.handlers.into_iter().collect(),
+            handlers: self.handlers,
             pushers: self.pushers,
         })
     }
 
+    fn add_handler_after_inner(&mut self, target: &str, handler: NameCachedHandler) -> Result<()> {
+        if let Some(pos) = self.handlers.iter().position(|x| x.name == target) {
+            self.handlers.insert(pos + 1, handler);
+            return Ok(());
+        }
+
+        error::HandlerNotFoundSnafu { name: target }.fail()
+    }
+
     /// Adds the handler after the specified handler.
     pub fn add_handler_after(
         &mut self,
         target: &'static str,
         handler: impl HeartbeatHandler + 'static,
     ) -> Result<()> {
+        self.add_handler_after_inner(target, NameCachedHandler::new(handler))
+    }
+
+    fn add_handler_before_inner(&mut self, target: &str, handler: NameCachedHandler) -> Result<()> {
         if let Some(pos) = self.handlers.iter().position(|x| x.name == target) {
-            self.handlers
+            self.handlers.insert(pos, handler);
-                .insert(pos + 1, NameCachedHandler::new(handler));
             return Ok(());
         }
 
@@ -566,8 +580,12 @@ impl HeartbeatHandlerGroupBuilder {
         target: &'static str,
         handler: impl HeartbeatHandler + 'static,
     ) -> Result<()> {
+        self.add_handler_before_inner(target, NameCachedHandler::new(handler))
+    }
+
+    fn replace_handler_inner(&mut self, target: &str, handler: NameCachedHandler) -> Result<()> {
         if let Some(pos) = self.handlers.iter().position(|x| x.name == target) {
-            self.handlers.insert(pos, NameCachedHandler::new(handler));
+            self.handlers[pos] = handler;
             return Ok(());
         }
 
@@ -580,25 +598,115 @@ impl HeartbeatHandlerGroupBuilder {
         target: &'static str,
         handler: impl HeartbeatHandler + 'static,
     ) -> Result<()> {
-        if let Some(pos) = self.handlers.iter().position(|x| x.name == target) {
+        self.replace_handler_inner(target, NameCachedHandler::new(handler))
-            self.handlers[pos] = NameCachedHandler::new(handler);
+    }
-            return Ok(());
-        }
 
-        error::HandlerNotFoundSnafu { name: target }.fail()
+    fn add_handler_last_inner(&mut self, handler: NameCachedHandler) {
+        self.handlers.push(handler);
     }
 
     fn add_handler_last(&mut self, handler: impl HeartbeatHandler + 'static) {
-        self.handlers.push(NameCachedHandler::new(handler));
+        self.add_handler_last_inner(NameCachedHandler::new(handler));
     }
 }
 
 pub type HeartbeatHandlerGroupBuilderCustomizerRef =
     Arc<dyn HeartbeatHandlerGroupBuilderCustomizer>;
 
+pub enum CustomizeHeartbeatGroupAction {
+    AddHandlerAfter {
+        target: String,
+        handler: NameCachedHandler,
+    },
+    AddHandlerBefore {
+        target: String,
+        handler: NameCachedHandler,
+    },
+    ReplaceHandler {
+        target: String,
+        handler: NameCachedHandler,
+    },
+    AddHandlerLast {
+        handler: NameCachedHandler,
+    },
+}
+
+impl CustomizeHeartbeatGroupAction {
+    pub fn new_add_handler_after(
+        target: &'static str,
+        handler: impl HeartbeatHandler + 'static,
+    ) -> Self {
+        Self::AddHandlerAfter {
+            target: target.to_string(),
+            handler: NameCachedHandler::new(handler),
+        }
+    }
+
+    pub fn new_add_handler_before(
+        target: &'static str,
+        handler: impl HeartbeatHandler + 'static,
+    ) -> Self {
+        Self::AddHandlerBefore {
+            target: target.to_string(),
+            handler: NameCachedHandler::new(handler),
+        }
+    }
+
+    pub fn new_replace_handler(
+        target: &'static str,
+        handler: impl HeartbeatHandler + 'static,
+    ) -> Self {
+        Self::ReplaceHandler {
+            target: target.to_string(),
+            handler: NameCachedHandler::new(handler),
+        }
+    }
+
+    pub fn new_add_handler_last(handler: impl HeartbeatHandler + 'static) -> Self {
+        Self::AddHandlerLast {
+            handler: NameCachedHandler::new(handler),
+        }
+    }
+}
+
 /// The customizer of the [`HeartbeatHandlerGroupBuilder`].
 pub trait HeartbeatHandlerGroupBuilderCustomizer: Send + Sync {
     fn customize(&self, builder: &mut HeartbeatHandlerGroupBuilder) -> Result<()>;
+
+    fn add_action(&self, action: CustomizeHeartbeatGroupAction);
+}
+
+#[derive(Default)]
+pub struct DefaultHeartbeatHandlerGroupBuilderCustomizer {
+    actions: Mutex<Vec<CustomizeHeartbeatGroupAction>>,
+}
+
+impl HeartbeatHandlerGroupBuilderCustomizer for DefaultHeartbeatHandlerGroupBuilderCustomizer {
+    fn customize(&self, builder: &mut HeartbeatHandlerGroupBuilder) -> Result<()> {
+        info!("Customizing the heartbeat handler group builder");
+        let mut actions = self.actions.lock().unwrap();
+        for action in actions.drain(..) {
+            match action {
+                CustomizeHeartbeatGroupAction::AddHandlerAfter { target, handler } => {
+                    builder.add_handler_after_inner(&target, handler)?;
+                }
+                CustomizeHeartbeatGroupAction::AddHandlerBefore { target, handler } => {
+                    builder.add_handler_before_inner(&target, handler)?;
+                }
+                CustomizeHeartbeatGroupAction::ReplaceHandler { target, handler } => {
+                    builder.replace_handler_inner(&target, handler)?;
+                }
+                CustomizeHeartbeatGroupAction::AddHandlerLast { handler } => {
+                    builder.add_handler_last_inner(handler);
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn add_action(&self, action: CustomizeHeartbeatGroupAction) {
+        self.actions.lock().unwrap().push(action);
+    }
 }
 
 #[cfg(test)]

src/meta-srv/src/handler/failure_handler.rs

@@ -21,6 +21,7 @@ use crate::handler::{HandleControl, HeartbeatAccumulator, HeartbeatHandler};
 use crate::metasrv::Context;
 use crate::region::supervisor::{DatanodeHeartbeat, HeartbeatAcceptor, RegionSupervisor};
 
+#[derive(Clone)]
 pub struct RegionFailureHandler {
     heartbeat_acceptor: HeartbeatAcceptor,
 }

src/meta-srv/src/handler/filter_inactive_region_stats.rs

@@ -20,6 +20,8 @@ use crate::error::Result;
 use crate::handler::{HandleControl, HeartbeatAccumulator, HeartbeatHandler};
 use crate::metasrv::Context;
 
+pub const NAME: &str = "FilterInactiveRegionStatsHandler";
+
 pub struct FilterInactiveRegionStatsHandler;
 
 #[async_trait]

src/meta-srv/src/handler/region_lease_handler.rs

@@ -26,6 +26,7 @@ use crate::metasrv::Context;
 use crate::region::lease_keeper::{RegionLeaseKeeperRef, RenewRegionLeasesResponse};
 use crate::region::RegionLeaseKeeper;
 
+#[derive(Clone)]
 pub struct RegionLeaseHandler {
     region_lease_seconds: u64,
     region_lease_keeper: RegionLeaseKeeperRef,

src/meta-srv/src/lib.rs

@@ -28,7 +28,6 @@ pub mod flow_meta_alloc;
 pub mod handler;
 pub mod key;
 pub mod lease;
-pub mod lock;
 pub mod metasrv;
 mod metrics;
 #[cfg(feature = "mock")]

src/meta-srv/src/lock.rs

@@ -1,99 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-pub mod etcd;
-pub(crate) mod memory;
-
-use std::sync::Arc;
-
-use common_telemetry::error;
-
-use crate::error::Result;
-
-pub type Key = Vec<u8>;
-
-pub const DEFAULT_EXPIRE_TIME_SECS: u64 = 10;
-
-pub struct Opts {
-    // If the expiration time is exceeded and currently holds the lock, the lock is
-    // automatically released.
-    pub expire_secs: Option<u64>,
-}
-
-impl Default for Opts {
-    fn default() -> Self {
-        Opts {
-            expire_secs: Some(DEFAULT_EXPIRE_TIME_SECS),
-        }
-    }
-}
-
-#[async_trait::async_trait]
-pub trait DistLock: Send + Sync {
-    // Lock acquires a distributed shared lock on a given named lock. On success, it
-    // will return a unique key that exists so long as the lock is held by the caller.
-    async fn lock(&self, name: Vec<u8>, opts: Opts) -> Result<Key>;
-
-    // Unlock takes a key returned by Lock and releases the hold on lock.
-    async fn unlock(&self, key: Vec<u8>) -> Result<()>;
-}
-
-pub type DistLockRef = Arc<dyn DistLock>;
-
-pub struct DistLockGuard<'a> {
-    lock: &'a DistLockRef,
-    name: Vec<u8>,
-    key: Option<Key>,
-}
-
-impl<'a> DistLockGuard<'a> {
-    pub fn new(lock: &'a DistLockRef, name: Vec<u8>) -> Self {
-        Self {
-            lock,
-            name,
-            key: None,
-        }
-    }
-
-    pub async fn lock(&mut self) -> Result<()> {
-        if self.key.is_some() {
-            return Ok(());
-        }
-        let key = self
-            .lock
-            .lock(
-                self.name.clone(),
-                Opts {
-                    expire_secs: Some(2),
-                },
-            )
-            .await?;
-        self.key = Some(key);
-        Ok(())
-    }
-}
-
-impl Drop for DistLockGuard<'_> {
-    fn drop(&mut self) {
-        if let Some(key) = self.key.take() {
-            let lock = self.lock.clone();
-            let name = self.name.clone();
-            let _handle = common_runtime::spawn_global(async move {
-                if let Err(e) = lock.unlock(key).await {
-                    error!(e; "Failed to unlock '{}'", String::from_utf8_lossy(&name));
-                }
-            });
-        }
-    }
-}

src/meta-srv/src/lock/etcd.rs

@@ -1,93 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::sync::Arc;
-
-use etcd_client::{Client, LockOptions};
-use snafu::ResultExt;
-
-use super::{DistLock, DistLockRef, Opts, DEFAULT_EXPIRE_TIME_SECS};
-use crate::error;
-use crate::error::Result;
-
-/// A implementation of distributed lock based on etcd. The Clone of EtcdLock is cheap.
-#[derive(Clone)]
-pub struct EtcdLock {
-    client: Client,
-    store_key_prefix: String,
-}
-
-impl EtcdLock {
-    pub async fn with_endpoints<E, S>(endpoints: S, store_key_prefix: String) -> Result<DistLockRef>
-    where
-        E: AsRef<str>,
-        S: AsRef<[E]>,
-    {
-        let client = Client::connect(endpoints, None)
-            .await
-            .context(error::ConnectEtcdSnafu)?;
-
-        Self::with_etcd_client(client, store_key_prefix)
-    }
-
-    pub fn with_etcd_client(client: Client, store_key_prefix: String) -> Result<DistLockRef> {
-        Ok(Arc::new(EtcdLock {
-            client,
-            store_key_prefix,
-        }))
-    }
-
-    fn lock_key(&self, key: Vec<u8>) -> Vec<u8> {
-        if self.store_key_prefix.is_empty() {
-            key
-        } else {
-            let mut prefix = self.store_key_prefix.as_bytes().to_vec();
-            prefix.extend_from_slice(&key);
-            prefix
-        }
-    }
-}
-
-#[async_trait::async_trait]
-impl DistLock for EtcdLock {
-    async fn lock(&self, key: Vec<u8>, opts: Opts) -> Result<Vec<u8>> {
-        let expire = opts.expire_secs.unwrap_or(DEFAULT_EXPIRE_TIME_SECS) as i64;
-
-        let mut client = self.client.clone();
-
-        let resp = client
-            .lease_grant(expire, None)
-            .await
-            .context(error::LeaseGrantSnafu)?;
-
-        let lease_id = resp.id();
-        let lock_opts = LockOptions::new().with_lease(lease_id);
-
-        let resp = client
-            .lock(self.lock_key(key), Some(lock_opts))
-            .await
-            .context(error::LockSnafu)?;
-
-        Ok(resp.key().to_vec())
-    }
-
-    async fn unlock(&self, key: Vec<u8>) -> Result<()> {
-        let mut client = self.client.clone();
-        let _ = client
-            .unlock(self.lock_key(key))
-            .await
-            .context(error::UnlockSnafu)?;
-        Ok(())
-    }
-}

src/meta-srv/src/lock/memory.rs

@@ -1,112 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::sync::Arc;
-
-use async_trait::async_trait;
-use dashmap::DashMap;
-use tokio::sync::{Mutex, OwnedMutexGuard};
-
-use crate::error::Result;
-use crate::lock::{DistLock, Key, Opts};
-
-#[derive(Default)]
-pub(crate) struct MemLock {
-    mutexes: DashMap<Key, Arc<Mutex<()>>>,
-    guards: DashMap<Key, OwnedMutexGuard<()>>,
-}
-
-#[async_trait]
-impl DistLock for MemLock {
-    async fn lock(&self, key: Vec<u8>, _opts: Opts) -> Result<Key> {
-        let mutex = self
-            .mutexes
-            .entry(key.clone())
-            .or_insert_with(|| Arc::new(Mutex::new(())))
-            .clone();
-
-        let guard = mutex.lock_owned().await;
-
-        let _ = self.guards.insert(key.clone(), guard);
-        Ok(key)
-    }
-
-    async fn unlock(&self, key: Vec<u8>) -> Result<()> {
-        // drop the guard, so that the mutex can be unlocked,
-        // effectively make the `mutex.lock_owned` in `lock` method to proceed
-        let _ = self.guards.remove(&key);
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::HashMap;
-    use std::sync::atomic::{AtomicU32, Ordering};
-
-    use rand::seq::SliceRandom;
-
-    use super::*;
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn test_mem_lock_concurrently() {
-        let lock = Arc::new(MemLock::default());
-
-        let keys = (0..10)
-            .map(|i| format!("my-lock-{i}").into_bytes())
-            .collect::<Vec<Key>>();
-        let counters: [(Key, AtomicU32); 10] = keys
-            .iter()
-            .map(|x| (x.clone(), AtomicU32::new(0)))
-            .collect::<Vec<_>>()
-            .try_into()
-            .unwrap();
-        let counters = Arc::new(HashMap::from(counters));
-
-        let tasks = (0..100)
-            .map(|_| {
-                let mut keys = keys.clone();
-                keys.shuffle(&mut rand::thread_rng());
-
-                let lock_clone = lock.clone();
-                let counters_clone = counters.clone();
-                tokio::spawn(async move {
-                    // every key counter will be added by 1 for 10 times
-                    for i in 0..100 {
-                        let key = &keys[i % keys.len()];
-                        assert!(lock_clone
-                            .lock(key.clone(), Opts { expire_secs: None })
-                            .await
-                            .is_ok());
-
-                        // Intentionally create a critical section:
-                        // if our MemLock is flawed, the resulting counter is wrong.
-                        //
-                        // Note that AtomicU32 is only used to enable the updates from multiple tasks,
-                        // does not make any guarantee about the correctness of the result.
-
-                        let counter = counters_clone.get(key).unwrap();
-                        let v = counter.load(Ordering::Relaxed);
-                        counter.store(v + 1, Ordering::Relaxed);
-
-                        lock_clone.unlock(key.clone()).await.unwrap();
-                    }
-                })
-            })
-            .collect::<Vec<_>>();
-        let _ = futures::future::join_all(tasks).await;
-
-        assert!(counters.values().all(|x| x.load(Ordering::Relaxed) == 1000));
-    }
-}

src/meta-srv/src/metasrv.rs

@@ -44,20 +44,19 @@ use common_wal::config::MetasrvWalConfig;
 use serde::{Deserialize, Serialize};
 use servers::export_metrics::ExportMetricsOption;
 use servers::http::HttpOptions;
-use snafu::ResultExt;
+use snafu::{OptionExt, ResultExt};
 use table::metadata::TableId;
 use tokio::sync::broadcast::error::RecvError;
 
 use crate::cluster::MetaPeerClientRef;
 use crate::election::{Election, LeaderChangeMessage};
 use crate::error::{
-    InitMetadataSnafu, KvBackendSnafu, Result, StartProcedureManagerSnafu, StartTelemetryTaskSnafu,
+    self, InitMetadataSnafu, KvBackendSnafu, Result, StartProcedureManagerSnafu,
-    StopProcedureManagerSnafu,
+    StartTelemetryTaskSnafu, StopProcedureManagerSnafu,
 };
 use crate::failure_detector::PhiAccrualFailureDetectorOptions;
-use crate::handler::HeartbeatHandlerGroupRef;
+use crate::handler::{HeartbeatHandlerGroupBuilder, HeartbeatHandlerGroupRef};
 use crate::lease::lookup_datanode_peer;
-use crate::lock::DistLockRef;
 use crate::procedure::region_migration::manager::RegionMigrationManagerRef;
 use crate::procedure::ProcedureManagerListenerAdapter;
 use crate::pubsub::{PublisherRef, SubscriptionManagerRef};
@@ -354,9 +353,9 @@ pub struct Metasrv {
     selector: SelectorRef,
     // The flow selector is used to select a target flownode.
     flow_selector: SelectorRef,
-    handler_group: HeartbeatHandlerGroupRef,
+    handler_group: Option<HeartbeatHandlerGroupRef>,
+    handler_group_builder: Option<HeartbeatHandlerGroupBuilder>,
     election: Option<ElectionRef>,
-    lock: DistLockRef,
     procedure_manager: ProcedureManagerRef,
     mailbox: MailboxRef,
     procedure_executor: ProcedureExecutorRef,
@@ -372,7 +371,15 @@ pub struct Metasrv {
 }
 
 impl Metasrv {
-    pub async fn try_start(&self) -> Result<()> {
+    pub async fn try_start(&mut self) -> Result<()> {
+        let builder = self
+            .handler_group_builder
+            .take()
+            .context(error::UnexpectedSnafu {
+                violated: "expected heartbeat handler group builder",
+            })?;
+        self.handler_group = Some(Arc::new(builder.build()?));
+
         if self
             .started
             .compare_exchange(false, true, Ordering::Relaxed, Ordering::Relaxed)
@@ -560,18 +567,18 @@ impl Metasrv {
         &self.flow_selector
     }
 
-    pub fn handler_group(&self) -> &HeartbeatHandlerGroupRef {
+    pub fn handler_group(&self) -> &Option<HeartbeatHandlerGroupRef> {
         &self.handler_group
     }
 
+    pub fn handler_group_builder(&mut self) -> &mut Option<HeartbeatHandlerGroupBuilder> {
+        &mut self.handler_group_builder
+    }
+
     pub fn election(&self) -> Option<&ElectionRef> {
         self.election.as_ref()
     }
 
-    pub fn lock(&self) -> &DistLockRef {
-        &self.lock
-    }
-
     pub fn mailbox(&self) -> &MailboxRef {
         &self.mailbox
     }

src/meta-srv/src/metasrv/builder.rs

@@ -48,12 +48,8 @@ use crate::flow_meta_alloc::FlowPeerAllocator;
 use crate::greptimedb_telemetry::get_greptimedb_telemetry_task;
 use crate::handler::failure_handler::RegionFailureHandler;
 use crate::handler::region_lease_handler::RegionLeaseHandler;
-use crate::handler::{
+use crate::handler::{HeartbeatHandlerGroupBuilder, HeartbeatMailbox, Pushers};
-    HeartbeatHandlerGroup, HeartbeatHandlerGroupBuilder, HeartbeatMailbox, Pushers,
-};
 use crate::lease::MetaPeerLookupService;
-use crate::lock::memory::MemLock;
-use crate::lock::DistLockRef;
 use crate::metasrv::{
     ElectionRef, Metasrv, MetasrvInfo, MetasrvOptions, SelectorContext, SelectorRef, TABLE_ID_SEQ,
 };
@@ -76,10 +72,9 @@ pub struct MetasrvBuilder {
     kv_backend: Option<KvBackendRef>,
     in_memory: Option<ResettableKvBackendRef>,
     selector: Option<SelectorRef>,
-    handler_group: Option<HeartbeatHandlerGroup>,
+    handler_group_builder: Option<HeartbeatHandlerGroupBuilder>,
     election: Option<ElectionRef>,
     meta_peer_client: Option<MetaPeerClientRef>,
-    lock: Option<DistLockRef>,
     node_manager: Option<NodeManagerRef>,
     plugins: Option<Plugins>,
     table_metadata_allocator: Option<TableMetadataAllocatorRef>,
@@ -91,11 +86,10 @@ impl MetasrvBuilder {
             kv_backend: None,
             in_memory: None,
             selector: None,
-            handler_group: None,
+            handler_group_builder: None,
             meta_peer_client: None,
             election: None,
             options: None,
-            lock: None,
             node_manager: None,
             plugins: None,
             table_metadata_allocator: None,
@@ -122,8 +116,11 @@ impl MetasrvBuilder {
         self
     }
 
-    pub fn heartbeat_handler(mut self, handler_group: HeartbeatHandlerGroup) -> Self {
+    pub fn heartbeat_handler(
-        self.handler_group = Some(handler_group);
+        mut self,
+        handler_group_builder: HeartbeatHandlerGroupBuilder,
+    ) -> Self {
+        self.handler_group_builder = Some(handler_group_builder);
         self
     }
 
@@ -137,11 +134,6 @@ impl MetasrvBuilder {
         self
     }
 
-    pub fn lock(mut self, lock: Option<DistLockRef>) -> Self {
-        self.lock = lock;
-        self
-    }
-
     pub fn node_manager(mut self, node_manager: NodeManagerRef) -> Self {
         self.node_manager = Some(node_manager);
         self
@@ -170,8 +162,7 @@ impl MetasrvBuilder {
             kv_backend,
             in_memory,
             selector,
-            handler_group,
+            handler_group_builder,
-            lock,
             node_manager,
             plugins,
             table_metadata_allocator,
@@ -205,7 +196,6 @@ impl MetasrvBuilder {
         let flow_metadata_manager = Arc::new(FlowMetadataManager::new(
             leader_cached_kv_backend.clone() as _,
         ));
-        let lock = lock.unwrap_or_else(|| Arc::new(MemLock::default()));
         let selector_ctx = SelectorContext {
             server_addr: options.server_addr.clone(),
             datanode_lease_secs: distributed_time_constants::DATANODE_LEASE_SECS,
@@ -349,8 +339,8 @@ impl MetasrvBuilder {
             .context(error::InitDdlManagerSnafu)?,
         );
 
-        let handler_group = match handler_group {
+        let handler_group_builder = match handler_group_builder {
-            Some(handler_group) => handler_group,
+            Some(handler_group_builder) => handler_group_builder,
             None => {
                 let region_lease_handler = RegionLeaseHandler::new(
                     distributed_time_constants::REGION_LEASE_SECS,
@@ -363,7 +353,6 @@ impl MetasrvBuilder {
                     .with_region_failure_handler(region_failover_handler)
                     .with_region_lease_handler(Some(region_lease_handler))
                     .add_default_handlers()
-                    .build()?
             }
         };
 
@@ -382,9 +371,9 @@ impl MetasrvBuilder {
             selector,
             // TODO(jeremy): We do not allow configuring the flow selector.
             flow_selector: Arc::new(RoundRobinSelector::new(SelectTarget::Flownode)),
-            handler_group: Arc::new(handler_group),
+            handler_group: None,
+            handler_group_builder: Some(handler_group_builder),
             election,
-            lock,
             procedure_manager,
             mailbox,
             procedure_executor: ddl_manager,

src/meta-srv/src/mocks.rs

@@ -74,7 +74,7 @@ pub async fn mock(
         None => builder,
     };
 
-    let metasrv = builder.build().await.unwrap();
+    let mut metasrv = builder.build().await.unwrap();
     metasrv.try_start().await.unwrap();
 
     let (client, server) = tokio::io::duplex(1024);

src/meta-srv/src/region/supervisor.rs

@@ -258,6 +258,7 @@ impl RegionFailureDetectorController for RegionFailureDetectorControl {
 }
 
 /// [`HeartbeatAcceptor`] forwards heartbeats to [`RegionSupervisor`].
+#[derive(Clone)]
 pub(crate) struct HeartbeatAcceptor {
     sender: Sender<Event>,
 }

src/meta-srv/src/service.rs

@@ -20,7 +20,6 @@ use tonic::{Response, Status};
 pub mod admin;
 pub mod cluster;
 mod heartbeat;
-pub mod lock;
 pub mod mailbox;
 pub mod procedure;
 pub mod store;

src/meta-srv/src/service/heartbeat.rs

@@ -23,6 +23,7 @@ use api::v1::meta::{
 use common_telemetry::{debug, error, info, warn};
 use futures::StreamExt;
 use once_cell::sync::OnceCell;
+use snafu::OptionExt;
 use tokio::sync::mpsc;
 use tokio::sync::mpsc::Sender;
 use tokio_stream::wrappers::ReceiverStream;
@@ -45,7 +46,13 @@ impl heartbeat_server::Heartbeat for Metasrv {
     ) -> GrpcResult<Self::HeartbeatStream> {
         let mut in_stream = req.into_inner();
         let (tx, rx) = mpsc::channel(128);
-        let handler_group = self.handler_group().clone();
+        let handler_group = self
+            .handler_group()
+            .clone()
+            .context(error::UnexpectedSnafu {
+                violated: "expected heartbeat handlers",
+            })?;
+
         let ctx = self.new_ctx();
         let _handle = common_runtime::spawn_global(async move {
             let mut pusher_key = None;

src/meta-srv/src/service/lock.rs

@@ -1,51 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use api::v1::meta::{lock_server, LockRequest, LockResponse, UnlockRequest, UnlockResponse};
-use tonic::{Request, Response};
-
-use super::GrpcResult;
-use crate::lock::Opts;
-use crate::metasrv::Metasrv;
-
-#[async_trait::async_trait]
-impl lock_server::Lock for Metasrv {
-    async fn lock(&self, request: Request<LockRequest>) -> GrpcResult<LockResponse> {
-        let LockRequest {
-            name, expire_secs, ..
-        } = request.into_inner();
-        let expire_secs = Some(expire_secs as u64);
-
-        let key = self.lock().lock(name, Opts { expire_secs }).await?;
-
-        let resp = LockResponse {
-            key,
-            ..Default::default()
-        };
-
-        Ok(Response::new(resp))
-    }
-
-    async fn unlock(&self, request: Request<UnlockRequest>) -> GrpcResult<UnlockResponse> {
-        let UnlockRequest { key, .. } = request.into_inner();
-
-        let _ = self.lock().unlock(key).await?;
-
-        let resp = UnlockResponse {
-            ..Default::default()
-        };
-
-        Ok(Response::new(resp))
-    }
-}

src/metric-engine/src/engine.rs

@@ -338,7 +338,7 @@ mod test {
             .await
             .unwrap();
 
-        // close nonexistent region
+        // close nonexistent region won't report error
         let nonexistent_region_id = RegionId::new(12313, 12);
         engine
             .handle_request(
@@ -346,7 +346,7 @@ mod test {
                 RegionRequest::Close(RegionCloseRequest {}),
             )
             .await
-            .unwrap_err();
+            .unwrap();
 
         // open nonexistent region won't report error
         let invalid_open_request = RegionOpenRequest {

src/metric-engine/src/engine/alter.rs

@@ -64,15 +64,19 @@ impl MetricEngineInner {
     /// Return the physical region id behind this logical region
     async fn alter_logical_region(
         &self,
-        region_id: RegionId,
+        logical_region_id: RegionId,
         request: RegionAlterRequest,
     ) -> Result<RegionId> {
         let physical_region_id = {
             let state = &self.state.read().unwrap();
-            state.get_physical_region_id(region_id).with_context(|| {
+            state
-                error!("Trying to alter an nonexistent region {region_id}");
+                .get_physical_region_id(logical_region_id)
-                LogicalRegionNotFoundSnafu { region_id }
+                .with_context(|| {
-            })?
+                    error!("Trying to alter an nonexistent region {logical_region_id}");
+                    LogicalRegionNotFoundSnafu {
+                        region_id: logical_region_id,
+                    }
+                })?
         };
 
         // only handle adding column
@@ -80,6 +84,12 @@ impl MetricEngineInner {
             return Ok(physical_region_id);
         };
 
+        // lock metadata region for this logical region id
+        let _write_guard = self
+            .metadata_region
+            .write_lock_logical_region(logical_region_id)
+            .await;
+
         let metadata_region_id = to_metadata_region_id(physical_region_id);
         let mut columns_to_add = vec![];
         for col in &columns {
@@ -87,7 +97,7 @@ impl MetricEngineInner {
                 .metadata_region
                 .column_semantic_type(
                     metadata_region_id,
-                    region_id,
+                    logical_region_id,
                     &col.column_metadata.column_schema.name,
                 )
                 .await?
@@ -102,7 +112,7 @@ impl MetricEngineInner {
         self.add_columns_to_physical_data_region(
             data_region_id,
             metadata_region_id,
-            region_id,
+            logical_region_id,
             columns_to_add,
         )
         .await?;
@@ -110,10 +120,16 @@ impl MetricEngineInner {
         // register columns to logical region
         for col in columns {
             self.metadata_region
-                .add_column(metadata_region_id, region_id, &col.column_metadata)
+                .add_column(metadata_region_id, logical_region_id, &col.column_metadata)
                 .await?;
         }
 
+        // invalid logical column cache
+        self.state
+            .write()
+            .unwrap()
+            .invalid_logical_column_cache(logical_region_id);
+
         Ok(physical_region_id)
     }
 

src/metric-engine/src/engine/close.rs

@@ -14,13 +14,14 @@
 
 //! Close a metric region
 
+use common_telemetry::debug;
 use snafu::ResultExt;
 use store_api::region_engine::RegionEngine;
 use store_api::region_request::{AffectedRows, RegionCloseRequest, RegionRequest};
 use store_api::storage::RegionId;
 
 use super::MetricEngineInner;
-use crate::error::{CloseMitoRegionSnafu, LogicalRegionNotFoundSnafu, Result};
+use crate::error::{CloseMitoRegionSnafu, Result};
 use crate::metrics::PHYSICAL_REGION_COUNT;
 use crate::utils;
 
@@ -54,7 +55,8 @@ impl MetricEngineInner {
         {
             Ok(0)
         } else {
-            Err(LogicalRegionNotFoundSnafu { region_id }.build())
+            debug!("Closing a non-existent logical region {}", region_id);
+            Ok(0)
         }
     }
 

src/metric-engine/src/engine/open.rs

@@ -134,17 +134,26 @@ impl MetricEngineInner {
             .await?;
         let logical_region_num = logical_regions.len();
 
-        let mut state = self.state.write().unwrap();
+        {
-        // recover physical column names
+            let mut state = self.state.write().unwrap();
-        let physical_column_names = physical_columns
+            // recover physical column names
-            .into_iter()
+            let physical_column_names = physical_columns
-            .map(|col| col.column_schema.name)
+                .into_iter()
-            .collect();
+                .map(|col| col.column_schema.name)
-        state.add_physical_region(physical_region_id, physical_column_names);
+                .collect();
-        // recover logical regions
+            state.add_physical_region(physical_region_id, physical_column_names);
-        for logical_region_id in logical_regions {
+            // recover logical regions
-            state.add_logical_region(physical_region_id, logical_region_id);
+            for logical_region_id in &logical_regions {
+                state.add_logical_region(physical_region_id, *logical_region_id);
+            }
         }
+
+        for logical_region_id in logical_regions {
+            self.metadata_region
+                .open_logical_region(logical_region_id)
+                .await;
+        }
+
         LOGICAL_REGION_COUNT.add(logical_region_num as i64);
 
         Ok(())

src/metric-engine/src/engine/read.rs

@@ -169,11 +169,11 @@ impl MetricEngineInner {
     ) -> Result<Vec<usize>> {
         // project on logical columns
         let all_logical_columns = self
-            .load_logical_columns(physical_region_id, logical_region_id)
+            .load_logical_column_names(physical_region_id, logical_region_id)
             .await?;
         let projected_logical_names = origin_projection
             .iter()
-            .map(|i| all_logical_columns[*i].column_schema.name.clone())
+            .map(|i| all_logical_columns[*i].clone())
             .collect::<Vec<_>>();
 
         // generate physical projection
@@ -200,10 +200,8 @@ impl MetricEngineInner {
         logical_region_id: RegionId,
     ) -> Result<Vec<usize>> {
         let logical_columns = self
-            .load_logical_columns(physical_region_id, logical_region_id)
+            .load_logical_column_names(physical_region_id, logical_region_id)
-            .await?
+            .await?;
-            .into_iter()
-            .map(|col| col.column_schema.name);
         let mut projection = Vec::with_capacity(logical_columns.len());
         let data_region_id = utils::to_data_region_id(physical_region_id);
         let physical_metadata = self

src/metric-engine/src/engine/region_metadata.rs

@@ -23,13 +23,29 @@ use crate::error::Result;
 impl MetricEngineInner {
     /// Load column metadata of a logical region.
     ///
-    /// The return value is ordered on [ColumnId].
+    /// The return value is ordered on column name.
     pub async fn load_logical_columns(
         &self,
         physical_region_id: RegionId,
         logical_region_id: RegionId,
     ) -> Result<Vec<ColumnMetadata>> {
-        // load logical and physical columns, and intersect them to get logical column metadata
+        // First try to load from state cache
+        if let Some(columns) = self
+            .state
+            .read()
+            .unwrap()
+            .logical_columns()
+            .get(&logical_region_id)
+        {
+            return Ok(columns.clone());
+        }
+
+        // Else load from metadata region and update the cache.
+        let _read_guard = self
+            .metadata_region
+            .read_lock_logical_region(logical_region_id)
+            .await;
+        // Load logical and physical columns, and intersect them to get logical column metadata.
         let mut logical_column_metadata = self
             .metadata_region
             .logical_columns(physical_region_id, logical_region_id)
@@ -37,11 +53,48 @@ impl MetricEngineInner {
             .into_iter()
             .map(|(_, column_metadata)| column_metadata)
             .collect::<Vec<_>>();
-
+        // Sort columns on column name to ensure the order
-        // sort columns on column id to ensure the order
         logical_column_metadata
             .sort_unstable_by(|c1, c2| c1.column_schema.name.cmp(&c2.column_schema.name));
+        // Update cache
+        self.state
+            .write()
+            .unwrap()
+            .add_logical_columns(logical_region_id, logical_column_metadata.clone());
 
         Ok(logical_column_metadata)
     }
+
+    /// Load logical column names of a logical region.
+    ///
+    /// The return value is ordered on column name alphabetically.
+    pub async fn load_logical_column_names(
+        &self,
+        physical_region_id: RegionId,
+        logical_region_id: RegionId,
+    ) -> Result<Vec<String>> {
+        // First try to load from state cache
+        if let Some(columns) = self
+            .state
+            .read()
+            .unwrap()
+            .logical_columns()
+            .get(&logical_region_id)
+        {
+            return Ok(columns
+                .iter()
+                .map(|c| c.column_schema.name.clone())
+                .collect());
+        }
+
+        // Else load from metadata region
+        let columns = self
+            .load_logical_columns(physical_region_id, logical_region_id)
+            .await?
+            .into_iter()
+            .map(|c| c.column_schema.name)
+            .collect::<Vec<_>>();
+
+        Ok(columns)
+    }
 }

src/metric-engine/src/engine/state.rs

@@ -17,6 +17,7 @@
 use std::collections::{HashMap, HashSet};
 
 use snafu::OptionExt;
+use store_api::metadata::ColumnMetadata;
 use store_api::storage::RegionId;
 
 use crate::error::{PhysicalRegionNotFoundSnafu, Result};
@@ -35,6 +36,10 @@ pub(crate) struct MetricEngineState {
     /// Cache for the columns of physical regions.
     /// The region id in key is the data region id.
     physical_columns: HashMap<RegionId, HashSet<String>>,
+    /// Cache for the column metadata of logical regions.
+    /// The column order is the same with the order in the metadata, which is
+    /// alphabetically ordered on column name.
+    logical_columns: HashMap<RegionId, Vec<ColumnMetadata>>,
 }
 
 impl MetricEngineState {
@@ -80,6 +85,21 @@ impl MetricEngineState {
             .insert(logical_region_id, physical_region_id);
     }
 
+    /// Add and reorder logical columns.
+    ///
+    /// Caller should make sure:
+    /// 1. there is no duplicate columns
+    /// 2. the column order is the same with the order in the metadata, which is
+    ///    alphabetically ordered on column name.
+    pub fn add_logical_columns(
+        &mut self,
+        logical_region_id: RegionId,
+        new_columns: impl IntoIterator<Item = ColumnMetadata>,
+    ) {
+        let columns = self.logical_columns.entry(logical_region_id).or_default();
+        columns.extend(new_columns);
+    }
+
     pub fn get_physical_region_id(&self, logical_region_id: RegionId) -> Option<RegionId> {
         self.logical_regions.get(&logical_region_id).copied()
     }
@@ -88,6 +108,10 @@ impl MetricEngineState {
         &self.physical_columns
     }
 
+    pub fn logical_columns(&self) -> &HashMap<RegionId, Vec<ColumnMetadata>> {
+        &self.logical_columns
+    }
+
     pub fn physical_regions(&self) -> &HashMap<RegionId, HashSet<RegionId>> {
         &self.physical_regions
     }
@@ -129,9 +153,15 @@ impl MetricEngineState {
             .unwrap() // Safety: physical_region_id is got from physical_regions
             .remove(&logical_region_id);
 
+        self.logical_columns.remove(&logical_region_id);
+
         Ok(())
     }
 
+    pub fn invalid_logical_column_cache(&mut self, logical_region_id: RegionId) {
+        self.logical_columns.remove(&logical_region_id);
+    }
+
     pub fn is_logical_region_exist(&self, logical_region_id: RegionId) -> bool {
         self.logical_regions().contains_key(&logical_region_id)
     }

src/metric-engine/src/metadata_region.rs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 use std::collections::HashMap;
+use std::sync::Arc;
 
 use api::v1::value::ValueData;
 use api::v1::{ColumnDataType, ColumnSchema, Row, Rows, SemanticType, Value};
@@ -21,7 +22,7 @@ use base64::Engine;
 use common_recordbatch::util::collect;
 use datafusion::prelude::{col, lit};
 use mito2::engine::MitoEngine;
-use snafu::ResultExt;
+use snafu::{OptionExt, ResultExt};
 use store_api::metadata::ColumnMetadata;
 use store_api::metric_engine_consts::{
     METADATA_SCHEMA_KEY_COLUMN_INDEX, METADATA_SCHEMA_KEY_COLUMN_NAME,
@@ -31,11 +32,12 @@ use store_api::metric_engine_consts::{
 use store_api::region_engine::RegionEngine;
 use store_api::region_request::{RegionDeleteRequest, RegionPutRequest};
 use store_api::storage::{RegionId, ScanRequest};
+use tokio::sync::{OwnedRwLockReadGuard, OwnedRwLockWriteGuard, RwLock};
 
 use crate::error::{
     CollectRecordBatchStreamSnafu, DecodeColumnValueSnafu, DeserializeColumnMetadataSnafu,
-    MitoReadOperationSnafu, MitoWriteOperationSnafu, ParseRegionIdSnafu, RegionAlreadyExistsSnafu,
+    LogicalRegionNotFoundSnafu, MitoReadOperationSnafu, MitoWriteOperationSnafu,
-    Result,
+    ParseRegionIdSnafu, RegionAlreadyExistsSnafu, Result,
 };
 use crate::utils;
 
@@ -56,11 +58,19 @@ const COLUMN_PREFIX: &str = "__column_";
 /// itself.
 pub struct MetadataRegion {
     mito: MitoEngine,
+    /// Logical lock for operations that need to be serialized. Like update & read region columns.
+    ///
+    /// Region entry will be registered on creating and opening logical region, and deregistered on
+    /// removing logical region.
+    logical_region_lock: RwLock<HashMap<RegionId, Arc<RwLock<()>>>>,
 }
 
 impl MetadataRegion {
     pub fn new(mito: MitoEngine) -> Self {
-        Self { mito }
+        Self {
+            mito,
+            logical_region_lock: RwLock::new(HashMap::new()),
+        }
     }
 
     /// Add a new table key to metadata.
@@ -85,10 +95,21 @@ impl MetadataRegion {
             }
             .fail()
         } else {
+            self.logical_region_lock
+                .write()
+                .await
+                .insert(logical_region_id, Arc::new(RwLock::new(())));
             Ok(())
         }
     }
 
+    pub async fn open_logical_region(&self, logical_region_id: RegionId) {
+        self.logical_region_lock
+            .write()
+            .await
+            .insert(logical_region_id, Arc::new(RwLock::new(())));
+    }
+
     /// Add a new column key to metadata.
     ///
     /// This method won't check if the column already exists. But
@@ -111,6 +132,40 @@ impl MetadataRegion {
         .await
     }
 
+    /// Retrieve a read lock guard of given logical region id.
+    pub async fn read_lock_logical_region(
+        &self,
+        logical_region_id: RegionId,
+    ) -> Result<OwnedRwLockReadGuard<()>> {
+        let lock = self
+            .logical_region_lock
+            .read()
+            .await
+            .get(&logical_region_id)
+            .context(LogicalRegionNotFoundSnafu {
+                region_id: logical_region_id,
+            })?
+            .clone();
+        Ok(RwLock::read_owned(lock).await)
+    }
+
+    /// Retrieve a write lock guard of given logical region id.
+    pub async fn write_lock_logical_region(
+        &self,
+        logical_region_id: RegionId,
+    ) -> Result<OwnedRwLockWriteGuard<()>> {
+        let lock = self
+            .logical_region_lock
+            .read()
+            .await
+            .get(&logical_region_id)
+            .context(LogicalRegionNotFoundSnafu {
+                region_id: logical_region_id,
+            })?
+            .clone();
+        Ok(RwLock::write_owned(lock).await)
+    }
+
     /// Remove a registered logical region from metadata.
     ///
     /// This method doesn't check if the previous key exists.
@@ -136,6 +191,11 @@ impl MetadataRegion {
         column_keys.push(region_key);
         self.delete(region_id, &column_keys).await?;
 
+        self.logical_region_lock
+            .write()
+            .await
+            .remove(&logical_region_id);
+
         Ok(())
     }
 

src/mito2/src/row_converter.rs

@@ -16,9 +16,10 @@ use bytes::Buf;
 use common_base::bytes::Bytes;
 use common_decimal::Decimal128;
 use common_time::time::Time;
-use common_time::{Date, Duration, Interval};
+use common_time::{Date, Duration, IntervalDayTime, IntervalMonthDayNano, IntervalYearMonth};
 use datatypes::data_type::ConcreteDataType;
 use datatypes::prelude::Value;
+use datatypes::types::IntervalType;
 use datatypes::value::ValueRef;
 use memcomparable::{Deserializer, Serializer};
 use paste::paste;
@@ -117,6 +118,24 @@ impl SortField {
                             .serialize($serializer)
                             .context(SerializeFieldSnafu)?;
                     }
+                    ConcreteDataType::Interval(IntervalType::YearMonth(_)) => {
+                        let interval = value.as_interval_year_month().context(FieldTypeMismatchSnafu)?;
+                        interval.map(|i| i.to_i32())
+                            .serialize($serializer)
+                            .context(SerializeFieldSnafu)?;
+                    }
+                    ConcreteDataType::Interval(IntervalType::DayTime(_)) => {
+                        let interval = value.as_interval_day_time().context(FieldTypeMismatchSnafu)?;
+                        interval.map(|i| i.to_i64())
+                            .serialize($serializer)
+                            .context(SerializeFieldSnafu)?;
+                    }
+                    ConcreteDataType::Interval(IntervalType::MonthDayNano(_)) => {
+                        let interval = value.as_interval_month_day_nano().context(FieldTypeMismatchSnafu)?;
+                        interval.map(|i| i.to_i128())
+                            .serialize($serializer)
+                            .context(SerializeFieldSnafu)?;
+                    }
                     ConcreteDataType::List(_) |
                     ConcreteDataType::Dictionary(_) |
                     ConcreteDataType::Null(_) => {
@@ -144,7 +163,6 @@ impl SortField {
             Date, date,
             DateTime, datetime,
             Time, time,
-            Interval, interval,
             Duration, duration,
             Decimal128, decimal128,
             Json, binary
@@ -181,6 +199,24 @@ impl SortField {
                             .map(|t|ty.create_timestamp(t));
                         Ok(Value::from(timestamp))
                     }
+                    ConcreteDataType::Interval(IntervalType::YearMonth(_)) => {
+                        let interval = Option::<i32>::deserialize(deserializer)
+                            .context(error::DeserializeFieldSnafu)?
+                            .map(IntervalYearMonth::from_i32);
+                        Ok(Value::from(interval))
+                    }
+                    ConcreteDataType::Interval(IntervalType::DayTime(_)) => {
+                        let interval = Option::<i64>::deserialize(deserializer)
+                            .context(error::DeserializeFieldSnafu)?
+                            .map(IntervalDayTime::from_i64);
+                        Ok(Value::from(interval))
+                    }
+                    ConcreteDataType::Interval(IntervalType::MonthDayNano(_)) => {
+                        let interval = Option::<i128>::deserialize(deserializer)
+                            .context(error::DeserializeFieldSnafu)?
+                            .map(IntervalMonthDayNano::from_i128);
+                        Ok(Value::from(interval))
+                    }
                     ConcreteDataType::List(l) => NotSupportedFieldSnafu {
                         data_type: ConcreteDataType::List(l.clone()),
                     }
@@ -212,7 +248,6 @@ impl SortField {
             Date, Date,
             Time, Time,
             DateTime, DateTime,
-            Interval, Interval,
             Duration, Duration,
             Decimal128, Decimal128
         )
@@ -263,7 +298,9 @@ impl SortField {
             ConcreteDataType::Timestamp(_) => 9, // We treat timestamp as Option<i64>
             ConcreteDataType::Time(_) => 10,     // i64 and 1 byte time unit
             ConcreteDataType::Duration(_) => 10,
-            ConcreteDataType::Interval(_) => 18,
+            ConcreteDataType::Interval(IntervalType::YearMonth(_)) => 5,
+            ConcreteDataType::Interval(IntervalType::DayTime(_)) => 9,
+            ConcreteDataType::Interval(IntervalType::MonthDayNano(_)) => 17,
             ConcreteDataType::Decimal128(_) => 19,
             ConcreteDataType::Null(_)
             | ConcreteDataType::List(_)
@@ -387,7 +424,9 @@ impl RowCodec for McmpRowCodec {
 #[cfg(test)]
 mod tests {
     use common_base::bytes::StringBytes;
-    use common_time::{DateTime, Timestamp};
+    use common_time::{
+        DateTime, IntervalDayTime, IntervalMonthDayNano, IntervalYearMonth, Timestamp,
+    };
     use datatypes::value::Value;
 
     use super::*;
@@ -563,6 +602,8 @@ mod tests {
                 ConcreteDataType::timestamp_millisecond_datatype(),
                 ConcreteDataType::time_millisecond_datatype(),
                 ConcreteDataType::duration_millisecond_datatype(),
+                ConcreteDataType::interval_year_month_datatype(),
+                ConcreteDataType::interval_day_time_datatype(),
                 ConcreteDataType::interval_month_day_nano_datatype(),
                 ConcreteDataType::decimal128_default_datatype(),
             ],
@@ -585,7 +626,9 @@ mod tests {
                 Value::Timestamp(Timestamp::new_millisecond(12)),
                 Value::Time(Time::new_millisecond(13)),
                 Value::Duration(Duration::new_millisecond(14)),
-                Value::Interval(Interval::from_month_day_nano(1, 1, 15)),
+                Value::IntervalYearMonth(IntervalYearMonth::new(1)),
+                Value::IntervalDayTime(IntervalDayTime::new(1, 15)),
+                Value::IntervalMonthDayNano(IntervalMonthDayNano::new(1, 1, 15)),
                 Value::Decimal128(Decimal128::from(16)),
             ],
         );

src/query/src/promql/planner.rs

@@ -805,10 +805,11 @@ impl PromPlanner {
 
             let exprs = result_set
                 .into_iter()
-                .map(|col| DfExpr::Column(col.into()))
+                .map(|col| DfExpr::Column(Column::new_unqualified(col)))
                 .chain(self.create_tag_column_exprs()?)
                 .chain(Some(self.create_time_index_column_expr()?))
                 .collect::<Vec<_>>();
+
             // reuse this variable for simplicity
             table_scan = LogicalPlanBuilder::from(table_scan)
                 .project(exprs)

src/query/src/range_select/plan_rewrite.rs

@@ -20,9 +20,9 @@ use arrow_schema::DataType;
 use async_recursion::async_recursion;
 use catalog::table_source::DfTableSourceProvider;
 use chrono::Utc;
-use common_time::interval::NANOS_PER_MILLI;
+use common_time::interval::{MS_PER_DAY, NANOS_PER_MILLI};
 use common_time::timestamp::TimeUnit;
-use common_time::{Interval, Timestamp, Timezone};
+use common_time::{IntervalDayTime, IntervalMonthDayNano, IntervalYearMonth, Timestamp, Timezone};
 use datafusion::datasource::DefaultTableSource;
 use datafusion::prelude::Column;
 use datafusion::scalar::ScalarValue;
@@ -145,8 +145,6 @@ fn evaluate_expr_to_millisecond(args: &[Expr], i: usize, interval_only: bool) ->
     }
     let execution_props = ExecutionProps::new().with_query_execution_start_time(Utc::now());
     let info = SimplifyContext::new(&execution_props).with_schema(Arc::new(DFSchema::empty()));
-    let interval_to_ms =
-        |interval: Interval| -> i64 { (interval.to_nanosecond() / NANOS_PER_MILLI as i128) as i64 };
     let simplify_expr = ExprSimplifier::new(info).simplify(expr.clone())?;
     match simplify_expr {
         Expr::Literal(ScalarValue::TimestampNanosecond(ts_nanos, _))
@@ -161,15 +159,37 @@ fn evaluate_expr_to_millisecond(args: &[Expr], i: usize, interval_only: bool) ->
         | Expr::Literal(ScalarValue::DurationMillisecond(ts_millis)) => ts_millis,
         Expr::Literal(ScalarValue::TimestampSecond(ts_secs, _))
         | Expr::Literal(ScalarValue::DurationSecond(ts_secs)) => ts_secs.map(|v| v * 1_000),
-        Expr::Literal(ScalarValue::IntervalYearMonth(interval)) => {
+        // We don't support interval with months as days in a month is unclear.
-            interval.map(|v| interval_to_ms(Interval::from_i32(v)))
+        Expr::Literal(ScalarValue::IntervalYearMonth(interval)) => interval
-        }
+            .map(|v| {
-        Expr::Literal(ScalarValue::IntervalDayTime(interval)) => {
+                let interval = IntervalYearMonth::from_i32(v);
-            interval.map(|v| interval_to_ms(Interval::from_i64(v)))
+                if interval.months != 0 {
-        }
+                    return Err(DataFusionError::Plan(format!(
-        Expr::Literal(ScalarValue::IntervalMonthDayNano(interval)) => {
+                        "Year or month interval is not allowed in range query: {}",
-            interval.map(|v| interval_to_ms(Interval::from_i128(v)))
+                        expr.display_name().unwrap_or_default()
-        }
+                    )));
+                }
+
+                Ok(0)
+            })
+            .transpose()?,
+        Expr::Literal(ScalarValue::IntervalDayTime(interval)) => interval.map(|v| {
+            let interval = IntervalDayTime::from_i64(v);
+            interval.as_millis()
+        }),
+        Expr::Literal(ScalarValue::IntervalMonthDayNano(interval)) => interval
+            .map(|v| {
+                let interval = IntervalMonthDayNano::from_i128(v);
+                if interval.months != 0 {
+                    return Err(DataFusionError::Plan(format!(
+                        "Year or month interval is not allowed in range query: {}",
+                        expr.display_name().unwrap_or_default()
+                    )));
+                }
+
+                Ok(interval.days as i64 * MS_PER_DAY + interval.nanoseconds / NANOS_PER_MILLI)
+            })
+            .transpose()?,
         _ => None,
     }
     .ok_or_else(|| {
@@ -547,6 +567,7 @@ mod test {
     use catalog::memory::MemoryCatalogManager;
     use catalog::RegisterTableRequest;
     use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
+    use common_time::IntervalYearMonth;
     use datafusion_expr::{BinaryExpr, Operator};
     use datatypes::prelude::ConcreteDataType;
     use datatypes::schema::{ColumnSchema, Schema};
@@ -788,35 +809,29 @@ mod test {
 
     #[test]
     fn test_parse_duration_expr() {
-        let interval_to_ms = |interval: Interval| -> u128 {
-            (interval.to_nanosecond() / NANOS_PER_MILLI as i128) as u128
-        };
         // test IntervalYearMonth
-        let interval = Interval::from_year_month(10);
+        let interval = IntervalYearMonth::new(10);
         let args = vec![Expr::Literal(ScalarValue::IntervalYearMonth(Some(
             interval.to_i32(),
         )))];
-        assert_eq!(
+        assert!(parse_duration_expr(&args, 0).is_err(),);
-            parse_duration_expr(&args, 0).unwrap().as_millis(),
-            interval_to_ms(interval)
-        );
         // test IntervalDayTime
-        let interval = Interval::from_day_time(10, 10);
+        let interval = IntervalDayTime::new(10, 10);
         let args = vec![Expr::Literal(ScalarValue::IntervalDayTime(Some(
             interval.to_i64(),
         )))];
         assert_eq!(
-            parse_duration_expr(&args, 0).unwrap().as_millis(),
+            parse_duration_expr(&args, 0).unwrap().as_millis() as i64,
-            interval_to_ms(interval)
+            interval.as_millis()
         );
         // test IntervalMonthDayNano
-        let interval = Interval::from_month_day_nano(10, 10, 10);
+        let interval = IntervalMonthDayNano::new(0, 10, 10);
         let args = vec![Expr::Literal(ScalarValue::IntervalMonthDayNano(Some(
             interval.to_i128(),
         )))];
         assert_eq!(
-            parse_duration_expr(&args, 0).unwrap().as_millis(),
+            parse_duration_expr(&args, 0).unwrap().as_millis() as i64,
-            interval_to_ms(interval)
+            interval.days as i64 * MS_PER_DAY + interval.nanoseconds / NANOS_PER_MILLI,
         );
         // test Duration
         let args = vec![Expr::Literal(ScalarValue::Utf8(Some("1y4w".into())))];
@@ -828,25 +843,25 @@ mod test {
         assert!(parse_duration_expr(&args, 10).is_err());
         // test evaluate expr
         let args = vec![Expr::BinaryExpr(BinaryExpr {
-            left: Box::new(Expr::Literal(ScalarValue::IntervalYearMonth(Some(
+            left: Box::new(Expr::Literal(ScalarValue::IntervalDayTime(Some(
-                Interval::from_year_month(10).to_i32(),
+                IntervalDayTime::new(0, 10).to_i64(),
             )))),
             op: Operator::Plus,
-            right: Box::new(Expr::Literal(ScalarValue::IntervalYearMonth(Some(
+            right: Box::new(Expr::Literal(ScalarValue::IntervalDayTime(Some(
-                Interval::from_year_month(10).to_i32(),
+                IntervalDayTime::new(0, 10).to_i64(),
             )))),
         })];
         assert_eq!(
-            parse_duration_expr(&args, 0).unwrap().as_millis(),
+            parse_duration_expr(&args, 0).unwrap(),
-            interval_to_ms(Interval::from_year_month(20))
+            Duration::from_millis(20)
         );
         let args = vec![Expr::BinaryExpr(BinaryExpr {
-            left: Box::new(Expr::Literal(ScalarValue::IntervalYearMonth(Some(
+            left: Box::new(Expr::Literal(ScalarValue::IntervalDayTime(Some(
-                Interval::from_year_month(10).to_i32(),
+                IntervalDayTime::new(0, 10).to_i64(),
             )))),
             op: Operator::Minus,
-            right: Box::new(Expr::Literal(ScalarValue::IntervalYearMonth(Some(
+            right: Box::new(Expr::Literal(ScalarValue::IntervalDayTime(Some(
-                Interval::from_year_month(10).to_i32(),
+                IntervalDayTime::new(0, 10).to_i64(),
             )))),
         })];
         // test zero interval error
@@ -854,7 +869,7 @@ mod test {
         // test must all be interval
         let args = vec![Expr::BinaryExpr(BinaryExpr {
             left: Box::new(Expr::Literal(ScalarValue::IntervalYearMonth(Some(
-                Interval::from_year_month(10).to_i32(),
+                IntervalYearMonth::new(10).to_i32(),
             )))),
             op: Operator::Minus,
             right: Box::new(Expr::Literal(ScalarValue::Time64Microsecond(Some(0)))),
@@ -907,19 +922,15 @@ mod test {
         );
         // test evaluate expr
         let args = vec![Expr::BinaryExpr(BinaryExpr {
-            left: Box::new(Expr::Literal(ScalarValue::IntervalYearMonth(Some(
+            left: Box::new(Expr::Literal(ScalarValue::IntervalDayTime(Some(
-                Interval::from_year_month(10).to_i32(),
+                IntervalDayTime::new(0, 10).to_i64(),
             )))),
             op: Operator::Plus,
-            right: Box::new(Expr::Literal(ScalarValue::IntervalYearMonth(Some(
+            right: Box::new(Expr::Literal(ScalarValue::IntervalDayTime(Some(
-                Interval::from_year_month(10).to_i32(),
+                IntervalDayTime::new(0, 10).to_i64(),
             )))),
         })];
-        assert_eq!(
+        assert_eq!(parse_align_to(&args, 0, None).unwrap(), 20);
-            parse_align_to(&args, 0, None).unwrap(),
-            // 20 month
-            20 * 30 * 24 * 60 * 60 * 1000
-        );
     }
 
     #[test]
@@ -927,18 +938,18 @@ mod test {
         let expr = Expr::BinaryExpr(BinaryExpr {
             left: Box::new(Expr::Literal(ScalarValue::DurationMillisecond(Some(20)))),
             op: Operator::Minus,
-            right: Box::new(Expr::Literal(ScalarValue::IntervalYearMonth(Some(
+            right: Box::new(Expr::Literal(ScalarValue::IntervalDayTime(Some(
-                Interval::from_year_month(10).to_i32(),
+                IntervalDayTime::new(10, 0).to_i64(),
             )))),
         });
         assert!(!interval_only_in_expr(&expr));
         let expr = Expr::BinaryExpr(BinaryExpr {
-            left: Box::new(Expr::Literal(ScalarValue::IntervalYearMonth(Some(
+            left: Box::new(Expr::Literal(ScalarValue::IntervalDayTime(Some(
-                Interval::from_year_month(10).to_i32(),
+                IntervalDayTime::new(10, 0).to_i64(),
             )))),
             op: Operator::Minus,
-            right: Box::new(Expr::Literal(ScalarValue::IntervalYearMonth(Some(
+            right: Box::new(Expr::Literal(ScalarValue::IntervalDayTime(Some(
-                Interval::from_year_month(10).to_i32(),
+                IntervalDayTime::new(10, 0).to_i64(),
             )))),
         });
         assert!(interval_only_in_expr(&expr));

src/query/src/stats.rs

@@ -70,8 +70,7 @@ impl SlowQueryTimer {
                 slow!(
                     cost = elapsed.as_millis() as u64,
                     threshold = threshold.as_millis() as u64,
-                    // TODO(zyy17): It's better to implement Display for EvalStmt for pretty print.
+                    promql = stmt.to_string()
-                    promql = format!("{:?}", stmt)
                 );
             }
         }

src/servers/Cargo.toml

@@ -7,7 +7,7 @@ license.workspace = true
 [features]
 dashboard = []
 mem-prof = ["dep:common-mem-prof"]
-pprof = ["dep:pprof"]
+pprof = ["dep:common-pprof"]
 testing = []
 
 [lints]
@@ -37,6 +37,7 @@ common-macro.workspace = true
 common-mem-prof = { workspace = true, optional = true }
 common-meta.workspace = true
 common-plugins.workspace = true
+common-pprof = { workspace = true, optional = true }
 common-query.workspace = true
 common-recordbatch.workspace = true
 common-runtime.workspace = true
@@ -75,11 +76,6 @@ pgwire = { version = "0.25.0", default-features = false, features = ["server-api
 pin-project = "1.0"
 pipeline.workspace = true
 postgres-types = { version = "0.2", features = ["with-chrono-0_4", "with-serde_json-1"] }
-pprof = { version = "0.13", features = [
-    "flamegraph",
-    "prost-codec",
-    "protobuf",
-], optional = true }
 prometheus.workspace = true
 promql-parser.workspace = true
 prost.workspace = true
@@ -136,7 +132,7 @@ tokio-postgres = "0.7"
 tokio-postgres-rustls = "0.12"
 tokio-test = "0.4"
 
-[target.'cfg(not(windows))'.dev-dependencies]
+[target.'cfg(unix)'.dev-dependencies]
 pprof = { version = "0.13", features = ["criterion", "flamegraph"] }
 
 [target.'cfg(windows)'.dependencies]

src/servers/src/error.rs

@@ -424,9 +424,7 @@ pub enum Error {
 
     #[cfg(feature = "pprof")]
     #[snafu(display("Failed to dump pprof data"))]
-    DumpPprof {
+    DumpPprof { source: common_pprof::error::Error },
-        source: crate::http::pprof::nix::Error,
-    },
 
     #[cfg(not(windows))]
     #[snafu(display("Failed to update jemalloc metrics"))]

src/servers/src/http/pprof.rs

@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(feature = "pprof")]
-pub(crate) mod nix;
-
 #[cfg(feature = "pprof")]
 pub mod handler {
     use std::num::NonZeroI32;
@@ -23,13 +20,13 @@ pub mod handler {
     use axum::extract::Query;
     use axum::http::StatusCode;
     use axum::response::IntoResponse;
+    use common_pprof::Profiling;
     use common_telemetry::info;
     use schemars::JsonSchema;
     use serde::{Deserialize, Serialize};
     use snafu::ResultExt;
 
     use crate::error::{DumpPprofSnafu, Result};
-    use crate::http::pprof::nix::Profiling;
 
     /// Output format.
     #[derive(Debug, Serialize, Deserialize, JsonSchema)]
@@ -70,8 +67,8 @@ pub mod handler {
         let body = match req.output {
             Output::Proto => profiling.dump_proto().await.context(DumpPprofSnafu)?,
             Output::Text => {
-                let report = profiling.report().await.context(DumpPprofSnafu)?;
+                let report = profiling.dump_text().await.context(DumpPprofSnafu)?;
-                format!("{:?}", report).into_bytes()
+                report.into_bytes()
             }
             Output::Flamegraph => profiling.dump_flamegraph().await.context(DumpPprofSnafu)?,
         };

src/servers/src/mysql/writer.rs

@@ -226,7 +226,11 @@ impl<'a, W: AsyncWrite + Unpin> MysqlResultWriter<'a, W> {
                     Value::Timestamp(v) => row_writer.write_col(
                         v.to_chrono_datetime_with_timezone(Some(&query_context.timezone())),
                     )?,
-                    Value::Interval(v) => row_writer.write_col(v.to_iso8601_string())?,
+                    Value::IntervalYearMonth(v) => row_writer.write_col(v.to_iso8601_string())?,
+                    Value::IntervalDayTime(v) => row_writer.write_col(v.to_iso8601_string())?,
+                    Value::IntervalMonthDayNano(v) => {
+                        row_writer.write_col(v.to_iso8601_string())?
+                    }
                     Value::Duration(v) => row_writer.write_col(v.to_std_duration())?,
                     Value::List(_) => {
                         return Err(Error::Internal {

src/servers/src/postgres/types.rs

@@ -21,12 +21,12 @@ use std::collections::HashMap;
 use std::ops::Deref;
 
 use chrono::{NaiveDate, NaiveDateTime, NaiveTime};
-use common_time::Interval;
+use common_time::{IntervalDayTime, IntervalMonthDayNano, IntervalYearMonth};
 use datafusion_common::ScalarValue;
 use datafusion_expr::LogicalPlan;
 use datatypes::prelude::{ConcreteDataType, Value};
 use datatypes::schema::Schema;
-use datatypes::types::TimestampType;
+use datatypes::types::{IntervalType, TimestampType};
 use datatypes::value::ListValue;
 use pgwire::api::portal::{Format, Portal};
 use pgwire::api::results::{DataRowEncoder, FieldInfo};
@@ -325,7 +325,9 @@ fn encode_array(
                 .iter()
                 .map(|v| match v {
                     Value::Null => Ok(None),
-                    Value::Interval(v) => Ok(Some(PgInterval::from(*v))),
+                    Value::IntervalYearMonth(v) => Ok(Some(PgInterval::from(*v))),
+                    Value::IntervalDayTime(v) => Ok(Some(PgInterval::from(*v))),
+                    Value::IntervalMonthDayNano(v) => Ok(Some(PgInterval::from(*v))),
                     _ => Err(PgWireError::ApiError(Box::new(Error::Internal {
                         err_msg: format!("Invalid list item type, find {v:?}, expected interval",),
                     }))),
@@ -443,7 +445,9 @@ pub(super) fn encode_value(
                 })))
             }
         }
-        Value::Interval(v) => builder.encode_field(&PgInterval::from(*v)),
+        Value::IntervalYearMonth(v) => builder.encode_field(&PgInterval::from(*v)),
+        Value::IntervalDayTime(v) => builder.encode_field(&PgInterval::from(*v)),
+        Value::IntervalMonthDayNano(v) => builder.encode_field(&PgInterval::from(*v)),
         Value::Decimal128(v) => builder.encode_field(&v.to_string()),
         Value::List(values) => encode_array(query_ctx, values, builder),
         Value::Duration(_) => Err(PgWireError::ApiError(Box::new(Error::Internal {
@@ -875,9 +879,51 @@ pub(super) fn parameters_to_scalar_values(
                 let data = portal.parameter::<PgInterval>(idx, &client_type)?;
                 if let Some(server_type) = &server_type {
                     match server_type {
-                        ConcreteDataType::Interval(_) => ScalarValue::IntervalMonthDayNano(
+                        ConcreteDataType::Interval(IntervalType::YearMonth(_)) => {
-                            data.map(|i| Interval::from(i).to_i128()),
+                            ScalarValue::IntervalYearMonth(
-                        ),
+                                data.map(|i| {
+                                    if i.days != 0 || i.microseconds != 0 {
+                                        Err(invalid_parameter_error(
+                                            "invalid_parameter_type",
+                                            Some(format!(
+                                                "Expected: {}, found: {}",
+                                                server_type, client_type
+                                            )),
+                                        ))
+                                    } else {
+                                        Ok(IntervalYearMonth::new(i.months).to_i32())
+                                    }
+                                })
+                                .transpose()?,
+                            )
+                        }
+                        ConcreteDataType::Interval(IntervalType::DayTime(_)) => {
+                            ScalarValue::IntervalDayTime(
+                                data.map(|i| {
+                                    if i.months != 0 || i.microseconds % 1000 != 0 {
+                                        Err(invalid_parameter_error(
+                                            "invalid_parameter_type",
+                                            Some(format!(
+                                                "Expected: {}, found: {}",
+                                                server_type, client_type
+                                            )),
+                                        ))
+                                    } else {
+                                        Ok(IntervalDayTime::new(
+                                            i.days,
+                                            (i.microseconds / 1000) as i32,
+                                        )
+                                        .to_i64())
+                                    }
+                                })
+                                .transpose()?,
+                            )
+                        }
+                        ConcreteDataType::Interval(IntervalType::MonthDayNano(_)) => {
+                            ScalarValue::IntervalMonthDayNano(
+                                data.map(|i| IntervalMonthDayNano::from(i).to_i128()),
+                            )
+                        }
                         _ => {
                             return Err(invalid_parameter_error(
                                 "invalid_parameter_type",
@@ -886,7 +932,9 @@ pub(super) fn parameters_to_scalar_values(
                         }
                     }
                 } else {
-                    ScalarValue::IntervalMonthDayNano(data.map(|i| Interval::from(i).to_i128()))
+                    ScalarValue::IntervalMonthDayNano(
+                        data.map(|i| IntervalMonthDayNano::from(i).to_i128()),
+                    )
                 }
             }
             &Type::BYTEA => {
@@ -1150,7 +1198,21 @@ mod test {
                 FieldFormat::Text,
             ),
             FieldInfo::new(
-                "intervals".into(),
+                "interval_year_month".into(),
+                None,
+                None,
+                Type::INTERVAL,
+                FieldFormat::Text,
+            ),
+            FieldInfo::new(
+                "interval_day_time".into(),
+                None,
+                None,
+                Type::INTERVAL,
+                FieldFormat::Text,
+            ),
+            FieldInfo::new(
+                "interval_month_day_nano".into(),
                 None,
                 None,
                 Type::INTERVAL,
@@ -1214,6 +1276,8 @@ mod test {
             ConcreteDataType::datetime_datatype(),
             ConcreteDataType::timestamp_datatype(TimeUnit::Second),
             ConcreteDataType::interval_datatype(IntervalUnit::YearMonth),
+            ConcreteDataType::interval_datatype(IntervalUnit::DayTime),
+            ConcreteDataType::interval_datatype(IntervalUnit::MonthDayNano),
             ConcreteDataType::list_datatype(ConcreteDataType::int64_datatype()),
             ConcreteDataType::list_datatype(ConcreteDataType::float64_datatype()),
             ConcreteDataType::list_datatype(ConcreteDataType::string_datatype()),
@@ -1246,7 +1310,9 @@ mod test {
             Value::Time(1001i64.into()),
             Value::DateTime(1000001i64.into()),
             Value::Timestamp(1000001i64.into()),
-            Value::Interval(1000001i128.into()),
+            Value::IntervalYearMonth(IntervalYearMonth::new(1)),
+            Value::IntervalDayTime(IntervalDayTime::new(1, 10)),
+            Value::IntervalMonthDayNano(IntervalMonthDayNano::new(1, 1, 10)),
             Value::List(ListValue::new(
                 vec![Value::Int64(1i64)],
                 ConcreteDataType::int64_datatype(),

src/servers/src/postgres/types/interval.rs

@@ -15,31 +15,51 @@
 use std::fmt::Display;
 
 use bytes::{Buf, BufMut};
-use common_time::Interval;
+use common_time::interval::IntervalFormat;
+use common_time::{IntervalDayTime, IntervalMonthDayNano, IntervalYearMonth};
 use pgwire::types::ToSqlText;
 use postgres_types::{to_sql_checked, FromSql, IsNull, ToSql, Type};
 
 #[derive(Debug, Clone, Copy, Default)]
 pub struct PgInterval {
-    months: i32,
+    pub(crate) months: i32,
-    days: i32,
+    pub(crate) days: i32,
-    microseconds: i64,
+    pub(crate) microseconds: i64,
 }
 
-impl From<Interval> for PgInterval {
+impl From<IntervalYearMonth> for PgInterval {
-    fn from(interval: Interval) -> Self {
+    fn from(interval: IntervalYearMonth) -> Self {
-        let (months, days, nanos) = interval.to_month_day_nano();
         Self {
-            months,
+            months: interval.months,
-            days,
+            days: 0,
-            microseconds: nanos / 1000,
+            microseconds: 0,
         }
     }
 }
 
-impl From<PgInterval> for Interval {
+impl From<IntervalDayTime> for PgInterval {
+    fn from(interval: IntervalDayTime) -> Self {
+        Self {
+            months: 0,
+            days: interval.days,
+            microseconds: interval.milliseconds as i64 * 1000,
+        }
+    }
+}
+
+impl From<IntervalMonthDayNano> for PgInterval {
+    fn from(interval: IntervalMonthDayNano) -> Self {
+        Self {
+            months: interval.months,
+            days: interval.days,
+            microseconds: interval.nanoseconds / 1000,
+        }
+    }
+}
+
+impl From<PgInterval> for IntervalMonthDayNano {
     fn from(interval: PgInterval) -> Self {
-        Interval::from_month_day_nano(
+        IntervalMonthDayNano::new(
             interval.months,
             interval.days,
             // Maybe overflow, but most scenarios ok.
@@ -56,7 +76,11 @@ impl From<PgInterval> for Interval {
 
 impl Display for PgInterval {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", Interval::from(*self).to_postgres_string())
+        write!(
+            f,
+            "{}",
+            IntervalFormat::from(IntervalMonthDayNano::from(*self)).to_postgres_string()
+        )
     }
 }
 

src/sql/src/statements.rs

@@ -322,7 +322,9 @@ pub fn sql_value_to_value(
             | Value::Timestamp(_)
             | Value::Time(_)
             | Value::Duration(_)
-            | Value::Interval(_) => match unary_op {
+            | Value::IntervalYearMonth(_)
+            | Value::IntervalDayTime(_)
+            | Value::IntervalMonthDayNano(_) => match unary_op {
                 UnaryOperator::Plus => {}
                 UnaryOperator::Minus => {
                     value = value

tests/cases/standalone/common/function/geo.result

@@ -259,6 +259,21 @@ SELECT geohash_neighbours(37.76938, -122.3889, 11);
 | [9q8yygxnefv, 9q8yygxnefu, 9q8yygxnefs, 9q8yygxnefk, 9q8yygxnefm, 9q8yygxnefq, 9q8yygxnefw, 9q8yygxnefy] |
 +----------------------------------------------------------------------------------------------------------+
 
+WITH cell_cte AS (
+  SELECT s2_latlng_to_cell(37.76938, -122.3889) AS cell
+)
+SELECT cell,
+       s2_cell_to_token(cell),
+       s2_cell_level(cell),
+       s2_cell_parent(cell, 3)
+FROM cell_cte;
+
++---------------------+---------------------------------+------------------------------+----------------------------------------+
+| cell                | s2_cell_to_token(cell_cte.cell) | s2_cell_level(cell_cte.cell) | s2_cell_parent(cell_cte.cell,Int64(3)) |
++---------------------+---------------------------------+------------------------------+----------------------------------------+
+| 9263763445276221387 | 808f7fc59ef01fcb                | 30                           | 9277415232383221760                    |
++---------------------+---------------------------------+------------------------------+----------------------------------------+
+
 SELECT json_encode_path(37.76938, -122.3889, 1728083375::TimestampSecond);
 
 +----------------------------------------------------------------------------------------------------------------------+

tests/cases/standalone/common/function/geo.sql

@@ -83,6 +83,15 @@ SELECT geohash(37.76938, -122.3889, 11::UInt64);
 
 SELECT geohash_neighbours(37.76938, -122.3889, 11);
 
+WITH cell_cte AS (
+  SELECT s2_latlng_to_cell(37.76938, -122.3889) AS cell
+)
+SELECT cell,
+       s2_cell_to_token(cell),
+       s2_cell_level(cell),
+       s2_cell_parent(cell, 3)
+FROM cell_cte;
+
 SELECT json_encode_path(37.76938, -122.3889, 1728083375::TimestampSecond);
 
 SELECT json_encode_path(lat, lon, ts)

tests/cases/standalone/common/range/interval.result

@@ -20,25 +20,18 @@ Affected Rows: 8
 
 SELECT ts, host, min(val) RANGE (INTERVAL '1 year') FROM host ALIGN (INTERVAL '1 year') ORDER BY host, ts;
 
-+---------------------+-------+----------------------------------------------------------------------------+
+Error: 3000(PlanQuery), DataFusion error: Error during planning: Year or month interval is not allowed in range query: IntervalMonthDayNano("950737950171172051122527404032")
-| ts                  | host  | MIN(host.val) RANGE IntervalMonthDayNano("950737950171172051122527404032") |
-+---------------------+-------+----------------------------------------------------------------------------+
-| 1970-01-01T00:00:00 | host1 | 0                                                                          |
-| 1970-12-27T00:00:00 | host1 | 2                                                                          |
-| 1970-01-01T00:00:00 | host2 | 4                                                                          |
-| 1970-12-27T00:00:00 | host2 | 6                                                                          |
-+---------------------+-------+----------------------------------------------------------------------------+
 
-SELECT ts, host, min(val) RANGE (INTERVAL '1' year) FROM host ALIGN (INTERVAL '1' year) ORDER BY host, ts;
+SELECT ts, host, min(val) RANGE (INTERVAL '1' day) FROM host ALIGN (INTERVAL '1' day) ORDER BY host, ts;
 
-+---------------------+-------+----------------------------------------------------------------------------+
++---------------------+-------+------------------------------------------------------------------+
-| ts                  | host  | MIN(host.val) RANGE IntervalMonthDayNano("950737950171172051122527404032") |
+| ts                  | host  | MIN(host.val) RANGE IntervalMonthDayNano("18446744073709551616") |
-+---------------------+-------+----------------------------------------------------------------------------+
++---------------------+-------+------------------------------------------------------------------+
-| 1970-01-01T00:00:00 | host1 | 0                                                                          |
+| 1970-01-01T00:00:00 | host1 | 0                                                                |
-| 1970-12-27T00:00:00 | host1 | 2                                                                          |
+| 1971-01-02T00:00:00 | host1 | 2                                                                |
-| 1970-01-01T00:00:00 | host2 | 4                                                                          |
+| 1970-01-01T00:00:00 | host2 | 4                                                                |
-| 1970-12-27T00:00:00 | host2 | 6                                                                          |
+| 1971-01-02T00:00:00 | host2 | 6                                                                |
-+---------------------+-------+----------------------------------------------------------------------------+
++---------------------+-------+------------------------------------------------------------------+
 
 DROP TABLE host;
 

tests/cases/standalone/common/range/interval.sql

@@ -16,6 +16,6 @@ INSERT INTO TABLE host VALUES
 
 SELECT ts, host, min(val) RANGE (INTERVAL '1 year') FROM host ALIGN (INTERVAL '1 year') ORDER BY host, ts;
 
-SELECT ts, host, min(val) RANGE (INTERVAL '1' year) FROM host ALIGN (INTERVAL '1' year) ORDER BY host, ts;
+SELECT ts, host, min(val) RANGE (INTERVAL '1' day) FROM host ALIGN (INTERVAL '1' day) ORDER BY host, ts;
 
 DROP TABLE host;

tests/cases/standalone/common/tql/basic.result

@@ -123,3 +123,30 @@ DROP TABLE test;
 
 Affected Rows: 0
 
+CREATE TABLE test (`Field_I` DOUBLE, `Ts_J` TIMESTAMP TIME INDEX, `Tag_K` STRING PRIMARY KEY);
+
+Affected Rows: 0
+
+INSERT INTO test VALUES (1, 1, "a"), (1, 1, "b"), (2, 2, "a");
+
+Affected Rows: 3
+
+TQL EVAL (0, 10, '5s') test{__field__="Field_I"};
+
++---------+-------+---------------------+
+| Field_I | Tag_K | Ts_J                |
++---------+-------+---------------------+
+| 2.0     | a     | 1970-01-01T00:00:05 |
+| 2.0     | a     | 1970-01-01T00:00:10 |
+| 1.0     | b     | 1970-01-01T00:00:05 |
+| 1.0     | b     | 1970-01-01T00:00:10 |
++---------+-------+---------------------+
+
+TQL EVAL (0, 10, '5s') test{__field__="field_i"};
+
+Error: 1004(InvalidArguments), Cannot find column field_i
+
+drop table test;
+
+Affected Rows: 0
+

tests/cases/standalone/common/tql/basic.sql

@@ -32,3 +32,13 @@ TQL EVAL ('1970-01-01T00:00:00'::timestamp, '1970-01-01T00:00:00'::timestamp + '
 TQL EVAL (now() - now(), now() -  (now() - '10 seconds'::interval), '1s')  test{k="a"};
 
 DROP TABLE test;
+
+CREATE TABLE test (`Field_I` DOUBLE, `Ts_J` TIMESTAMP TIME INDEX, `Tag_K` STRING PRIMARY KEY);
+
+INSERT INTO test VALUES (1, 1, "a"), (1, 1, "b"), (2, 2, "a");
+
+TQL EVAL (0, 10, '5s') test{__field__="Field_I"};
+
+TQL EVAL (0, 10, '5s') test{__field__="field_i"};
+
+drop table test;