Merge branch 'master' into test-coverage-changes

snowflakedb · Jan 7, 2025 · 05c3136 · 05c3136
2 parents 9333bf1 + d3cef59
commit 05c3136
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -47,7 +47,7 @@ jobs:
               if: github.ref_name == github.event.repository.default_branch && matrix.cloud_provider == 'AWS'
             - uses: actions/setup-python@v5
               with:
-                python-version: '3.7'
+                python-version: '3.13'
                 architecture: 'x64'
             - name: Test
               shell: bash
@@ -92,7 +92,7 @@ jobs:
               if: github.ref_name == github.event.repository.default_branch && matrix.cloud_provider == 'AWS'
             - uses: actions/setup-python@v5
               with:
-                python-version: '3.7'
+                python-version: '3.13'
                 architecture: 'x64'
             - name: Test
               shell: cmd
@@ -138,7 +138,7 @@ jobs:
               if: github.ref_name == github.event.repository.default_branch && matrix.cloud_provider == 'AWS'
             - uses: actions/setup-python@v5
               with:
-                python-version: '3.7'
+                python-version: '3.13'
                 architecture: 'x64'
             - name: Test
               shell: cmd
@@ -206,7 +206,7 @@ jobs:
               run: ci/build_linux.sh
             - uses: actions/setup-python@v5
               with:
-                python-version: '3.7'
+                python-version: '3.13'
                 architecture: 'x64'
             - name: Test on AWS
               shell: bash

diff --git a/cpp/lib/ArrowChunkIterator.cpp b/cpp/lib/ArrowChunkIterator.cpp
@@ -361,7 +361,7 @@ ArrowChunkIterator::getCellAsInt64(size_t colIdx, int64 * out_data, bool rawData
             return status;
         }
 
-        if ((floatData > SF_INT64_MAX) || (floatData < SF_INT64_MIN))
+        if (floatData > static_cast<float64>(SF_INT64_MAX) || floatData < static_cast<float64>(SF_INT64_MIN))
         {
             m_parent->setError(SF_STATUS_ERROR_OUT_OF_RANGE,
                 "Value out of range for int64.");
@@ -408,7 +408,7 @@ ArrowChunkIterator::getCellAsInt64(size_t colIdx, int64 * out_data, bool rawData
         case arrow::Type::type::DOUBLE:
         {
             double dblData = m_columns[colIdx].arrowDouble->Value(m_currRowIndexInBatch);
-            if ((dblData > SF_INT64_MAX) || (dblData < SF_INT64_MIN))
+            if (dblData > static_cast<float64>(SF_INT64_MAX) || dblData < static_cast<float64>(SF_INT64_MIN))
             {
                 m_parent->setError(SF_STATUS_ERROR_OUT_OF_RANGE,
                     "Value out of range for int64.");
@@ -542,7 +542,7 @@ ArrowChunkIterator::getCellAsUint64(size_t colIdx, uint64 * out_data)
     case arrow::Type::type::DOUBLE:
     {
         double dblData = m_columns[colIdx].arrowDouble->Value(m_currRowIndexInBatch);
-        if ((dblData > SF_UINT64_MAX) || (dblData < SF_INT64_MIN))
+        if (dblData > static_cast<double>(SF_UINT64_MAX) || dblData < static_cast<double>(SF_INT64_MIN))
         {
             m_parent->setError(SF_STATUS_ERROR_OUT_OF_RANGE,
                 "Value out of range for uint64.");