Skip to content

Add composite index on aggregate table #2199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eiffel777 wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Add composite index on aggregate table #2199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
385865c
add composite key for dimensions
eiffel777 Apr 14, 2026
44a29bc
Merge branch 'main' of github.com:eiffel777/xdmod into change-aggrega…
eiffel777 Apr 20, 2026
3b4f8a2
removing STRAIGHT_JOIN from group by queries
eiffel777 Apr 20, 2026
615f336
updating values in test results
eiffel777 Apr 29, 2026
bc4d360
linting changes
eiffel777 Apr 29, 2026
13a036c
linting changes
eiffel777 Apr 29, 2026
cf6f2e0
Merge branch 'main' into change-aggregate-table-indexes
eiffel777 May 6, 2026
d55619c
Merge branch 'main' into change-aggregate-table-indexes
eiffel777 May 11, 2026
9e067c2
Merge branch 'main' into change-aggregate-table-indexes
eiffel777 May 12, 2026
b1e72d2
Merge branch 'main' into change-aggregate-table-indexes
eiffel777 May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions classes/DataWarehouse/Query/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ public function getQueryString($limit = null, $offset = null, $extraHavingClause
$select_order_by = $this->getSelectOrderBy();

$format = <<<SQL
SELECT STRAIGHT_JOIN%s
SELECT%s
%s
FROM
%s%s
Expand Down Expand Up @@ -784,7 +784,7 @@ public function getCountQueryString()
SELECT
COUNT(*) AS row_count
FROM (
SELECT STRAIGHT_JOIN
SELECT
%s AS total
FROM
%s
Expand Down
2 changes: 1 addition & 1 deletion classes/DataWarehouse/Query/TimeseriesQuery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ public function getQueryString(
}

$format = <<<SQL
SELECT STRAIGHT_JOIN
SELECT
%s
FROM
%s
Expand Down
6 changes: 3 additions & 3 deletions configuration/etl/etl_tables.d/cloud_common/cloudfact_by_.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,13 @@
"indexes": [
{
"name": "index_account",
"columns": [ "account_id" ]
"columns": [ "${AGGREGATION_UNIT}_id", "account_id" ]
},{
"name": "index_person",
"columns": [ "person_id" ]
"columns": [ "${AGGREGATION_UNIT}_id", "person_id" ]
},{
"name": "index_resource",
"columns": [ "host_resource_id" ]
"columns": [ "${AGGREGATION_UNIT}_id", "host_resource_id" ]
},{
"name": "index_period_value",
"columns": [ "${AGGREGATION_UNIT}" ]
Expand Down
6 changes: 3 additions & 3 deletions configuration/etl/etl_tables.d/cloud_common/cloudfact_by_day.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,13 @@
"is_unique": true
},{
"name": "index_account",
"columns": [ "account_id" ]
"columns": [ "${AGGREGATION_UNIT}_id", "account_id" ]
},{
"name": "index_person",
"columns": [ "person_id" ]
"columns": [ "${AGGREGATION_UNIT}_id", "person_id" ]
},{
"name": "index_resource",
"columns": [ "host_resource_id" ]
"columns": [ "${AGGREGATION_UNIT}_id", "host_resource_id" ]
},{
"name": "index_period_value",
"columns": [ "${AGGREGATION_UNIT}" ]
Expand Down
17 changes: 17 additions & 0 deletions configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,102 +364,119 @@
{
"name": "index_account",
"columns": [
"${AGGREGATION_UNIT}_id",
"account_id"
]
},
{
"name": "index_allocation",
"columns": [
"${AGGREGATION_UNIT}_id",
"allocation_id"
]
},
{
"name": "index_fos",
"columns": [
"${AGGREGATION_UNIT}_id",
"fos_id"
]
},
{
"name": "index_job_time_bucket_id",
"columns": [
"${AGGREGATION_UNIT}_id",
"job_time_bucket_id"
]
},
{
"name": "index_job_wait_time_bucket_id",
"columns": [
"${AGGREGATION_UNIT}_id",
"job_wait_time_bucket_id"
]
},
{
"name": "index_node_count",
"columns": [
"${AGGREGATION_UNIT}_id",
"node_count"
]
},
{
"name": "index_resource_organization",
"columns": [
"${AGGREGATION_UNIT}_id",
"resource_organization_id"
]
},
{
"name": "index_person",
"columns": [
"${AGGREGATION_UNIT}_id",
"person_id"
]
},
{
"name": "index_person_nsf_status_code",
"columns": [
"${AGGREGATION_UNIT}_id",
"person_nsfstatuscode_id"
]
},
{
"name": "index_person_organization",
"columns": [
"${AGGREGATION_UNIT}_id",
"person_organization_id"
]
},
{
"name": "index_pi_organization",
"columns": [
"${AGGREGATION_UNIT}_id",
"piperson_organization_id"
]
},
{
"name": "index_pi_person",
"columns": [
"${AGGREGATION_UNIT}_id",
"principalinvestigator_person_id"
]
},
{
"name": "index_processor_count",
"columns": [
"${AGGREGATION_UNIT}_id",
"processor_count"
]
},
{
"name": "index_queue",
"columns": [
"${AGGREGATION_UNIT}_id",
"queue"
]
},
{
"name": "index_resource_type",
"columns": [
"${AGGREGATION_UNIT}_id",
"resourcetype_id"
]
},
{
"name": "index_resource",
"columns": [
"${AGGREGATION_UNIT}_id",
"record_resource_id"
]
},
{
"name": "index_system_account",
"columns": [
"${AGGREGATION_UNIT}_id",
"systemaccount_id"
]
},
Expand Down
17 changes: 17 additions & 0 deletions configuration/etl/etl_tables.d/jobs/xdw/jobfact_by_day.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,54 +384,63 @@
{
"name": "index_account",
"columns": [
"${AGGREGATION_UNIT}_id",
"account_id"
]
},
{
"name": "index_allocation",
"columns": [
"${AGGREGATION_UNIT}_id",
"allocation_id"
]
},
{
"name": "index_fos",
"columns": [
"${AGGREGATION_UNIT}_id",
"fos_id"
]
},
{
"name": "index_job_time_bucket_id",
"columns": [
"${AGGREGATION_UNIT}_id",
"job_time_bucket_id"
]
},
{
"name": "index_job_wait_time_bucket_id",
"columns": [
"${AGGREGATION_UNIT}_id",
"job_wait_time_bucket_id"
]
},
{
"name": "index_node_count",
"columns": [
"${AGGREGATION_UNIT}_id",
"node_count"
]
},
{
"name": "index_resource_organization",
"columns": [
"${AGGREGATION_UNIT}_id",
"resource_organization_id"
]
},
{
"name": "index_person",
"columns": [
"${AGGREGATION_UNIT}_id",
"person_id"
]
},
{
"name": "index_person_nsf_status_code",
"columns": [
"${AGGREGATION_UNIT}_id",
"person_nsfstatuscode_id"
]
},
Expand All @@ -444,48 +453,56 @@
{
"name": "index_person_organization",
"columns": [
"${AGGREGATION_UNIT}_id",
"person_organization_id"
]
},
{
"name": "index_pi_organization",
"columns": [
"${AGGREGATION_UNIT}_id",
"piperson_organization_id"
]
},
{
"name": "index_pi_person",
"columns": [
"${AGGREGATION_UNIT}_id",
"principalinvestigator_person_id"
]
},
{
"name": "index_processor_count",
"columns": [
"${AGGREGATION_UNIT}_id",
"processor_count"
]
},
{
"name": "index_queue",
"columns": [
"${AGGREGATION_UNIT}_id",
"queue"
]
},
{
"name": "index_resource_type",
"columns": [
"${AGGREGATION_UNIT}_id",
"resourcetype_id"
]
},
{
"name": "index_resource",
"columns": [
"${AGGREGATION_UNIT}_id",
"record_resource_id"
]
},
{
"name": "index_system_account",
"columns": [
"${AGGREGATION_UNIT}_id",
"systemaccount_id"
]
},
Expand Down
2 changes: 1 addition & 1 deletion configuration/etl/etl_tables.d/resource_specifications/resourcespecsfact_by_.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
"indexes": [
{
"name": "index_resource",
"columns": [ "record_resource_id" ]
"columns": [ "${AGGREGATION_UNIT}_id", "record_resource_id" ]
},{
"name": "index_period_value",
"columns": [ "${AGGREGATION_UNIT}" ]
Expand Down
2 changes: 1 addition & 1 deletion configuration/etl/etl_tables.d/resource_specifications/resourcespecsfact_by_day.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
"is_unique": true
},{
"name": "index_resource",
"columns": [ "record_resource_id" ]
"columns": [ "${AGGREGATION_UNIT}_id", "record_resource_id" ]
},{
"name": "index_period_value",
"columns": [ "${AGGREGATION_UNIT}" ]
Expand Down
7 changes: 7 additions & 0 deletions configuration/etl/etl_tables.d/storage/xdw/storagefact.aggregation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,42 +191,49 @@
{
"name": "idx_resource_id",
"columns": [
"${AGGREGATION_UNIT}_id",
"resource_id"
]
},
{
"name": "idx_resourcetype_id",
"columns": [
"${AGGREGATION_UNIT}_id",
"resourcetype_id"
]
},
{
"name": "idx_mountpoint_id",
"columns": [
"${AGGREGATION_UNIT}_id",
"mountpoint_id"
]
},
{
"name": "idx_person_id",
"columns": [
"${AGGREGATION_UNIT}_id",
"person_id"
]
},
{
"name": "idx_principalinvestigator_person_id",
"columns": [
"${AGGREGATION_UNIT}_id",
"principalinvestigator_person_id"
]
},
{
"name": "idx_systemaccount_id",
"columns": [
"${AGGREGATION_UNIT}_id",
"systemaccount_id"
]
},
{
"name": "idx_fos_id",
"columns": [
"${AGGREGATION_UNIT}_id",
"fos_id"
]
},
Expand Down
2 changes: 1 addition & 1 deletion ...ession/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Day-reference.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ start,end
2016-12-22,2017-01-01
---------
"GPU Count","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
0,11.74476246,0.4533402593311067
0,11.74476246,0.45334025933110605
2,1520.73833333,
---------
2 changes: 1 addition & 1 deletion ...sion/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Month-reference.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ start,end
2016-12-22,2017-01-01
---------
"GPU Count","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
0,11.74476246,0.7927639136921323
0,11.74476246,0.7927639136921318
2,1520.73833333,899.5902978802504
---------
2 changes: 1 addition & 1 deletion ...on/current/expected/reference/Jobs/gpucount/avg_cpu_hours/aggregate-Quarter-reference.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ start,end
2016-12-22,2017-01-01
---------
"GPU Count","CPU Hours: Per Job","Std Dev: CPU Hours: Per Job"
0,11.74476246,0.7927639136921323
0,11.74476246,0.7927639136921318
2,1520.73833333,899.5902978802504
---------
Loading