Merge pull request #112 from PanDAWMS/v0.0.30

V0.0.30

Author: EdwardKaravakis

schema/oracle/ATLAS_PANDA.sql

@@ -2967,10 +2967,12 @@ CREATE TABLE "ATLAS_PANDA"."WORKER_NODE"(
     "TOTAL_MEMORY" number(9,0),
     "LAST_SEEN" date,
     "TOTAL_LOCAL_DISK" number(9,0),
+    "CPU_MODEL_NORMALIZED" VARCHAR2(128 BYTE),
     CONSTRAINT PK_WORKER_NODE PRIMARY KEY ("SITE", "HOST_NAME", "CPU_MODEL")
 )ORGANIZATION INDEX COMPRESS 1;
 
 CREATE INDEX IDX_WORKER_NODE_LAST_SEEN ON "ATLAS_PANDA"."WORKER_NODE"("LAST_SEEN");
+CREATE INDEX "ATLAS_PANDA"."IDX_WORKER_NODE_CPU_MODEL_NORM" ON "ATLAS_PANDA"."WORKER_NODE" ("CPU_MODEL_NORMALIZED");
 
 -- Table Comment
 COMMENT ON TABLE "ATLAS_PANDA"."WORKER_NODE" IS 'Stores information about worker nodes seen by PanDA pilots';
@@ -3036,9 +3038,12 @@ CREATE TABLE "ATLAS_PANDA"."CPU_BENCHMARKS" (
     "SITE" VARCHAR2(128),
     "SCORE_PER_CORE" NUMBER(10,2),
     "TIMESTAMP" DATE,
-    "SOURCE" VARCHAR2(256)
+    "SOURCE" VARCHAR2(256),
+    "CPU_TYPE_NORMALIZED" VARCHAR2(128 BYTE)
 );
 
+CREATE INDEX "ATLAS_PANDA"."IDX_WORKER_NODE_CPU_TYPE_NORM" ON "ATLAS_PANDA"."CPU_BENCHMARKS" ("CPU_TYPE_NORMALIZED");
+
 --------------------------------------------------------
 --  DDL for Table WORKER_NODE_METRICS
 --------------------------------------------------------

schema/postgres/sqls/patches/0.0.30.patch.sql

@@ -1,6 +1,6 @@
 -- patch to be used to upgrade from version 0.0.29
 -- Drop the old procedure
-    DROP PROCEDURE IF EXISTS doma_panda.update_worker_node_map();
+DROP PROCEDURE IF EXISTS doma_panda.update_worker_node_map();
 
 -- Drop the old table
 DROP TABLE IF EXISTS doma_panda.worker_node_map;
@@ -87,3 +87,18 @@ ALTER PROCEDURE doma_panda.update_worker_node_metrics() OWNER TO panda;
 SELECT cron.unschedule(
     (SELECT jobid FROM cron.job WHERE command = 'CALL doma_panda.update_worker_node_map()')
 );
+
+
+-- Add columns
+ALTER TABLE doma_panda.worker_node
+  ADD COLUMN cpu_model_normalized VARCHAR(128);
+
+ALTER TABLE doma_panda.cpu_benchmarks
+  ADD COLUMN cpu_type_normalized VARCHAR(128);
+
+-- Indices
+CREATE INDEX idx_worker_node_cpu_model_norm
+  ON doma_panda.worker_node (cpu_model_normalized);
+
+CREATE INDEX idx_worker_node_cpu_type_norm
+  ON doma_panda.cpu_benchmarks (cpu_type_normalized);

schema/postgres/sqls/pg_PANDA_TABLE.sql

@@ -2885,10 +2885,12 @@ CREATE TABLE worker_node (
     "total_memory" BIGINT,
     "last_seen" TIMESTAMP,
     "total_local_disk" BIGINT,
+    "cpu_model_normalized" VARCHAR(128),
     PRIMARY KEY ("site", "host_name", "cpu_model")
 );
 
 CREATE INDEX idx_worker_node_last_seen ON worker_node ("last_seen");
+CREATE INDEX idx_worker_node_cpu_model_norm ON worker_node ("cpu_model_normalized");
 
 COMMENT ON TABLE worker_node IS 'Stores information about worker nodes seen by PanDA pilots';
 COMMENT ON COLUMN worker_node."site" IS 'The name of the site (not PanDA queue) where the worker node is located.';
@@ -2964,10 +2966,12 @@ CREATE TABLE cpu_benchmarks (
     "site" VARCHAR(128),
     "score_per_core" NUMERIC(10,2),
     "timestamp" TIMESTAMP,
-    "source" VARCHAR(256)
+    "source" VARCHAR(256),
+    "cpu_type_normalized" VARCHAR(128)
 );
 ALTER TABLE cpu_benchmarks OWNER TO panda;
 
+CREATE INDEX idx_worker_node_cpu_type_norm ON cpu_benchmarks ("cpu_type_normalized");
 
 CREATE TABLE worker_node_metrics (
     "site" VARCHAR(128),