[b/350668065] Update oracle-stats SQLs with feedback from ingestion (GoogleCloudPlatform#463)

Author: misolt

dumper/app/src/main/resources/oracle-stats/awr/hist-cmd-types-awr.sql

@@ -18,16 +18,16 @@ SELECT
   to_char(C.begin_interval_time, 'hh24') "Hour",
   D.name "CommandName",
   count(1) "Count",
-  sum(A.buffer_gets_total) "SumBufferGets",
-  sum(A.elapsed_time_total) "SumElapsedTime",
-  sum(A.rows_processed_total) "SumRowsProcessed",
-  sum(A.executions_total) "SumExecutions",
-  sum(A.cpu_time_total) "SumCpuTime",
-  sum(A.iowait_total) "SumIOWait",
-  sum(A.clwait_total) "SumCLWait",
-  sum(A.apwait_total) "SumAPWait",
-  sum(A.ccwait_total) "SumCCWait",
-  sum(A.plsexec_time_total) "SumPLSExecTime"
+  avg(A.buffer_gets_delta) "AvgBufferGets",
+  avg(A.elapsed_time_delta) "AvgElapsedTime",
+  avg(A.rows_processed_delta) "AvgRowsProcessed",
+  avg(A.executions_delta) "AvgExecutions",
+  avg(A.cpu_time_delta) "AvgCpuTime",
+  avg(A.iowait_delta) "AvgIoWait",
+  avg(A.clwait_delta) "AvgClWait",
+  avg(A.apwait_delta) "AvgApWait",
+  avg(A.ccwait_delta) "AvgCcWait",
+  avg(A.plsexec_time_delta) "AvgPlsExecTime"
 FROM cdb_hist_sqlstat A
 INNER JOIN cdb_hist_sqltext B
   ON A.con_id = B.con_id

dumper/app/src/main/resources/oracle-stats/awr/source-conn-latest.sql

@@ -14,11 +14,11 @@
 -- limitations under the License.
 SELECT
   A.dbid "DbId",
+  to_char(B.begin_interval_time, 'hh24') "Hour",
   A.instance_number "InstanceNumber",
   A.program "Program",
   A.module "Module",
   A.machine "Machine",
-  to_char(B.begin_interval_time, 'hh24') "Hour",
   C.command_name "CommandName",
   count(1) "Count"
 FROM cdb_hist_active_sess_history A

dumper/app/src/main/resources/oracle-stats/awr/sql-stats-awr.sql

@@ -17,24 +17,26 @@ SELECT
     A.dbid "Dbid",
     A.instance_number "InstanceNumber",
     to_char(A.force_matching_signature) "ForceMatchingSignature",
-    min(A.sql_id) "MinSqlId",
+    min(A.sql_id) "SqlId",
     min(B.begin_interval_time) "MinBeginTime",
     max(B.end_interval_time) "MaxEndTime",
-    sum(A.apwait_total) "SumAPWait",
-    sum(A.buffer_gets_total) "SumBufferGets",
-    sum(A.ccwait_total) "SumCCWait",
-    sum(A.clwait_total) "SumCLWait",
-    sum(A.cpu_time_total) "SumCpuTime",
-    sum(A.direct_writes_total) "SumDirectWrites",
-    sum(A.disk_reads_total) "SumDiskReads",
-    sum(A.elapsed_time_total) "SumElapsedTime",
-    sum(A.end_of_fetch_count_total) "SumEndOfFetchCount",
-    sum(A.executions_total) "SumExecutions",
-    sum(A.iowait_total) "SumIOWait",
-    sum(A.javexec_time_total) "SumJavaExec",
-    sum(A.plsexec_time_total) "SumPlsExec",
-    sum(A.px_servers_execs_total) "SumPxExecutions",
-    sum(A.rows_processed_total) "SumRowsProcessed"
+    sum(A.apwait_delta) "ApWaitTotal",
+    sum(A.buffer_gets_delta) "BufferGetsTotal",
+    sum(A.ccwait_delta) "CcWaitTotal",
+    sum(A.clwait_delta) "ClWaitTotal",
+    sum(A.cpu_time_delta) "CpuTimeTotal",
+    sum(A.direct_writes_delta) "DirectWritesTotal",
+    sum(A.disk_reads_delta) "DiskReadsTotal",
+    sum(A.elapsed_time_delta) "ElapsedTimeTotal",
+    sum(A.end_of_fetch_count_delta) "EndOfFetchCountTotal",
+    sum(A.executions_delta) "ExecutionsTotal",
+    sum(A.iowait_delta) "IoWaitTotal",
+    sum(A.javexec_time_delta) "JavaExecTotal",
+    sum(A.physical_read_bytes_delta) "PhysicalReadBytesTotal",
+    sum(A.physical_write_bytes_delta) "PhysicalWriteBytesTotal",
+    sum(A.plsexec_time_delta) "PlsExecTotal",
+    sum(A.px_servers_execs_delta) "PxExecutionsTotal",
+    sum(A.rows_processed_delta) "RowsTotal"
 FROM cdb_hist_sqlstat A
 JOIN cdb_hist_snapshot B
 ON A.dbid = B.dbid

dumper/app/src/main/resources/oracle-stats/native/db-objects.sql

@@ -22,48 +22,28 @@ SELECT
 FROM cdb_objects A
 WHERE A.owner NOT LIKE '%SYS'
   AND A.object_name NOT LIKE 'BIN$%'
+  AND (A.object_type <> 'SYNONYM' OR A.owner <> 'PUBLIC')
 GROUP BY
   A.con_id,
   A.owner,
   A.object_name,
   A.object_type,
   A.editionable
-UNION ALL (
-  SELECT
-    B.con_id "ConId",
-    'SYS' "Owner",
-    B.object_name "ObjectName",
-    'DIRECTORY' "ObjectType",
-    B.editionable "Editionable",
-    count(1) "Count"
-  FROM cdb_objects B
-  WHERE B.owner = 'SYS'
-    AND B.object_type = 'DIRECTORY'
-    AND B.object_name NOT LIKE 'BIN$%'
-  GROUP BY
-    B.con_id,
-    B.owner,
-    B.object_name,
-    B.object_type,
-    B.editionable
-)
-UNION ALL (
-  SELECT
-    C.con_id "ConId",
-    C.owner "Owner",
-    C.object_name "ObjectName",
-    C.object_type "ObjectType",
-    C.editionable "Editionable",
-    count(1) "Count"
-  FROM cdb_objects C
-  WHERE C.owner NOT LIKE '%SYS'
-    AND C.owner <> 'PUBLIC'
-    AND C.object_type = 'SYNONYM'
-    AND C.object_name NOT LIKE 'BIN$%'
-  GROUP BY
-    C.con_id,
-    C.owner,
-    C.editionable,
-    C.object_name,
-    C.object_type
-)
+UNION ALL
+SELECT
+  B.con_id "ConId",
+  'SYS' "Owner",
+  B.object_name "ObjectName",
+  'DIRECTORY' "ObjectType",
+  B.editionable "Editionable",
+  count(1) "Count"
+FROM cdb_objects B
+WHERE B.owner = 'SYS'
+  AND B.object_type = 'DIRECTORY'
+  AND B.object_name NOT LIKE 'BIN$%'
+GROUP BY
+  B.con_id,
+  B.owner,
+  B.object_name,
+  B.object_type,
+  B.editionable

dumper/app/src/main/resources/oracle-stats/native/exttab.sql

@@ -13,12 +13,12 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 SELECT
-  A.con_id,
-  A.owner,
-  A.table_name,
-  A.type_owner,
-  A.type_name,
-  A.default_directory_owner,
-  A.default_directory_name
+  A.con_id "ConId",
+  A.owner "Owner",
+  A.table_name "TableName",
+  A.type_owner "TypeOwner",
+  A.type_name "TypeName",
+  A.default_directory_owner "DefaultDirectoryOwner",
+  A.default_directory_name "DefaultDirectoryName"
 FROM
   cdb_external_tables A