From 84dcde0f3a57352308b177e53422ab3e25f179ee Mon Sep 17 00:00:00 2001
From: Igor Dianov <igor@dianov.com>
Date: Mon, 16 Sep 2024 06:12:55 -0700
Subject: [PATCH 1/3] AAE-25756 Add Query service schema index for task id,name
 and status attributes

---
 .../26-alter.oracle.schema.8.7.0.sql          | 17 ++++++++++++++++
 .../changelog/26-alter.pg.schema.8.7.0.sql    | 17 ++++++++++++++++
 .../query/liquibase/changelog/h2.schema.sql   |  1 +
 .../config/query/liquibase/master.xml         | 20 +++++++++++++++++++
 4 files changed, 55 insertions(+)
 create mode 100644 activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/26-alter.oracle.schema.8.7.0.sql
 create mode 100644 activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/26-alter.pg.schema.8.7.0.sql

diff --git a/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/26-alter.oracle.schema.8.7.0.sql b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/26-alter.oracle.schema.8.7.0.sql
new file mode 100644
index 0000000000..d72b1cfc42
--- /dev/null
+++ b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/26-alter.oracle.schema.8.7.0.sql
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2017-2020 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+CREATE INDEX idx_task_id_name_status ON task(id, name, status);
diff --git a/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/26-alter.pg.schema.8.7.0.sql b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/26-alter.pg.schema.8.7.0.sql
new file mode 100644
index 0000000000..d72b1cfc42
--- /dev/null
+++ b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/26-alter.pg.schema.8.7.0.sql
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2017-2020 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+CREATE INDEX idx_task_id_name_status ON task(id, name, status);
diff --git a/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/h2.schema.sql b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/h2.schema.sql
index a20a95cc05..a913c81fea 100644
--- a/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/h2.schema.sql
+++ b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/h2.schema.sql
@@ -312,3 +312,4 @@ alter table task_process_variable
 create index idx_task_assignee on task(assignee);
 create index idx_task_owner on task(owner);
 create index idx_process_instance_initiator on process_instance(initiator);
+CREATE INDEX idx_task_id_name_status ON task(id, name, status);
diff --git a/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/master.xml b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/master.xml
index de74ddc83d..6f1fed846c 100644
--- a/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/master.xml
+++ b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/master.xml
@@ -522,4 +522,24 @@
              stripComments="true"/>
   </changeSet>
 
+  <changeSet author="activiti-query" runInTransaction="false"
+             id="alter26-oracle-schema" dbms="oracle">
+    <sqlFile dbms="oracle"
+             encoding="utf8"
+             path="changelog/26-alter.oracle.schema.8.7.0.sql"
+             relativeToChangelogFile="true"
+             splitStatements="false"
+             stripComments="true"/>
+  </changeSet>
+
+  <changeSet author="activiti-query" runInTransaction="false"
+             id="alter26-schema" dbms="postgresql">
+    <sqlFile dbms="postgresql"
+             encoding="utf8"
+             path="changelog/26-alter.pg.schema.8.7.0.sql"
+             relativeToChangelogFile="true"
+             splitStatements="true"
+             stripComments="true"/>
+  </changeSet>
+
 </databaseChangeLog>

From 0524348a1907983d54d26c3e23e8fbab8936179b Mon Sep 17 00:00:00 2001
From: Tommaso D'Alessandro <tommaso.dalessandro@hyland.com>
Date: Fri, 20 Sep 2024 12:36:26 +0200
Subject: [PATCH 2/3] AAE-25874 add indexes

---
 .../27-alter.oracle.schema.8.7.0.sql          | 18 +++++++++++++++++
 .../changelog/27-alter.pg.schema.8.7.0.sql    | 18 +++++++++++++++++
 .../query/liquibase/changelog/h2.schema.sql   |  2 ++
 .../config/query/liquibase/master.xml         | 20 +++++++++++++++++++
 4 files changed, 58 insertions(+)
 create mode 100644 activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/27-alter.oracle.schema.8.7.0.sql
 create mode 100644 activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/27-alter.pg.schema.8.7.0.sql

