Improvements and comments fixed

microsoft · bewithgaurav · Nov 12, 2025 · Nov 10, 2025 · Nov 10, 2025 · Nov 10, 2025
commit e3258cdbfc23aef9acd119a50fecd36ca183fc12
diff --git a/.gitignore b/.gitignore
@@ -38,6 +38,14 @@ build/
 *.pyd
 *.pdb
 
+# ODBC driver binaries (modified by build scripts with install_name_tool/patchelf/codesigning)
+# macOS
+mssql_python/libs/macos/*/lib/*.dylib
+# Linux
+mssql_python/libs/linux/*/*/lib/*.so*
+# Windows
+mssql_python/libs/windows/*/*.dll
+
 # IDE files
 .vscode/
 .idea/

diff --git a/mssql_python/pybind/build.sh b/mssql_python/pybind/build.sh
@@ -118,6 +118,21 @@ else
             else
                 echo "[WARNING] macOS dylib configuration encountered issues"
             fi
+
+            # Codesign the Python extension module (.so file) to prevent SIP crashes
+            echo "[ACTION] Codesigning Python extension module..."
+            SO_FILE="$PARENT_DIR/"*.so
+            for so in $SO_FILE; do
+                if [ -f "$so" ]; then
+                    echo "  Signing: $so"
+                    codesign -s - -f "$so" 2>/dev/null
+                    if [ $? -eq 0 ]; then
+                        echo "[SUCCESS] Python extension codesigned: $so"
+                    else
+                        echo "[WARNING] Failed to codesign: $so"
+                    fi
+                fi
+            done
         fi
     else
         echo "[ERROR] Failed to copy .so file"

diff --git a/mssql_python/pybind/ddbc_bindings.cpp b/mssql_python/pybind/ddbc_bindings.cpp
@@ -3175,7 +3175,7 @@ SQLRETURN FetchBatchData(SQLHSTMT hStmt, ColumnBuffers& buffers, py::list& colum
 
     std::string decimalSeparator = GetDecimalSeparator();  // Cache decimal separator
 
-    // OPTIMIZATION #5: Build function pointer dispatch table (once per batch)
+    // Performance: Build function pointer dispatch table (once per batch)
     // This eliminates the switch statement from the hot loop - 10,000 rows × 10 cols
     // reduces from 100,000 switch evaluations to just 10 switch evaluations
     std::vector<ColumnProcessor> columnProcessors(numCols);
@@ -3237,10 +3237,9 @@ SQLRETURN FetchBatchData(SQLHSTMT hStmt, ColumnBuffers& buffers, py::list& colum
         }
     }
 
