Add spinner

Author: kpiotrowski

warehouse-discovery-scripts/oracle/README.md

@@ -37,7 +37,7 @@ Run the script from your terminal, passing the Oracle connection string as the f
 The script's behavior can be customized by modifying the variables within the script itself:
 
 - `ORACLE_CONN`: The Oracle connection string. This is passed as a command-line argument, as shown in the usage example.
-- `DURATION_DAYS`: The number of days of historical data to collect for AWR-based queries. Defaults to 30.
+- `DURATION_DAYS`: The number of days of historical data to collect for AWR-based queries. Defaults to 7.
 - `OUTPUT_DIR`: The directory where the generated CSV files will be stored. The script will create this directory if it doesn't already exist. Defaults to ./out.
 - `DISCOVERY_SQLS`: An array of SQL script filenames to be executed. You can easily add or remove scripts from this list to customize your data collection.
 

warehouse-discovery-scripts/oracle/export.sql

@@ -2,6 +2,7 @@ WHENEVER SQLERROR EXIT 1;
 
 -- Set SQL*Plus environment options for CSV output
 SET HEADING ON
+SET FEEDBACK OFF
 SET TERMOUT OFF
 SET PAGESIZE 0
 SET LINESIZE 32767
@@ -11,20 +12,22 @@ set UNDERLINE OFF
 SET MARKUP CSV ON
 
 -- Accept the input file name and output file name as arguments
-DEFINE INPUT_FILE = &1
+DEFINE INPUT_SCRIPT = &1
 DEFINE OUTPUT_FILE = &2
+DEFINE DURATION_DAYS = &3
 
 -- Spool the output to the specified CSV file
 SPOOL &OUTPUT_FILE
 
 -- Execute the SQL statement from the input file
-@&INPUT_FILE;
+@&INPUT_SCRIPT &DURATION_DAYS;
 /
 
 -- Stop spooling
 SPOOL OFF;
 
 -- Reset SQL*Plus environment options
+SET FEEDBACK ON
 SET TERMOUT ON;
 SET PAGESIZE 50;
 SET LINESIZE 80;

warehouse-discovery-scripts/oracle/spinner.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Function to show the spinner animation
+show_spinner() {
+    local -a chars=('/' '-' '\' '|')
+    local i=0
+    while true; do
+        printf "\r${chars[$i]} "
+        i=$(( (i+1) % ${#chars[@]} ))
+        sleep 0.1
+    done
+}
+
+# Function to stop the spinner
+stop_spinner() {
+    SPINNER_PID=$1
+    kill $SPINNER_PID &>/dev/null
+    wait $SPINNER_PID &>/dev/null
+    printf "\r" # Clears the spinner line
+}

warehouse-discovery-scripts/oracle/tco_discovery.sh

@@ -1,18 +1,22 @@
 #!/bin/bash
 
+source spinner.sh
+
 ORACLE_CONN="$1"
-DURATION_DAYS=30
+DURATION_DAYS=7
 OUTPUT_DIR="./out"
 DISCOVERY_SQLS=(
-    "awr/sys-metric-history.sql"        # CDB_HIST_SYSMETRIC_HISTORY - historical system statistics like CPU usage
-    "awr/segment-stats.sql"             # CDB_HIST_SEG_STAT - historical segment statistics
     "native/used-space-details.sql"     # CDB_SEGMENTS - used space
     "native/osstat.sql"                 # GV$OSSTAT - System statistics like NUM_CPUS
     "native/cell-config.sql"            # GV$CELL -  exadata cell configuration
     "native/db-info.sql"                # V$DATABASE - Database info
     "native/app-schemas-pdbs.sql"       # CDB_PDBS - Pluggable databases info
+    "awr/sys-metric-history.sql"        # CDB_HIST_SYSMETRIC_HISTORY - historical system statistics like CPU usage
+    "awr/segment-stats.sql"             # CDB_HIST_SEG_STAT - historical segment statistics
 )
 DISCOVERY_SQL_DIR="$(dirname "$0")/../../dumper/app/src/main/resources/oracle-stats/cdb"
+TMP_QUERY_FILE=".query.sql"
+EXPORT_SCRIPT="export.sql"
 mkdir -p "$OUTPUT_DIR"
 
 # Run each SQL query and export result to CSV file
@@ -23,12 +27,19 @@ for sql_file in "${DISCOVERY_SQLS[@]}"; do
 
   if [ -f "$file_path" ]; then
     echo "[INFO]: Executing $base_name.sql"
-    SQL_OUTPUT=$(sqlplus -s "$ORACLE_CONN" @export.sql "$file_path" "$output_csv" "$DURATION_DAYS" 2>&1)
+
+    # Replace JDBC variable placeholder '?' with SQL*Plus substitution 
+    sed 's/?/\&1/' "$file_path" > "$TMP_QUERY_FILE"
+
+    # Show spinner
+    show_spinner &
+    SPINNER_PID=$!
+
+    # Run SQL*Plus
+    sqlplus -s "$ORACLE_CONN" "@$EXPORT_SCRIPT" "$TMP_QUERY_FILE" "$output_csv" "$DURATION_DAYS"
+    stop_spinner "$SPINNER_PID"
     if [ $? -ne 0 ]; then
       echo "[ERROR]: $base_name extraction failed."
-      echo "--- Error Output ---"
-      echo "$SQL_OUTPUT"
-      echo "--------------------"
     else
       echo "[SUCCESS]: $base_name.sql extraction ran without errors."
     fi
@@ -47,3 +58,4 @@ EOL
 
 # Build final ZIP artifact that can be used with BigQuery Migration Assessment.
 zip -j "oracle_assessment_tco.zip" $OUTPUT_DIR/*.csv $OUTPUT_DIR/*.yaml 
+rm -rf "$TMP_QUERY_FILE"