Merge pull request #1836 from eiffel777/change-normalization-factor-c…

…olumn-type Changing column types related to normalization_factor to decimal
ubccr · Apr 25, 2024 · d462a86 · d462a86
2 parents a3b0425 + 116c1b5
commit d462a86
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/configuration/etl/etl_tables.d/common/hpcdb/resource-specs.json b/configuration/etl/etl_tables.d/common/hpcdb/resource-specs.json
@@ -65,7 +65,7 @@
             },
             {
                 "name": "normalization_factor",
-                "type": "int(10) unsigned",
+                "type": "decimal(10,4)",
                 "nullable": true,
                 "comment": "Normalization factor for a resource. This helps compare capacity across resources"
             },

diff --git a/configuration/etl/etl_tables.d/common/staging/resource-spec.json b/configuration/etl/etl_tables.d/common/staging/resource-spec.json
@@ -82,10 +82,10 @@
             },
             {
                 "name": "normalization_factor",
-                "type": "int(10) unsigned",
+                "type": "decimal(10,4)",
                 "nullable": true,
                 "default": 1,
-                "comment": "Nomralization factor for a resource. This helps compare capacity across resources"
+                "comment": "Normalization factor for a resource. This helps compare capacity across resources"
             },
             {
                 "name": "comments",

diff --git a/configuration/etl/etl_tables.d/jobs/xdw/resource-specs.json b/configuration/etl/etl_tables.d/jobs/xdw/resource-specs.json
@@ -77,7 +77,7 @@
             },
             {
                 "name": "normalization_factor",
-                "type": "int(10) unsigned",
+                "type": "decimal(10,4)",
                 "nullable": true,
                 "comment": "Normalization factor for a resource. This helps compare capacity across resources"
             },

diff --git a/configuration/etl/etl_tables.d/resource_specifications/resourcespecsfact_by_.json b/configuration/etl/etl_tables.d/resource_specifications/resourcespecsfact_by_.json
@@ -67,22 +67,22 @@
                 "comment": "FACT: The number of GPU node seconds available to be allocated during a time period."
             },{
                 "name": "total_su_available",
-                "type": "int(11) unsigned",
+                "type": "decimal(14,4)",
                 "nullable": true,
                 "comment": "FACT: The total number of SU's available during a time period."
             },{
                 "name": "allocated_su_available",
-                "type": "int(11) unsigned",
+                "type": "decimal(14,4)",
                 "nullable": true,
                 "comment": "FACT: The number of SU's available to be allocated during a time period."
             },{
                 "name": "total_normalized_su_available",
-                "type": "int(11) unsigned",
+                "type": "decimal(14,4)",
                 "nullable": true,
                 "comment": "FACT: The total number of Normalized SU's available during a time period."
             },{
                 "name": "allocated_normalized_su_available",
-                "type": "int(11) unsigned",
+                "type": "decimal(14,4)",
                 "nullable": true,
                 "comment": "FACT: The number of Normalized SU's available to be allocated during a time period."
             },{

diff --git a/configuration/etl/etl_tables.d/resource_specifications/resourcespecsfact_by_day.json b/configuration/etl/etl_tables.d/resource_specifications/resourcespecsfact_by_day.json
@@ -72,22 +72,22 @@
                 "comment": "FACT: The number of GPU node seconds available to be allocated during a time period."
             },{
                 "name": "total_su_available",
-                "type": "int(11) unsigned",
+                "type": "decimal(14,4)",
                 "nullable": true,
                 "comment": "FACT: The total number of SU's available during a time period."
             },{
                 "name": "allocated_su_available",
-                "type": "int(11) unsigned",
+                "type": "decimal(14,4)",
                 "nullable": true,
                 "comment": "FACT: The number of SU's available to be allocated during a time period."
             },{
                 "name": "total_normalized_su_available",
-                "type": "int(11) unsigned",
+                "type": "decimal(14,4)",
                 "nullable": true,
                 "comment": "FACT: The total number of Normalized SU's available during a time period."
             },{
                 "name": "allocated_normalized_su_available",
-                "type": "int(11) unsigned",
+                "type": "decimal(14,4)",
                 "nullable": true,
                 "comment": "FACT: The number of Normalized SU's available to be allocated during a time period."
             },{

diff --git a/...rtifacts/xdmod/regression/current/expected/reference/raw-data/resourcespecifications.json b/...rtifacts/xdmod/regression/current/expected/reference/raw-data/resourcespecifications.json
@@ -1 +1 @@
-{"success":true,"fields":["Resource ID","Resource","Resource Allocation Type","Start Time","End Time","CPU Processor Count","CPU Node Count","CPU Processors Per Node","GPU Count","GPU Node Count","GPUs Per Node","Normalization Factor","SUs Available","Resource Type","Organization","Percent Allocated"],"data":[["1","Frearson","CPU Allocated","1482796800","1577923199","4000","400","10","0","0","0","1",null,"High-performance computing","Screwdriver","100"],["2","Mortorq","GPU Allocated","1482710400","1577923199","4000","400","10","4000","400","10","1",null,"High-performance computing","Screwdriver","100"],["3","Phillips","CPU Node Allocated","1482364800","1577923199","4000","400","10","0","0","0","1",null,"High-performance computing","Screwdriver","100"],["4","Posidriv","CPU Allocated","1482278400","1577923199","4000","400","10","0","0","0","1",null,"High-performance computing","Screwdriver","100"],["5","Robertson","GPU Node Allocated","1481500800","1577923199","4000","400","10","4000","400","10","1",null,"High-performance computing","Screwdriver","100"]]}
+{"success":true,"fields":["Resource ID","Resource","Resource Allocation Type","Start Time","End Time","CPU Processor Count","CPU Node Count","CPU Processors Per Node","GPU Count","GPU Node Count","GPUs Per Node","Normalization Factor","SUs Available","Resource Type","Organization","Percent Allocated"],"data":[["1","Frearson","CPU Allocated","1482796800","1577923199","4000","400","10","0","0","0","1.0000",null,"High-performance computing","Screwdriver","100"],["2","Mortorq","GPU Allocated","1482710400","1577923199","4000","400","10","4000","400","10","1.0000",null,"High-performance computing","Screwdriver","100"],["3","Phillips","CPU Node Allocated","1482364800","1577923199","4000","400","10","0","0","0","1.0000",null,"High-performance computing","Screwdriver","100"],["4","Posidriv","CPU Allocated","1482278400","1577923199","4000","400","10","0","0","0","1.0000",null,"High-performance computing","Screwdriver","100"],["5","Robertson","GPU Node Allocated","1481500800","1577923199","4000","400","10","4000","400","10","1.0000",null,"High-performance computing","Screwdriver","100"]]}