...

Author: JohanMabille

.github/workflows/windows.yml

@@ -35,19 +35,19 @@ jobs:
             gnu-flags: "-m64",
             msvc-dev-cmd: "win64"
           }
-          #- {
-          #  name: "Win32",
-          #  vs-flags: "-A Win32", # only used by VS generator
-          #  cl-flags: "/arch (x86)",
-          #  gnu-flags: "-m32",
-          #  msvc-dev-cmd: "win32"
-          #}
+        - {
+            name: "Win32",
+            vs-flags: "-A Win32", # only used by VS generator
+            cl-flags: "/arch (x86)",
+            gnu-flags: "-m32",
+            msvc-dev-cmd: "win32"
+          }
         config:
         - {name: Debug}
-          #- {name: Release}
+        - {name: Release}
         build-system:
         - {name: "Visual Studio 17 2022"}
-          #- {name: "Ninja"}
+        - {name: "Ninja"}
 
     steps:
     - name: Setup MSVC (only for non-VS buildsystems)
@@ -192,8 +192,7 @@ jobs:
 
     - name: Run tests
       working-directory: build
-        #run: cmake --build . --config ${{matrix.config.name}} --target run_tests_with_junit_report
-      run: ./bin/Debug/test_sparrow_lib.exe
+      run: cmake --build . --config ${{matrix.config.name}} --target run_tests_with_junit_report
 
     - name: Run c_data_integration tests
       if: matrix.target-arch.name != 'Win32'

include/sparrow/layout/map_layout/map_array.hpp

@@ -62,7 +62,7 @@ namespace sparrow
 
         using inner_value_type = inner_types::inner_value_type;
         using inner_reference = inner_types::inner_reference;
-        using inner_const_referencce = inner_types::inner_const_reference;
+        using inner_const_reference = inner_types::inner_const_reference;
 
         using value_type = nullable<inner_value_type>;
         using const_reference = nullable<inner_const_reference, bitmap_const_reference>;

src/layout/map_layout/map_array.cpp

@@ -8,7 +8,7 @@
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or mplied.
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
@@ -54,7 +54,7 @@ namespace sparrow
 
     array_wrapper* map_array::raw_keys_array()
     {
-        return p_items_array.get();
+        return p_keys_array.get();
     }
 
     const array_wrapper* map_array::raw_items_array() const

src/layout/map_layout/map_value.cpp

@@ -8,7 +8,7 @@
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or mplied.
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
@@ -62,7 +62,7 @@ namespace sparrow
 
     auto map_value::cbegin() const -> const_iterator
     {
-        return const_iterator(functor_type(this), size());
+        return const_iterator(functor_type(this), 0);
     }
 
     auto map_value::end() const -> const_iterator
@@ -107,7 +107,7 @@ namespace sparrow
 
     auto map_value::value(size_type i) const -> const_reference
     {
-        return std::make_pair(array_element(*p_flat_keys, i), array_element(*p_flat_items, i));
+        return std::make_pair(array_element(*p_flat_keys, i + m_index_begin), array_element(*p_flat_items, i + m_index_begin));
     }
 
     bool operator==(const map_value& lhs, const map_value& rhs)

test/test_map_array.cpp

@@ -50,7 +50,6 @@ namespace sparrow
             // check the size
             REQUIRE_EQ(map_arr.size(), sizes.size());
 
-            std::cout << "BEFORE CHECKING SIZES" << std::endl;
             // check the sizes
             for (std::size_t i = 0; i < sizes.size(); ++i)
             {
@@ -62,15 +61,13 @@ namespace sparrow
             }
 
             // Check the values
-            std::cout << "BEFORE CHECKING VALUES" << std::endl;
             std::size_t flat_index = 0;
             for (std::size_t i = 0; i < sizes.size(); ++i)
             {
                 if (where_nulls.contains(i))
                 {
                     continue;
                 }
-                std::cout << "Checking for index " << i << std::endl;
                 auto m = map_arr[i];
                 for (const auto& v: m.value())
                 {
@@ -82,7 +79,6 @@ namespace sparrow
                     ++flat_index;
                 }
             }
-            std::cout << "ARRAY CHECKED"<< std::endl;
         }
 
         map_array make_map_array()
@@ -104,9 +100,7 @@ namespace sparrow
             {
                 SUBCASE("... validity bitmap")
                 {
-                    std::cout << "BEFORE CONSTRUCTION" << std::endl;
                     map_array arr(std::move(mau.flat_keys), std::move(mau.flat_items), std::move(mau.offsets), test::where_nulls);
-                    std::cout << "BEFORE CHECK" << std::endl;
                     test::check_array(arr);
                 }
 
@@ -169,3 +163,4 @@ namespace sparrow
         }
     }
 }
+