From 245abb70c62a85dd8b981fc610a36f51d8467f2e Mon Sep 17 00:00:00 2001
From: misolt <159779777+misolt@users.noreply.github.com>
Date: Fri, 19 Jul 2024 10:35:17 +0200
Subject: [PATCH] [b/352468287] Move all existing SQLs to a 'cdb' subdirectory
 (#476)

Create a new directory for multi-tenant DB systems. Since all existing SQLs are designed for this case, move them to the new directory.
---
 .../application/dumper/connector/oracle/OracleStatsQuery.java   | 2 +-
 .../resources/oracle-stats/{ => cdb}/awr/hist-cmd-types-awr.sql | 0
 .../resources/oracle-stats/{ => cdb}/awr/source-conn-latest.sql | 0
 .../main/resources/oracle-stats/{ => cdb}/awr/sql-stats-awr.sql | 0
 .../oracle-stats/{ => cdb}/native/app-schemas-pdbs.sql          | 0
 .../oracle-stats/{ => cdb}/native/app-schemas-summary.sql       | 0
 .../main/resources/oracle-stats/{ => cdb}/native/data-types.sql | 0
 .../resources/oracle-stats/{ => cdb}/native/db-features.sql     | 0
 .../main/resources/oracle-stats/{ => cdb}/native/db-info.sql    | 0
 .../resources/oracle-stats/{ => cdb}/native/db-instances.sql    | 0
 .../oracle-stats/{ => cdb}/native/db-objects-synonym-public.sql | 0
 .../main/resources/oracle-stats/{ => cdb}/native/db-objects.sql | 0
 .../resources/oracle-stats/{ => cdb}/native/dtl-index-type.sql  | 0
 .../resources/oracle-stats/{ => cdb}/native/dtl-source-code.sql | 0
 .../src/main/resources/oracle-stats/{ => cdb}/native/exttab.sql | 0
 .../resources/oracle-stats/{ => cdb}/native/m-view-types.sql    | 0
 .../main/resources/oracle-stats/{ => cdb}/native/pdbs-info.sql  | 0
 .../resources/oracle-stats/{ => cdb}/native/table-types-dtl.sql | 0
 .../oracle-stats/{ => cdb}/native/used-space-details.sql        | 0
 .../{ => cdb}/statspack/hist-cmd-types-statspack.sql            | 0
 .../oracle-stats/{ => cdb}/statspack/sql-stats-statspack.sql    | 0
 21 files changed, 1 insertion(+), 1 deletion(-)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/awr/hist-cmd-types-awr.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/awr/source-conn-latest.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/awr/sql-stats-awr.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/native/app-schemas-pdbs.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/native/app-schemas-summary.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/native/data-types.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/native/db-features.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/native/db-info.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/native/db-instances.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/native/db-objects-synonym-public.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/native/db-objects.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/native/dtl-index-type.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/native/dtl-source-code.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/native/exttab.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/native/m-view-types.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/native/pdbs-info.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/native/table-types-dtl.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/native/used-space-details.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/statspack/hist-cmd-types-statspack.sql (100%)
 rename dumper/app/src/main/resources/oracle-stats/{ => cdb}/statspack/sql-stats-statspack.sql (100%)

diff --git a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/oracle/OracleStatsQuery.java b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/oracle/OracleStatsQuery.java
index cce76e711..0035ea45a 100644
--- a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/oracle/OracleStatsQuery.java
+++ b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/oracle/OracleStatsQuery.java
@@ -68,7 +68,7 @@ static OracleStatsQuery createStatspack(String name, Duration queriedDuration)
   private static OracleStatsQuery create(
       boolean isRequired, Duration queriedDuration, String name, StatsSource statsSource)
       throws IOException {
-    String path = String.format("oracle-stats/%s/%s.sql", statsSource.value, name);
+    String path = String.format("oracle-stats/cdb/%s/%s.sql", statsSource.value, name);
     return new AutoValue_OracleStatsQuery(
         isRequired, queriedDuration, name, loadFile(path), statsSource);
   }
diff --git a/dumper/app/src/main/resources/oracle-stats/awr/hist-cmd-types-awr.sql b/dumper/app/src/main/resources/oracle-stats/cdb/awr/hist-cmd-types-awr.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/awr/hist-cmd-types-awr.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/awr/hist-cmd-types-awr.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/awr/source-conn-latest.sql b/dumper/app/src/main/resources/oracle-stats/cdb/awr/source-conn-latest.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/awr/source-conn-latest.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/awr/source-conn-latest.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/awr/sql-stats-awr.sql b/dumper/app/src/main/resources/oracle-stats/cdb/awr/sql-stats-awr.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/awr/sql-stats-awr.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/awr/sql-stats-awr.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/native/app-schemas-pdbs.sql b/dumper/app/src/main/resources/oracle-stats/cdb/native/app-schemas-pdbs.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/native/app-schemas-pdbs.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/native/app-schemas-pdbs.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/native/app-schemas-summary.sql b/dumper/app/src/main/resources/oracle-stats/cdb/native/app-schemas-summary.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/native/app-schemas-summary.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/native/app-schemas-summary.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/native/data-types.sql b/dumper/app/src/main/resources/oracle-stats/cdb/native/data-types.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/native/data-types.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/native/data-types.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/native/db-features.sql b/dumper/app/src/main/resources/oracle-stats/cdb/native/db-features.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/native/db-features.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/native/db-features.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/native/db-info.sql b/dumper/app/src/main/resources/oracle-stats/cdb/native/db-info.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/native/db-info.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/native/db-info.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/native/db-instances.sql b/dumper/app/src/main/resources/oracle-stats/cdb/native/db-instances.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/native/db-instances.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/native/db-instances.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/native/db-objects-synonym-public.sql b/dumper/app/src/main/resources/oracle-stats/cdb/native/db-objects-synonym-public.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/native/db-objects-synonym-public.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/native/db-objects-synonym-public.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/native/db-objects.sql b/dumper/app/src/main/resources/oracle-stats/cdb/native/db-objects.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/native/db-objects.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/native/db-objects.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/native/dtl-index-type.sql b/dumper/app/src/main/resources/oracle-stats/cdb/native/dtl-index-type.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/native/dtl-index-type.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/native/dtl-index-type.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/native/dtl-source-code.sql b/dumper/app/src/main/resources/oracle-stats/cdb/native/dtl-source-code.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/native/dtl-source-code.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/native/dtl-source-code.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/native/exttab.sql b/dumper/app/src/main/resources/oracle-stats/cdb/native/exttab.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/native/exttab.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/native/exttab.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/native/m-view-types.sql b/dumper/app/src/main/resources/oracle-stats/cdb/native/m-view-types.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/native/m-view-types.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/native/m-view-types.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/native/pdbs-info.sql b/dumper/app/src/main/resources/oracle-stats/cdb/native/pdbs-info.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/native/pdbs-info.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/native/pdbs-info.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/native/table-types-dtl.sql b/dumper/app/src/main/resources/oracle-stats/cdb/native/table-types-dtl.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/native/table-types-dtl.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/native/table-types-dtl.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/native/used-space-details.sql b/dumper/app/src/main/resources/oracle-stats/cdb/native/used-space-details.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/native/used-space-details.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/native/used-space-details.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/statspack/hist-cmd-types-statspack.sql b/dumper/app/src/main/resources/oracle-stats/cdb/statspack/hist-cmd-types-statspack.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/statspack/hist-cmd-types-statspack.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/statspack/hist-cmd-types-statspack.sql
diff --git a/dumper/app/src/main/resources/oracle-stats/statspack/sql-stats-statspack.sql b/dumper/app/src/main/resources/oracle-stats/cdb/statspack/sql-stats-statspack.sql
similarity index 100%
rename from dumper/app/src/main/resources/oracle-stats/statspack/sql-stats-statspack.sql
rename to dumper/app/src/main/resources/oracle-stats/cdb/statspack/sql-stats-statspack.sql