update with new rpc defined

Author: smallfish

src/common/cloud_control/proto/billing.proto

@@ -8,67 +8,65 @@ message BillingError {
   int32 code = 3;
 }
 
-message GetBillingHistoryDailyRequest {
+message GetBillingUsageDailyRequest {
   string tenant_id = 1;
   string billing_month = 2; // YYYY-MM
   string sql_user = 3; // audit only, empty means absent
   string query_id = 4; // audit only, empty means absent
 }
 
-message BillingHistoryDailyStorageUsage {
-  string total_bytes = 1;
-  string day_price_per_tb = 2;
-  uint64 read_requests = 3;
-  string kilo_read_request_price = 4;
-  uint64 write_requests = 5;
-  string kilo_write_request_price = 6;
-}
+message BillingUsageDailyRow {
+  // Billing date in YYYY-MM-DD format.
+  string usage_date = 1;
 
-message BillingHistoryDailyCloudServiceUsage {
-  string api_requests = 1;
-  string kilo_api_requests_price = 2;
-}
+  // Top-level billing category, aligned with Snowflake naming where practical.
+  // Examples: compute, storage, cloud services.
+  string usage_type = 2;
 
-message BillingHistoryDailyRow {
-  string date = 1;
-  string total_amount = 2;
-  string warehouse_amount = 3;
-  string storage_amount = 4;
-  string cloud_service_amount = 5;
-  BillingHistoryDailyStorageUsage storage_usage = 6;
-  BillingHistoryDailyCloudServiceUsage cloud_service_usage = 7;
-}
+  // More specific service category.
+  // Examples: WAREHOUSE_METERING, STORAGE, CLOUD_SERVICES.
+  string service_type = 3;
 
-message GetBillingHistoryDailyResponse {
-  repeated BillingHistoryDailyRow rows = 1;
-  optional BillingError error = 2;
-}
+  // Logical billable resource name when applicable, such as warehouse name.
+  // Empty string means absent.
+  string resource_name = 4;
 
-message GetBillingHistoryWarehouseDailyRequest {
-  string tenant_id = 1;
-  string billing_month = 2; // YYYY-MM
-  string sql_user = 3; // audit only, empty means absent
-  string query_id = 4; // audit only, empty means absent
-}
+  // Billable usage quantity encoded as a decimal string to avoid float precision loss.
+  string usage = 5;
+
+  // Unit for usage.
+  // Examples: second, byte, request.
+  string usage_unit = 6;
+
+  // Unit price encoded as a decimal string. Empty string means absent.
+  string rate = 7;
+
+  // Unit for rate.
+  // Examples: second, tb_day, k_request.
+  // Empty string means absent.
+  string rate_unit = 8;
+
+  // Final billed amount encoded as a decimal string.
+  string usage_in_currency = 9;
+
+  // Settlement currency, for example USD.
+  string currency = 10;
+
+  // Resource tags when the underlying usage is associated with a tagged resource.
+  map<string, string> tags = 11;
 
-message BillingHistoryWarehouseDailyRow {
-  string date = 1;
-  string warehouse_name = 2;
-  string cluster_name = 3;
-  uint64 max_clusters = 4;
-  string size = 5;
-  uint64 seconds = 6;
-  string price_per_second = 7;
-  string credits = 8;
-  map<string, string> tags = 9;
+  // JSON object string for category-specific or future-compatible extension fields.
+  // Examples:
+  //   {"cluster_name":"cl-00000","max_clusters":1,"size":"XSmall"}
+  //   {}
+  string details = 12;
 }
 
-message GetBillingHistoryWarehouseDailyResponse {
-  repeated BillingHistoryWarehouseDailyRow rows = 1;
+message GetBillingUsageDailyResponse {
+  repeated BillingUsageDailyRow rows = 1;
   optional BillingError error = 2;
 }
 
 service BillingService {
-  rpc GetBillingHistoryDaily(GetBillingHistoryDailyRequest) returns (GetBillingHistoryDailyResponse);
-  rpc GetBillingHistoryWarehouseDaily(GetBillingHistoryWarehouseDailyRequest) returns (GetBillingHistoryWarehouseDailyResponse);
+  rpc GetBillingUsageDaily(GetBillingUsageDailyRequest) returns (GetBillingUsageDailyResponse);
 }

src/common/cloud_control/src/billing_client.rs

@@ -18,10 +18,8 @@ use databend_common_exception::Result;
 use tonic::Request;
 use tonic::transport::Channel;
 
-use crate::pb::GetBillingHistoryDailyRequest;
-use crate::pb::GetBillingHistoryDailyResponse;
-use crate::pb::GetBillingHistoryWarehouseDailyRequest;
-use crate::pb::GetBillingHistoryWarehouseDailyResponse;
+use crate::pb::GetBillingUsageDailyRequest;
+use crate::pb::GetBillingUsageDailyResponse;
 use crate::pb::billing_service_client::BillingServiceClient;
 use crate::task_client::MAX_DECODING_SIZE;
 use crate::task_client::MAX_ENCODING_SIZE;
@@ -38,21 +36,12 @@ impl BillingClient {
         Ok(Arc::new(BillingClient { client }))
     }
 
-    pub async fn get_billing_history_daily(
+    pub async fn get_billing_usage_daily(
         &self,
-        req: Request<GetBillingHistoryDailyRequest>,
-    ) -> Result<GetBillingHistoryDailyResponse> {
+        req: Request<GetBillingUsageDailyRequest>,
+    ) -> Result<GetBillingUsageDailyResponse> {
         let mut client = self.client.clone();
-        let resp = client.get_billing_history_daily(req).await?;
-        Ok(resp.into_inner())
-    }
-
-    pub async fn get_billing_history_warehouse_daily(
-        &self,
-        req: Request<GetBillingHistoryWarehouseDailyRequest>,
-    ) -> Result<GetBillingHistoryWarehouseDailyResponse> {
-        let mut client = self.client.clone();
-        let resp = client.get_billing_history_warehouse_daily(req).await?;
+        let resp = client.get_billing_usage_daily(req).await?;
         Ok(resp.into_inner())
     }
 }

src/common/cloud_control/tests/it/billing_client.rs

@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::collections::BTreeMap;
+
 use databend_common_base::runtime;
 use databend_common_cloud_control::billing_client::BillingClient;
-use databend_common_cloud_control::pb::BillingHistoryDailyRow;
-use databend_common_cloud_control::pb::BillingHistoryWarehouseDailyRow;
-use databend_common_cloud_control::pb::GetBillingHistoryDailyRequest;
-use databend_common_cloud_control::pb::GetBillingHistoryDailyResponse;
-use databend_common_cloud_control::pb::GetBillingHistoryWarehouseDailyRequest;
-use databend_common_cloud_control::pb::GetBillingHistoryWarehouseDailyResponse;
+use databend_common_cloud_control::pb::BillingUsageDailyRow;
+use databend_common_cloud_control::pb::GetBillingUsageDailyRequest;
+use databend_common_cloud_control::pb::GetBillingUsageDailyResponse;
 use databend_common_cloud_control::pb::billing_service_server::BillingService;
 use databend_common_cloud_control::pb::billing_service_server::BillingServiceServer;
 use hyper_util::rt::TokioIo;
@@ -37,27 +36,24 @@ pub struct MockBillingService {}
 
 #[tonic::async_trait]
 impl BillingService for MockBillingService {
-    async fn get_billing_history_daily(
-        &self,
-        request: Request<GetBillingHistoryDailyRequest>,
-    ) -> std::result::Result<Response<GetBillingHistoryDailyResponse>, Status> {
-        Ok(Response::new(GetBillingHistoryDailyResponse {
-            rows: vec![BillingHistoryDailyRow {
-                date: request.into_inner().billing_month,
-                ..Default::default()
-            }],
-            error: None,
-        }))
-    }
-
-    async fn get_billing_history_warehouse_daily(
+    async fn get_billing_usage_daily(
         &self,
-        request: Request<GetBillingHistoryWarehouseDailyRequest>,
-    ) -> std::result::Result<Response<GetBillingHistoryWarehouseDailyResponse>, Status> {
-        Ok(Response::new(GetBillingHistoryWarehouseDailyResponse {
-            rows: vec![BillingHistoryWarehouseDailyRow {
-                warehouse_name: request.into_inner().billing_month,
-                ..Default::default()
+        request: Request<GetBillingUsageDailyRequest>,
+    ) -> std::result::Result<Response<GetBillingUsageDailyResponse>, Status> {
+        Ok(Response::new(GetBillingUsageDailyResponse {
+            rows: vec![BillingUsageDailyRow {
+                usage_date: request.into_inner().billing_month,
+                usage_type: "compute".to_string(),
+                service_type: "WAREHOUSE_METERING".to_string(),
+                resource_name: "default".to_string(),
+                usage: "2653".to_string(),
+                usage_unit: "second".to_string(),
+                rate: "0.0002777777777778".to_string(),
+                rate_unit: "second".to_string(),
+                usage_in_currency: "0.737".to_string(),
+                currency: "USD".to_string(),
+                tags: BTreeMap::from([("env".to_string(), "test".to_string())]),
+                details: "{\"cluster_name\":\"cl-00000\"}".to_string(),
             }],
             error: None,
         }))
@@ -95,27 +91,18 @@ async fn test_billing_client_success_cases() -> anyhow::Result<()> {
 
     let client = BillingClient::new(channel).await?;
 
-    let daily_resp = client
-        .get_billing_history_daily(Request::new(GetBillingHistoryDailyRequest {
+    let resp = client
+        .get_billing_usage_daily(Request::new(GetBillingUsageDailyRequest {
             tenant_id: "tenant".to_string(),
             billing_month: "2026-03".to_string(),
             sql_user: "root".to_string(),
             query_id: "query-1".to_string(),
         }))
         .await?;
-    assert_eq!(daily_resp.rows.len(), 1);
-    assert_eq!(daily_resp.rows[0].date, "2026-03");
-
-    let warehouse_resp = client
-        .get_billing_history_warehouse_daily(Request::new(GetBillingHistoryWarehouseDailyRequest {
-            tenant_id: "tenant".to_string(),
-            billing_month: "2026-04".to_string(),
-            sql_user: "root".to_string(),
-            query_id: "query-2".to_string(),
-        }))
-        .await?;
-    assert_eq!(warehouse_resp.rows.len(), 1);
-    assert_eq!(warehouse_resp.rows[0].warehouse_name, "2026-04");
+    assert_eq!(resp.rows.len(), 1);
+    assert_eq!(resp.rows[0].usage_date, "2026-03");
+    assert_eq!(resp.rows[0].usage_type, "compute");
+    assert_eq!(resp.rows[0].resource_name, "default");
 
     Ok(())
 }

src/query/service/src/table_functions/table_function_factory.rs

@@ -39,9 +39,7 @@ use databend_common_storages_iceberg::IcebergInspectTable;
 use databend_common_storages_stream::stream_status_table_func::StreamStatusTable;
 use databend_meta_client::types::MetaId;
 #[cfg(feature = "task-support")]
-use databend_query_task_support::table_functions::BillingHistoryDailyTable;
-#[cfg(feature = "task-support")]
-use databend_query_task_support::table_functions::BillingHistoryWarehouseDailyTable;
+use databend_query_task_support::table_functions::BillingUsageDailyTable;
 #[cfg(feature = "task-support")]
 use databend_query_task_support::table_functions::TaskDependentsEnableTable;
 #[cfg(feature = "task-support")]
@@ -350,16 +348,8 @@ impl TableFunctionFactory {
             );
 
             creators.insert(
-                "billing_history_daily".to_string(),
-                (next_id(), Arc::new(BillingHistoryDailyTable::create)),
-            );
-
-            creators.insert(
-                "billing_history_warehouse_daily".to_string(),
-                (
-                    next_id(),
-                    Arc::new(BillingHistoryWarehouseDailyTable::create),
-                ),
+                "billing_usage_daily".to_string(),
+                (next_id(), Arc::new(BillingUsageDailyTable::create)),
             );
         }