Skip to content

Commit 44d2552

Browse files
committed
Add comment and use sp namespace
1 parent 7860dc7 commit 44d2552

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

tests/test_primitive_array.cpp

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ namespace sparrow_ipc
1717
float,
1818
double>;
1919

20+
// TODO We should use comparison functions from sparrow, after making them available if not already
21+
// after next release?
22+
// Or even better, allow checking directly primitive_array equality in sparrow
2023
void compare_arrow_schemas(const ArrowSchema& s1, const ArrowSchema& s2)
2124
{
2225
std::string_view s1_format = (s1.format != nullptr) ? std::string_view(s1.format) : "";
@@ -90,7 +93,7 @@ namespace sparrow_ipc
9093
}
9194

9295
template <typename T>
93-
void compare_values(sparrow::primitive_array<T>& pa1, sparrow::primitive_array<T>& pa2)
96+
void compare_values(sp::primitive_array<T>& pa1, sp::primitive_array<T>& pa2)
9497
{
9598
CHECK_EQ(pa1.size(), pa1.size());
9699
for (size_t i = 0; i < pa1.size(); ++i)
@@ -100,7 +103,7 @@ namespace sparrow_ipc
100103
}
101104

102105
template <typename T>
103-
void compare_bitmap(sparrow::primitive_array<T>& pa1, sparrow::primitive_array<T>& pa2)
106+
void compare_bitmap(sp::primitive_array<T>& pa1, sp::primitive_array<T>& pa2)
104107
{
105108
const auto pa1_bitmap = pa1.bitmap();
106109
const auto pa2_bitmap = pa2.bitmap();
@@ -117,7 +120,7 @@ namespace sparrow_ipc
117120
}
118121

119122
template <typename T>
120-
void compare_metadata(sparrow::primitive_array<T>& pa1, sparrow::primitive_array<T>& pa2)
123+
void compare_metadata(sp::primitive_array<T>& pa1, sp::primitive_array<T>& pa2)
121124
{
122125
if (!pa1.metadata().has_value())
123126
{
@@ -126,8 +129,8 @@ namespace sparrow_ipc
126129
}
127130

128131
CHECK(pa2.metadata().has_value());
129-
sparrow::key_value_view kvs1_view = *(pa1.metadata());
130-
sparrow::key_value_view kvs2_view = *(pa2.metadata());
132+
sp::key_value_view kvs1_view = *(pa1.metadata());
133+
sp::key_value_view kvs2_view = *(pa2.metadata());
131134

132135
CHECK_EQ(kvs1_view.size(), kvs2_view.size());
133136
std::vector<std::pair<std::string, std::string>> kvs1, kvs2;
@@ -142,7 +145,7 @@ namespace sparrow_ipc
142145
}
143146

144147
template <typename T>
145-
void compare_primitive_arrays(sparrow::primitive_array<T>& ar, sparrow::primitive_array<T>& deserialized_ar)
148+
void compare_primitive_arrays(sp::primitive_array<T>& ar, sp::primitive_array<T>& deserialized_ar)
146149
{
147150
auto [arrow_array_ar, arrow_schema_ar] = sp::get_arrow_structures(ar);
148151
auto [arrow_array_deserialized_ar, arrow_schema_deserialized_ar] = sp::get_arrow_structures(deserialized_ar);
@@ -235,7 +238,7 @@ namespace sparrow_ipc
235238
std::move(data_buffer),
236239
std::move(validity),
237240
"my_named_array", // name
238-
std::make_optional(std::vector<sparrow::metadata_pair>{{"key1", "value1"}, {"key2", "value2"}})
241+
std::make_optional(std::vector<sp::metadata_pair>{{"key1", "value1"}, {"key2", "value2"}})
239242
);
240243

241244
std::vector<uint8_t> serialized_data = serialize_primitive_array(ar);

0 commit comments

Comments
 (0)