Merge branch 'main' into bump-opendal

databendlabs · Oct 24, 2024 · 185b12a · 185b12a
2 parents 74ac594 + d1ad6f4
commit 185b12a
Show file tree

Hide file tree

Showing 15 changed files with 407 additions and 119 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/common/metrics/src/metrics/storage.rs b/src/common/metrics/src/metrics/storage.rs
@@ -288,6 +288,15 @@ static AGG_INDEX_WRITE_BYTES: LazyLock<Counter> =
 static AGG_INDEX_WRITE_MILLISECONDS: LazyLock<Histogram> =
     LazyLock::new(|| register_histogram_in_milliseconds("fuse_aggregate_index_write_milliseconds"));
 
+// Virtual column metrics.
+static BLOCK_VIRTUAL_COLUMN_WRITE_NUMS: LazyLock<Counter> =
+    LazyLock::new(|| register_counter("fuse_block_virtual_column_write_nums"));
+static BLOCK_VIRTUAL_COLUMN_WRITE_BYTES: LazyLock<Counter> =
+    LazyLock::new(|| register_counter("fuse_block_virtual_column_write_bytes"));
+static BLOCK_VIRTUAL_COLUMN_WRITE_MILLISECONDS: LazyLock<Histogram> = LazyLock::new(|| {
+    register_histogram_in_milliseconds("fuse_block_virtual_column_write_milliseconds")
+});
+
 /// Common metrics.
 pub fn metrics_inc_omit_filter_rowgroups(c: u64) {
     OMIT_FILTER_ROWGROUPS.inc_by(c);
@@ -790,3 +799,16 @@ pub fn metrics_inc_agg_index_write_bytes(c: u64) {
 pub fn metrics_inc_agg_index_write_milliseconds(c: u64) {
     AGG_INDEX_WRITE_MILLISECONDS.observe(c as f64);
 }
+
+/// Virtual column metrics.
+pub fn metrics_inc_block_virtual_column_write_nums(c: u64) {
+    BLOCK_VIRTUAL_COLUMN_WRITE_NUMS.inc_by(c);
+}
+
+pub fn metrics_inc_block_virtual_column_write_bytes(c: u64) {
+    BLOCK_VIRTUAL_COLUMN_WRITE_BYTES.inc_by(c);
+}
+
+pub fn metrics_inc_block_virtual_column_write_milliseconds(c: u64) {
+    BLOCK_VIRTUAL_COLUMN_WRITE_MILLISECONDS.observe(c as f64);
+}
diff --git a/src/query/ee/Cargo.toml b/src/query/ee/Cargo.toml
@@ -31,6 +31,11 @@ databend-common-meta-api = { workspace = true }
 databend-common-meta-app = { workspace = true }
 databend-common-meta-store = { workspace = true }
 databend-common-meta-types = { workspace = true }
+databend-common-metrics = { workspace = true }
+databend-common-pipeline-core = { workspace = true }
+databend-common-pipeline-sinks = { workspace = true }
+databend-common-pipeline-sources = { workspace = true }
+databend-common-pipeline-transforms = { workspace = true }
 databend-common-sql = { workspace = true }
 databend-common-storage = { workspace = true }
 databend-common-storages-fuse = { workspace = true }