-    size_t initialSize = rows.size();
-
-    // OPTIMIZATION #4: Pre-allocate outer list to avoid PyList_Append reallocations
-    // Directly create and fill rows in one pass to prevent data corruption window
+    // Performance: Single-phase row creation pattern
+    // Create each row, fill it completely, then append to results list
+    // This prevents data corruption (no partially-filled rows) and simplifies error handling
     PyObject* rowsList = rows.ptr();
 
     for (SQLULEN i = 0; i < numRowsFetched; i++) {
@@ -3252,8 +3251,8 @@ SQLRETURN FetchBatchData(SQLHSTMT hStmt, ColumnBuffers& buffers, py::list& colum
         }
 
         for (SQLUSMALLINT col = 1; col <= numCols; col++) {
-            // OPTIMIZATION #6: Consistent NULL checking - check BEFORE calling processor functions
-            // This eliminates redundant NULL checks inside each processor and improves branch prediction
+            // Performance: Centralized NULL checking before calling processor functions
+            // This eliminates redundant NULL checks inside each processor and improves CPU branch prediction
             SQLLEN dataLen = buffers.indicators[col - 1][i];
 
             // Handle NULL and special indicator values first (applies to ALL types)
@@ -3269,7 +3268,7 @@ SQLRETURN FetchBatchData(SQLHSTMT hStmt, ColumnBuffers& buffers, py::list& colum
                 continue;
             }
 
-            // OPTIMIZATION #5: Use function pointer if available (fast path for common types)
+            // Performance: Use function pointer dispatch for simple types (fast path)
             // This eliminates the switch statement from hot loop - reduces 100,000 switch 
             // evaluations (1000 rows × 10 cols × 10 types) to just 10 (setup only)
             // Note: Processor functions no longer need to check for NULL since we do it above

diff --git a/mssql_python/pybind/ddbc_bindings.h b/mssql_python/pybind/ddbc_bindings.h
@@ -615,7 +615,7 @@ struct ColumnBuffers {
           indicators(numCols, std::vector<SQLLEN>(fetchSize)) {}
 };
 
-// OPTIMIZATION #4: Column processor function type - processes one cell
+// Performance: Column processor function type for fast type conversion
 // Using function pointers eliminates switch statement overhead in the hot loop
 typedef void (*ColumnProcessor)(PyObject* row, ColumnBuffers& buffers, const void* colInfo, 
                                  SQLUSMALLINT col, SQLULEN rowIdx, SQLHSTMT hStmt);
@@ -639,10 +639,10 @@ namespace ColumnProcessors {
 // Process SQL INTEGER (4-byte int) column into Python int
 // SAFETY: PyList_SET_ITEM is safe here because row is freshly allocated with PyList_New()
 //         and each slot is filled exactly once (NULL -> value)
-// NOTE: NULL check removed - handled centrally before processor is called (OPTIMIZATION #6)
+// Performance: NULL check removed - handled centrally before processor is called
 inline void ProcessInteger(PyObject* row, ColumnBuffers& buffers, const void*, SQLUSMALLINT col, 
                            SQLULEN rowIdx, SQLHSTMT) {
-    // OPTIMIZATION #2: Direct Python C API call (bypasses pybind11)
+    // Performance: Direct Python C API call (bypasses pybind11 overhead)
     PyObject* pyInt = PyLong_FromLong(buffers.intBuffers[col - 1][rowIdx]);
     if (!pyInt) {  // Handle memory allocation failure
         Py_INCREF(Py_None);
@@ -653,10 +653,10 @@ inline void ProcessInteger(PyObject* row, ColumnBuffers& buffers, const void*, S
 }
 
 // Process SQL SMALLINT (2-byte int) column into Python int
-// NOTE: NULL check removed - handled centrally before processor is called (OPTIMIZATION #6)
+// Performance: NULL check removed - handled centrally before processor is called
 inline void ProcessSmallInt(PyObject* row, ColumnBuffers& buffers, const void*, SQLUSMALLINT col, 
                             SQLULEN rowIdx, SQLHSTMT) {
-    // OPTIMIZATION #2: Direct Python C API call
+    // Performance: Direct Python C API call
     PyObject* pyInt = PyLong_FromLong(buffers.smallIntBuffers[col - 1][rowIdx]);
     if (!pyInt) {  // Handle memory allocation failure
         Py_INCREF(Py_None);
@@ -667,10 +667,10 @@ inline void ProcessSmallInt(PyObject* row, ColumnBuffers& buffers, const void*,
 }
 
 // Process SQL BIGINT (8-byte int) column into Python int
-// NOTE: NULL check removed - handled centrally before processor is called (OPTIMIZATION #6)
+// Performance: NULL check removed - handled centrally before processor is called
 inline void ProcessBigInt(PyObject* row, ColumnBuffers& buffers, const void*, SQLUSMALLINT col, 
                           SQLULEN rowIdx, SQLHSTMT) {
-    // OPTIMIZATION #2: Direct Python C API call
+    // Performance: Direct Python C API call
     PyObject* pyInt = PyLong_FromLongLong(buffers.bigIntBuffers[col - 1][rowIdx]);
     if (!pyInt) {  // Handle memory allocation failure
         Py_INCREF(Py_None);
@@ -681,10 +681,10 @@ inline void ProcessBigInt(PyObject* row, ColumnBuffers& buffers, const void*, SQ
 }
 
 // Process SQL TINYINT (1-byte unsigned int) column into Python int
-// NOTE: NULL check removed - handled centrally before processor is called (OPTIMIZATION #6)
+// Performance: NULL check removed - handled centrally before processor is called
 inline void ProcessTinyInt(PyObject* row, ColumnBuffers& buffers, const void*, SQLUSMALLINT col, 
                            SQLULEN rowIdx, SQLHSTMT) {
-    // OPTIMIZATION #2: Direct Python C API call
+    // Performance: Direct Python C API call
     PyObject* pyInt = PyLong_FromLong(buffers.charBuffers[col - 1][rowIdx]);
     if (!pyInt) {  // Handle memory allocation failure
         Py_INCREF(Py_None);
@@ -695,10 +695,10 @@ inline void ProcessTinyInt(PyObject* row, ColumnBuffers& buffers, const void*, S
 }
 
 // Process SQL BIT column into Python bool
-// NOTE: NULL check removed - handled centrally before processor is called (OPTIMIZATION #6)
+// Performance: NULL check removed - handled centrally before processor is called
 inline void ProcessBit(PyObject* row, ColumnBuffers& buffers, const void*, SQLUSMALLINT col, 
                        SQLULEN rowIdx, SQLHSTMT) {
-    // OPTIMIZATION #2: Direct Python C API call (converts 0/1 to True/False)
+    // Performance: Direct Python C API call (converts 0/1 to True/False)
     PyObject* pyBool = PyBool_FromLong(buffers.charBuffers[col - 1][rowIdx]);
     if (!pyBool) {  // Handle memory allocation failure
         Py_INCREF(Py_None);
@@ -709,10 +709,10 @@ inline void ProcessBit(PyObject* row, ColumnBuffers& buffers, const void*, SQLUS
 }
 
 // Process SQL REAL (4-byte float) column into Python float
-// NOTE: NULL check removed - handled centrally before processor is called (OPTIMIZATION #6)
+// Performance: NULL check removed - handled centrally before processor is called
 inline void ProcessReal(PyObject* row, ColumnBuffers& buffers, const void*, SQLUSMALLINT col, 
                         SQLULEN rowIdx, SQLHSTMT) {
-    // OPTIMIZATION #2: Direct Python C API call
+    // Performance: Direct Python C API call
     PyObject* pyFloat = PyFloat_FromDouble(buffers.realBuffers[col - 1][rowIdx]);
     if (!pyFloat) {  // Handle memory allocation failure
         Py_INCREF(Py_None);
@@ -723,10 +723,10 @@ inline void ProcessReal(PyObject* row, ColumnBuffers& buffers, const void*, SQLU
 }
 
 // Process SQL DOUBLE/FLOAT (8-byte float) column into Python float
-// NOTE: NULL check removed - handled centrally before processor is called (OPTIMIZATION #6)
+// Performance: NULL check removed - handled centrally before processor is called
 inline void ProcessDouble(PyObject* row, ColumnBuffers& buffers, const void*, SQLUSMALLINT col, 
                           SQLULEN rowIdx, SQLHSTMT) {
-    // OPTIMIZATION #2: Direct Python C API call
+    // Performance: Direct Python C API call
     PyObject* pyFloat = PyFloat_FromDouble(buffers.doubleBuffers[col - 1][rowIdx]);
     if (!pyFloat) {  // Handle memory allocation failure
         Py_INCREF(Py_None);
@@ -737,7 +737,7 @@ inline void ProcessDouble(PyObject* row, ColumnBuffers& buffers, const void*, SQ
 }
 
 // Process SQL CHAR/VARCHAR (single-byte string) column into Python str
-// NOTE: NULL/NO_TOTAL checks removed - handled centrally before processor is called (OPTIMIZATION #6)
+// Performance: NULL/NO_TOTAL checks removed - handled centrally before processor is called
 inline void ProcessChar(PyObject* row, ColumnBuffers& buffers, const void* colInfoPtr, 
                         SQLUSMALLINT col, SQLULEN rowIdx, SQLHSTMT hStmt) {
     const ColumnInfoExt* colInfo = static_cast<const ColumnInfoExt*>(colInfoPtr);
@@ -759,7 +759,7 @@ inline void ProcessChar(PyObject* row, ColumnBuffers& buffers, const void* colIn
     // Fast path: Data fits in buffer (not LOB or truncated)
     // fetchBufferSize includes null-terminator, numCharsInData doesn't. Hence '<'
     if (!colInfo->isLob && numCharsInData < colInfo->fetchBufferSize) {
-        // OPTIMIZATION #2: Direct Python C API call - create string from buffer
+        // Performance: Direct Python C API call - create string from buffer
         PyObject* pyStr = PyUnicode_FromStringAndSize(
             reinterpret_cast<char*>(&buffers.charBuffers[col - 1][rowIdx * colInfo->fetchBufferSize]),
             numCharsInData);
@@ -776,7 +776,7 @@ inline void ProcessChar(PyObject* row, ColumnBuffers& buffers, const void* colIn
 }
 
 // Process SQL NCHAR/NVARCHAR (wide/Unicode string) column into Python str
-// NOTE: NULL/NO_TOTAL checks removed - handled centrally before processor is called (OPTIMIZATION #6)
+// Performance: NULL/NO_TOTAL checks removed - handled centrally before processor is called
 inline void ProcessWChar(PyObject* row, ColumnBuffers& buffers, const void* colInfoPtr, 
                          SQLUSMALLINT col, SQLULEN rowIdx, SQLHSTMT hStmt) {
     const ColumnInfoExt* colInfo = static_cast<const ColumnInfoExt*>(colInfoPtr);
@@ -799,7 +799,7 @@ inline void ProcessWChar(PyObject* row, ColumnBuffers& buffers, const void* colI
     // fetchBufferSize includes null-terminator, numCharsInData doesn't. Hence '<'
     if (!colInfo->isLob && numCharsInData < colInfo->fetchBufferSize) {
 #if defined(__APPLE__) || defined(__linux__)
-        // OPTIMIZATION #1: Direct UTF-16 decode (SQLWCHAR is 2 bytes on Linux/macOS)
+        // Performance: Direct UTF-16 decode (SQLWCHAR is 2 bytes on Linux/macOS)
         SQLWCHAR* wcharData = &buffers.wcharBuffers[col - 1][rowIdx * colInfo->fetchBufferSize];
         PyObject* pyStr = PyUnicode_DecodeUTF16(
             reinterpret_cast<const char*>(wcharData),
@@ -814,7 +814,7 @@ inline void ProcessWChar(PyObject* row, ColumnBuffers& buffers, const void* colI
             PyList_SET_ITEM(row, col - 1, PyUnicode_FromStringAndSize("", 0));
         }
 #else
-        // OPTIMIZATION #2: Direct Python C API call (Windows where SQLWCHAR == wchar_t)
+        // Performance: Direct Python C API call (Windows where SQLWCHAR == wchar_t)
         PyObject* pyStr = PyUnicode_FromWideChar(
             reinterpret_cast<wchar_t*>(&buffers.wcharBuffers[col - 1][rowIdx * colInfo->fetchBufferSize]),
             numCharsInData);
@@ -832,7 +832,7 @@ inline void ProcessWChar(PyObject* row, ColumnBuffers& buffers, const void* colI
 }
 
 // Process SQL BINARY/VARBINARY (binary data) column into Python bytes
-// NOTE: NULL/NO_TOTAL checks removed - handled centrally before processor is called (OPTIMIZATION #6)
+// Performance: NULL/NO_TOTAL checks removed - handled centrally before processor is called
 inline void ProcessBinary(PyObject* row, ColumnBuffers& buffers, const void* colInfoPtr, 
                           SQLUSMALLINT col, SQLULEN rowIdx, SQLHSTMT hStmt) {
     const ColumnInfoExt* colInfo = static_cast<const ColumnInfoExt*>(colInfoPtr);
@@ -852,7 +852,7 @@ inline void ProcessBinary(PyObject* row, ColumnBuffers& buffers, const void* col
 
     // Fast path: Data fits in buffer (not LOB or truncated)
     if (!colInfo->isLob && static_cast<size_t>(dataLen) <= colInfo->processedColumnSize) {
-        // OPTIMIZATION #2: Direct Python C API call - create bytes from buffer
+        // Performance: Direct Python C API call - create bytes from buffer
         PyObject* pyBytes = PyBytes_FromStringAndSize(
             reinterpret_cast<const char*>(&buffers.charBuffers[col - 1][rowIdx * colInfo->processedColumnSize]),
             dataLen);