[b/350668065] Make column names consistent for sql-stats CSVs (GoogleCloudPlatform#461)

Author: misolt

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

@@ -18,31 +18,23 @@ SELECT
     A.instance_number "InstanceNumber",
     to_char(A.force_matching_signature) "ForceMatchingSignature",
     min(A.sql_id) "MinSqlId",
-    sum(A.executions_delta) "SumExecutionsDelta",
-    sum(A.px_servers_execs_delta) "SumPxServersExecsDelta",
-    sum(A.elapsed_time_total) "SumElapsedTimeTotal",
-    sum(A.disk_reads_delta) "SumDiskReadsDelta",
-    sum(A.physical_read_bytes_delta) "SumPhysicalReadBytesDelta",
-    sum(A.physical_write_bytes_delta) "SumPhysicalWriteBytesDelta",
-    sum(A.io_offload_elig_bytes_delta) "SumIoOffloadEligBytesDelta",
-    sum(A.io_interconnect_bytes_delta) "SumIoInterconnectBytesDelta",
-    sum(A.optimized_physical_reads_delta) "SumOptimizedPhysicalReadsDelta",
-    sum(A.cell_uncompressed_bytes_delta) "SumCellUncompressedBytesDelta",
-    sum(A.io_offload_return_bytes_delta) "SumIoOffloadReturnBytesDelta",
-    sum(A.direct_writes_delta) "SumDirectWritesDelta",
-    sum(A.end_of_fetch_count_delta) "SumEndOfFetchCountDelta",
-    sum(A.rows_processed_delta) "SumRowsProcessedDelta",
-    sum(A.buffer_gets_delta) "SumBufferGetsDelta",
-    sum(A.cpu_time_delta) "SumCpuTimeDelta",
-    sum(A.elapsed_time_delta) "SumElapsedTimeDelta",
-    sum(A.iowait_delta) "SumIowaitDelta",
-    sum(A.clwait_delta) "SumClwaitDelta",
-    sum(A.apwait_delta) "SumApwaitDelta",
-    sum(A.ccwait_delta) "SumCcwaitDelta",
-    sum(A.plsexec_time_delta) "SumPlsexecTimeDelta",
-    sum(A.javexec_time_delta) "SumJavexecTimeDelta",
     min(B.begin_interval_time) "MinBeginTime",
-    max(B.end_interval_time) "MaxEndTime"
+    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"
 FROM cdb_hist_sqlstat A
 JOIN cdb_hist_snapshot B
 ON A.dbid = B.dbid

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

@@ -19,19 +19,19 @@ SELECT
   min(B.sql_id) "MinSqlId",
   sum(B.application_wait_time) "SumAPWait",
   sum(B.buffer_gets) "SumBufferGets",
-  sum(B.cluster_wait_time) "SumClusterWait",
   sum(B.concurrency_wait_time) "SumCCWait",
+  sum(B.cluster_wait_time) "SumCLWait",
   sum(B.cpu_time) "SumCpuTime",
   sum(B.direct_writes) "SumDirectWrites",
   sum(B.disk_reads) "SumDiskReads",
   sum(B.elapsed_time) "SumElapsedTime",
   sum(B.end_of_fetch_count) "SumEndOfFetchCount",
   sum(B.executions) "SumExecutions",
-  sum(B.java_exec_time) "SumJavaExecTime",
-  sum(B.plsql_exec_time) "SumPlsExecTime",
-  sum(B.px_servers_executions) "SumPXExecutions",
-  sum(B.rows_processed) "SumRowsProcessed",
-  sum(B.user_io_wait_time) "SumIOWait"
+  sum(B.user_io_wait_time) "SumIOWait",
+  sum(B.java_exec_time) "SumJavaExec",
+  sum(B.plsql_exec_time) "SumPlsExec",
+  sum(B.px_servers_executions) "SumPxExecutions",
+  sum(B.rows_processed) "SumRowsProcessed"
 FROM
   stats$snapshot A
 INNER JOIN stats$sql_summary B