diff --git a/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/27-alter.oracle.schema.8.7.0.sql b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/27-alter.oracle.schema.8.7.0.sql
new file mode 100644
index 0000000000..0c6a16040e
--- /dev/null
+++ b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/27-alter.oracle.schema.8.7.0.sql
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017-2020 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+CREATE INDEX idx_task_process_var_taskId_processVarId ON task_process_variable (task_id, process_variable_id);
+CREATE INDEX idx_task_createdDate ON task (created_date);
diff --git a/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/27-alter.pg.schema.8.7.0.sql b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/27-alter.pg.schema.8.7.0.sql
new file mode 100644
index 0000000000..0c6a16040e
--- /dev/null
+++ b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/27-alter.pg.schema.8.7.0.sql
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017-2020 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+CREATE INDEX idx_task_process_var_taskId_processVarId ON task_process_variable (task_id, process_variable_id);
+CREATE INDEX idx_task_createdDate ON task (created_date);
diff --git a/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/h2.schema.sql b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/h2.schema.sql
index a913c81fea..32387737c6 100644
--- a/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/h2.schema.sql
+++ b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/h2.schema.sql
@@ -313,3 +313,5 @@ create index idx_task_assignee on task(assignee);
 create index idx_task_owner on task(owner);
 create index idx_process_instance_initiator on process_instance(initiator);
 CREATE INDEX idx_task_id_name_status ON task(id, name, status);
+CREATE INDEX idx_task_process_var_taskId_processVarId ON task_process_variable (task_id, process_variable_id);
+CREATE INDEX idx_task_createdDate ON task (created_date);
diff --git a/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/master.xml b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/master.xml
index 6f1fed846c..ba018ce0e4 100644
--- a/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/master.xml
+++ b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/master.xml
@@ -542,4 +542,24 @@
              stripComments="true"/>
   </changeSet>
 
+  <changeSet author="activiti-query" runInTransaction="false"
+             id="alter27-oracle-schema" dbms="oracle">
+    <sqlFile dbms="oracle"
+             encoding="utf8"
+             path="changelog/27-alter.oracle.schema.8.7.0.sql"
+             relativeToChangelogFile="true"
+             splitStatements="false"
+             stripComments="true"/>
+  </changeSet>
+
+  <changeSet author="activiti-query" runInTransaction="false"
+             id="alter27-schema" dbms="postgresql">
+    <sqlFile dbms="postgresql"
+             encoding="utf8"
+             path="changelog/27-alter.pg.schema.8.7.0.sql"
+             relativeToChangelogFile="true"
+             splitStatements="true"
+             stripComments="true"/>
+  </changeSet>
+
 </databaseChangeLog>

From 81ec637b1cfbae49261ee5098f98e2e880d034e7 Mon Sep 17 00:00:00 2001
From: Tommaso D'Alessandro <tommaso.dalessandro@hyland.com>
Date: Mon, 30 Sep 2024 09:09:53 +0200
Subject: [PATCH 3/3] Update h2.schema.sql

---
 .../resources/config/query/liquibase/changelog/h2.schema.sql     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/h2.schema.sql b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/h2.schema.sql
index de977b555d..11f3c07287 100644
--- a/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/h2.schema.sql
+++ b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-liquibase/src/main/resources/config/query/liquibase/changelog/h2.schema.sql
@@ -312,6 +312,5 @@ alter table task_process_variable
 create index idx_task_assignee on task(assignee);
 create index idx_task_owner on task(owner);
 create index idx_process_instance_initiator on process_instance(initiator);
-CREATE INDEX idx_task_id_name_status ON task(id, name, status);
 CREATE INDEX idx_task_process_var_taskId_processVarId ON task_process_variable (task_id, process_variable_id);
 CREATE INDEX idx_task_createdDate ON task (created_date);