AlexanderSaydakov commented on a change in pull request #209:
URL: https://github.com/apache/datasketches-cpp/pull/209#discussion_r616142947
##########
File path: hll/test/CouponHashSetTest.cpp
##########
@@ -39,91 +39,91 @@ TEST_CASE("coupon hash set: check corrupt bytearray",
"[coupon_hash_set]") {
uint8_t* bytes = sketchBytes.data();
const size_t size = sketchBytes.size();
- bytes[HllUtil<>::PREAMBLE_INTS_BYTE] = 0;
+ bytes[hll_constants::PREAMBLE_INTS_BYTE] = 0;
// fail in HllSketchImpl
REQUIRE_THROWS_AS(hll_sketch::deserialize(bytes, size),
std::invalid_argument);
// fail in CouponHashSet
REQUIRE_THROWS_AS(CouponHashSet<std::allocator<uint8_t>>::newSet(bytes,
size, std::allocator<uint8_t>()), std::invalid_argument);
- bytes[HllUtil<>::PREAMBLE_INTS_BYTE] = HllUtil<>::HASH_SET_PREINTS;
+ bytes[hll_constants::PREAMBLE_INTS_BYTE] = hll_constants::HASH_SET_PREINTS;
- bytes[HllUtil<>::SER_VER_BYTE] = 0;
+ bytes[hll_constants::SER_VER_BYTE] = 0;
REQUIRE_THROWS_AS(hll_sketch::deserialize(bytes, size),
std::invalid_argument);
- bytes[HllUtil<>::SER_VER_BYTE] = HllUtil<>::SER_VER;
+ bytes[hll_constants::SER_VER_BYTE] = hll_constants::SER_VER;
- bytes[HllUtil<>::FAMILY_BYTE] = 0;
+ bytes[hll_constants::FAMILY_BYTE] = 0;
REQUIRE_THROWS_AS(hll_sketch::deserialize(bytes, size),
std::invalid_argument);
- bytes[HllUtil<>::FAMILY_BYTE] = HllUtil<>::FAMILY_ID;
+ bytes[hll_constants::FAMILY_BYTE] = hll_constants::FAMILY_ID;
- bytes[HllUtil<>::LG_K_BYTE] = 6;
+ bytes[hll_constants::LG_K_BYTE] = 6;
REQUIRE_THROWS_AS(hll_sketch::deserialize(bytes, size),
std::invalid_argument);
- bytes[HllUtil<>::LG_K_BYTE] = lgK;
+ bytes[hll_constants::LG_K_BYTE] = lgK;
- uint8_t tmp = bytes[HllUtil<>::MODE_BYTE];
- bytes[HllUtil<>::MODE_BYTE] = 0x10; // HLL_6, LIST
+ uint8_t tmp = bytes[hll_constants::MODE_BYTE];
+ bytes[hll_constants::MODE_BYTE] = 0x10; // HLL_6, LIST
REQUIRE_THROWS_AS(hll_sketch::deserialize(bytes, size),
std::invalid_argument);
- bytes[HllUtil<>::MODE_BYTE] = tmp;
+ bytes[hll_constants::MODE_BYTE] = tmp;
- tmp = bytes[HllUtil<>::LG_ARR_BYTE];
- bytes[HllUtil<>::LG_ARR_BYTE] = 0;
+ tmp = bytes[hll_constants::LG_ARR_BYTE];
+ bytes[hll_constants::LG_ARR_BYTE] = 0;
hll_sketch::deserialize(bytes, size);
// should work fine despite the corruption
- bytes[HllUtil<>::LG_ARR_BYTE] = tmp;
+ bytes[hll_constants::LG_ARR_BYTE] = tmp;
REQUIRE_THROWS_AS(hll_sketch::deserialize(bytes, size - 1),
std::out_of_range);
REQUIRE_THROWS_AS(hll_sketch::deserialize(bytes, 3), std::out_of_range);
}
TEST_CASE("coupon hash set: check corrupt stream", "[coupon_hash_set]") {
- int lgK = 9;
+ uint8_t lgK = 9;
hll_sketch sk1(lgK);
for (int i = 0; i < 24; ++i) {
sk1.update(i);
}
std::stringstream ss;
sk1.serialize_compact(ss);
- ss.seekp(HllUtil<>::PREAMBLE_INTS_BYTE);
+ ss.seekp(hll_constants::PREAMBLE_INTS_BYTE);
ss.put(0);
ss.seekg(0);
// fail in HllSketchImpl
REQUIRE_THROWS_AS(hll_sketch::deserialize(ss), std::invalid_argument);
// fail in CouponHashSet
REQUIRE_THROWS_AS(CouponHashSet<std::allocator<uint8_t>>::newSet(ss,
std::allocator<uint8_t>()), std::invalid_argument);
- ss.seekp(HllUtil<>::PREAMBLE_INTS_BYTE);
- ss.put(HllUtil<>::HASH_SET_PREINTS);
+ ss.seekp(hll_constants::PREAMBLE_INTS_BYTE);
+ ss.put(hll_constants::HASH_SET_PREINTS);
- ss.seekp(HllUtil<>::SER_VER_BYTE);
+ ss.seekp(hll_constants::SER_VER_BYTE);
ss.put(0);
ss.seekg(0);
REQUIRE_THROWS_AS(hll_sketch::deserialize(ss), std::invalid_argument);
- ss.seekp(HllUtil<>::SER_VER_BYTE);
- ss.put(HllUtil<>::SER_VER);
+ ss.seekp(hll_constants::SER_VER_BYTE);
+ ss.put(hll_constants::SER_VER);
- ss.seekp(HllUtil<>::FAMILY_BYTE);
+ ss.seekp(hll_constants::FAMILY_BYTE);
ss.put(0);
ss.seekg(0);
REQUIRE_THROWS_AS(hll_sketch::deserialize(ss), std::invalid_argument);
- ss.seekp(HllUtil<>::FAMILY_BYTE);
- ss.put(HllUtil<>::FAMILY_ID);
+ ss.seekp(hll_constants::FAMILY_BYTE);
+ ss.put(hll_constants::FAMILY_ID);
- ss.seekg(HllUtil<>::MODE_BYTE);
- uint8_t tmp = ss.get();
- ss.seekp(HllUtil<>::MODE_BYTE);
+ ss.seekg(hll_constants::MODE_BYTE);
+ auto tmp = ss.get();
+ ss.seekp(hll_constants::MODE_BYTE);
ss.put(0x22); // HLL_8, HLL
ss.seekg(0);
REQUIRE_THROWS_AS(hll_sketch::deserialize(ss), std::invalid_argument);
- ss.seekp(HllUtil<>::MODE_BYTE);
- ss.put(tmp);
+ ss.seekp(hll_constants::MODE_BYTE);
+ ss.put((char)tmp);
Review comment:
not sure we need to worry about the tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
