Merge "Change indexes on Op History table"

2 files changed, 9 insertions, 3 deletions

diff --git a/packages/policy-xacmlpdp-tarball/src/main/resources/mysql/sql/createguardtable.sql b/packages/policy-xacmlpdp-tarball/src/main/resources/mysql/sql/createguardtable.sql
index f2d01fbf..aea02f70 100644
--- a/packages/policy-xacmlpdp-tarball/src/main/resources/mysql/sql/createguardtable.sql
+++ b/packages/policy-xacmlpdp-tarball/src/main/resources/mysql/sql/createguardtable.sql
@@ -1,5 +1,5 @@
 -- ============LICENSE_START=======================================================
--- Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+-- Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
 -- ================================================================================
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ create table if not exists operationshistory (
 );
 
 create index if not exists operationshistory_clreqid_index on
-    operationshistory(closedLoopName, requestId);
+    operationshistory(requestId, closedLoopName);
 
 create index if not exists operationshistory_target_index on
-    operationshistory(target, operation, actor);
+    operationshistory(target, operation, actor, endtime);
diff --git a/testsuites/guard-testing-utils/mysql/sql/testguard.sql b/testsuites/guard-testing-utils/mysql/sql/testguard.sql
index 15ec5767..3840b431 100644
--- a/testsuites/guard-testing-utils/mysql/sql/testguard.sql
+++ b/testsuites/guard-testing-utils/mysql/sql/testguard.sql
@@ -15,5 +15,11 @@ create table if not exists operationshistory (
     PRIMARY KEY (id)
 );
 
+create index if not exists operationshistory_clreqid_index on
+    operationshistory(requestId, closedLoopName);
+
+create index if not exists operationshistory_target_index on
+    operationshistory(target, operation, actor, endtime);
+
 insert into operationshistory (`closedLoopName`,`requestId`,`actor`,`operation`,`target`,`starttime`,`outcome`,`message`,`subrequestId`,`endtime`)
 VALUES('ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3','test001122','SO','VF Module Create','.*',NOW() - INTERVAL 1 HOUR,'SUCCESS',null,null,Now());