From bf964bde34472a406f078ca4d1a7ed85a81b85f8 Mon Sep 17 00:00:00 2001
From: unknown <smishchuk@nubes.ru>
Date: Tue, 28 Jul 2026 13:08:12 +0300
Subject: [PATCH] 027 query optimized

---
 Application.cfc      |  2 +-
 mod/compute_payg.cfm | 28 ++++++++++++++++++++--------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/Application.cfc b/Application.cfc
index f7283dc..273c2f5 100644
--- a/Application.cfc
+++ b/Application.cfc
@@ -94,7 +94,7 @@
 
 		<!--- global settings --->				
 		<cfset request.RECORDS_PER_PAGE=500/>
-		<cfset request.APP_VERSION="0.00.026"/>
+		<cfset request.APP_VERSION="0.00.027"/>
 		<cfheader name="X-Application-Version" value=#request.APP_VERSION#/>
 		<cfset request.STAND=getStand()/>	
 		
diff --git a/mod/compute_payg.cfm b/mod/compute_payg.cfm
index 3304d0a..1bf0e29 100644
--- a/mod/compute_payg.cfm
+++ b/mod/compute_payg.cfm
@@ -110,6 +110,18 @@
 		<cfflush/>
 	</cfif>
 
+
+<!--- -- 1. Create a specialized expression index matching your date filters
+CREATE INDEX idx_capacity_storage_perf_test ON ngcloud_ru.capacity_storage (
+    vdc_id, 
+    (timestamp::date), 
+    storage_profile_types_id
+) 
+INCLUDE (limit, used);
+
+-- 2. Optional: Standardize tenant scanning since it currently falls back to Seq Scan
+CREATE INDEX idx_tenant_wzcode ON ngcloud_ru.tenant (wzcode); --->
+
 	<!--- *** Нужно еще реализовать в модели данных (каталоге) политики бесплатного минимума (free tier), сейчас прибито гвоздями --->
 	<cfquery name="qComputing">
 		select 'WZ'||to_char(tenant.wzcode,'FM00000') as wz, vdc.name as vdc_name, 
@@ -130,8 +142,8 @@
 		join ngcloud_ru.vdc on capacity_resource.vdc_id=vdc.id 
 		join ngcloud_ru.tenant on tenant.id=vdc.tenant_id 
 		where tenant.wzcode = <cfqueryparam cfsqltype="cf_sql_integer" value=#ATTRIBUTES.tenant_wz_index#/> 
-		AND capacity_resource.timestamp::date >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_start#/> 
-		AND capacity_resource.timestamp::date <= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_finish#/> 
+		AND capacity_resource.timestamp >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_start#/> 
+		AND capacity_resource.timestamp < <cfqueryparam cfsqltype="cf_sql_timestamp" value=#dateAdd("d",1,attributes.dt_finish)#/>  
 		group by tenant.wzcode, vdc.name, capacity_resource.timestamp::date 
 		order by tenant.wzcode, vdc.name, capacity_resource.timestamp::date;
 	</cfquery>
@@ -187,8 +199,8 @@ from a
 		join ngcloud_ru.tenant on tenant.id=vdc.tenant_id 
 		join ngcloud_ru.storage_profile_types on capacity_storage.storage_profile_types_id=storage_profile_types.id
 		where tenant.wzcode = <cfqueryparam cfsqltype="cf_sql_integer" value=#ATTRIBUTES.tenant_wz_index#/> --AND 1=0
-		AND capacity_storage.timestamp::date >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_start#/> 
-		AND capacity_storage.timestamp::date <= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_finish#/> 
+		AND capacity_storage.timestamp >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_start#/> 
+		AND capacity_storage.timestamp < <cfqueryparam cfsqltype="cf_sql_timestamp" value=#dateAdd("d",1,attributes.dt_finish)#/> 
 		group by tenant.wzcode, vdc.name, storage_profile_types.name, capacity_storage.timestamp::date 
 		order by tenant.wzcode, vdc.name, storage_profile_types.name, capacity_storage.timestamp::date
 		;
@@ -231,8 +243,8 @@ from a
 		join s3billing.bucket_info ON bucket_info.id=bucket_stat.bucket_id 
 		where bucket_stat.placement_id in (1,2) 
 		AND bucket_stat.owner = <cfqueryparam cfsqltype="cf_sql_varchar" value=#ATTRIBUTES.tenant_wz_index#/>
-		AND bucket_stat.timestamp_addition::date >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_start#/> 
-		AND bucket_stat.timestamp_addition::date <= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_finish#/> 
+		AND bucket_stat.timestamp_addition >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_start#/> 
+		AND bucket_stat.timestamp_addition < <cfqueryparam cfsqltype="cf_sql_timestamp" value=#dateAdd("d",1,attributes.dt_finish)#/>  
 		group by bucket_stat.owner, bucket_stat.placement_id, bucket_info.name, bucket_stat.timestamp_addition::date
 		order by bucket_stat.owner, bucket_stat.placement_id, bucket_info.name, bucket_stat.timestamp_addition::date;
 	</cfquery>
@@ -321,8 +333,8 @@ from a
 		join s3billing.placement on bucket_info.placement_id=placement.id 
 		where 1=1
 		AND user_info.name = <cfqueryparam cfsqltype="cf_sql_varchar" value=#ATTRIBUTES.tenant_wz_index#/>
-		AND usage_bucket_by_user.time::date >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_start#/> 
-		AND usage_bucket_by_user.time::date <= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_finish#/> 
+		AND usage_bucket_by_user.time >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_start#/> 
+		AND usage_bucket_by_user.time < <cfqueryparam cfsqltype="cf_sql_timestamp" value=#dateAdd("d",1,attributes.dt_finish)#/>  
 		group by user_info.name, bucket_info.placement_id, bucket_info.name, usage_bucket_by_user.time::date
 		order by user_info.name, bucket_info.placement_id, bucket_info.name, usage_bucket_by_user.time::date;
 	</cfquery>