Merge branch 'bewithgaurav/perf-check-CI' into saumya/pref-setup

Author: bewithgaurav

benchmarks/perf-benchmarking.py

@@ -28,6 +28,11 @@
 
 # Configuration
 CONN_STR = os.getenv("DB_CONNECTION_STRING")
+
+# Ensure pyodbc connection string has ODBC driver specified
+if CONN_STR and 'Driver=' not in CONN_STR:
+    CONN_STR = f"Driver={{ODBC Driver 18 for SQL Server}};{CONN_STR}"
+
 NUM_ITERATIONS = 5  # Number of times to run each test for averaging
 
 # SQL Queries
@@ -284,11 +289,11 @@ def main():
         print(f"\nRunning: {name}")
         print(f"  Testing with pyodbc... ", end="", flush=True)
         pyodbc_result = run_benchmark_pyodbc(query, name, NUM_ITERATIONS)
-        print(f"✓ (avg: {pyodbc_result.avg_time:.4f}s)")
+        print(f"OK (avg: {pyodbc_result.avg_time:.4f}s)")
 
         print(f"  Testing with mssql-python... ", end="", flush=True)
         mssql_python_result = run_benchmark_mssql_python(query, name, NUM_ITERATIONS)
-        print(f"✓ (avg: {mssql_python_result.avg_time:.4f}s)")
+        print(f"OK (avg: {mssql_python_result.avg_time:.4f}s)")
 
         all_results.append((pyodbc_result, mssql_python_result))
 

eng/pipelines/pr-validation-pipeline.yml

@@ -590,6 +590,19 @@ jobs:
           -e DB_CONNECTION_STRING="Server=$SQLSERVER_IP;Database=AdventureWorks2022;Uid=SA;Pwd=$(DB_PASSWORD);TrustServerCertificate=yes" \
           test-container-$(distroName) bash -c "
           source /opt/venv/bin/activate
+          
+          echo 'Reinstalling ODBC Driver for benchmarking...'
+          export DEBIAN_FRONTEND=noninteractive
+          
+          # Add Microsoft repository
+          curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
+          curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | tee /etc/apt/sources.list.d/mssql-release.list
+          apt-get update
+          
+          # Install ODBC Driver 18
+          ACCEPT_EULA=Y apt-get install -y msodbcsql18
+          apt-get install -y unixodbc-dev
+          
           echo 'Installing pyodbc for benchmarking...'
           pip install pyodbc
           echo 'Running performance benchmarks on $(distroName)'