2828namespace datasketches {
2929
3030namespace {
31- constexpr size_t kHeaderSize = 8 ;
32- constexpr size_t kCountsSize = 8 ;
33- constexpr size_t kMinOffset = kHeaderSize + kCountsSize ;
34- constexpr size_t kMaxOffset = kMinOffset + sizeof (double );
35- constexpr size_t kFirstCentroidMeanOffset = kMinOffset + sizeof (double ) * 2 ;
36- constexpr size_t kFirstBufferedValueOffset = kFirstCentroidMeanOffset ;
37- constexpr size_t kSingleValueOffset = kHeaderSize ;
31+ constexpr size_t header_size = 8 ;
32+ constexpr size_t counts_size = 8 ;
33+ constexpr size_t min_offset = header_size + counts_size ;
34+ constexpr size_t max_offset = min_offset + sizeof (double );
35+ constexpr size_t first_centroid_mean_offset = min_offset + sizeof (double ) * 2 ;
36+ constexpr size_t first_buffered_value_offset = first_centroid_mean_offset ;
37+ constexpr size_t single_value_offset = header_size ;
3838
3939template <typename T>
4040void write_bytes (std::vector<uint8_t >& bytes, size_t offset, T value) {
@@ -528,7 +528,7 @@ TEST_CASE("deserialize bytes rejects NaN single value", "[tdigest]") {
528528 tdigest_double td (100 );
529529 td.update (1.0 );
530530 auto bytes = td.serialize ();
531- write_bytes (bytes, kSingleValueOffset , std::numeric_limits<double >::quiet_NaN ());
531+ write_bytes (bytes, single_value_offset , std::numeric_limits<double >::quiet_NaN ());
532532 REQUIRE_THROWS_AS (tdigest_double::deserialize (bytes.data (), bytes.size ()), std::invalid_argument);
533533}
534534
@@ -539,7 +539,7 @@ TEST_CASE("deserialize stream rejects infinity min", "[tdigest]") {
539539 td.update (3.0 );
540540 auto bytes = td.serialize ();
541541 std::string data (reinterpret_cast <const char *>(bytes.data ()), bytes.size ());
542- write_bytes (data, kMinOffset , std::numeric_limits<double >::infinity ());
542+ write_bytes (data, min_offset , std::numeric_limits<double >::infinity ());
543543 std::istringstream is (data, std::ios::binary);
544544 REQUIRE_THROWS_AS (tdigest_double::deserialize (is), std::invalid_argument);
545545}
@@ -548,7 +548,7 @@ TEST_CASE("deserialize bytes rejects NaN centroid mean", "[tdigest]") {
548548 tdigest_double td (100 );
549549 for (int i = 0 ; i < 10 ; ++i) td.update (i);
550550 auto bytes = td.serialize ();
551- write_bytes (bytes, kFirstCentroidMeanOffset , std::numeric_limits<double >::quiet_NaN ());
551+ write_bytes (bytes, first_centroid_mean_offset , std::numeric_limits<double >::quiet_NaN ());
552552 REQUIRE_THROWS_AS (tdigest_double::deserialize (bytes.data (), bytes.size ()), std::invalid_argument);
553553}
554554
@@ -557,15 +557,15 @@ TEST_CASE("deserialize bytes rejects NaN buffered value", "[tdigest]") {
557557 td.update (1.0 );
558558 td.update (2.0 );
559559 auto bytes = td.serialize (0 , true );
560- write_bytes (bytes, kFirstBufferedValueOffset , std::numeric_limits<double >::quiet_NaN ());
560+ write_bytes (bytes, first_buffered_value_offset , std::numeric_limits<double >::quiet_NaN ());
561561 REQUIRE_THROWS_AS (tdigest_double::deserialize (bytes.data (), bytes.size ()), std::invalid_argument);
562562}
563563
564564TEST_CASE (" deserialize bytes rejects infinity single value" , " [tdigest]" ) {
565565 tdigest_double td (100 );
566566 td.update (1.0 );
567567 auto bytes = td.serialize ();
568- write_bytes (bytes, kSingleValueOffset , std::numeric_limits<double >::infinity ());
568+ write_bytes (bytes, single_value_offset , std::numeric_limits<double >::infinity ());
569569 REQUIRE_THROWS_AS (tdigest_double::deserialize (bytes.data (), bytes.size ()), std::invalid_argument);
570570}
571571
@@ -574,7 +574,7 @@ TEST_CASE("deserialize bytes rejects NaN max", "[tdigest]") {
574574 td.update (1.0 );
575575 td.update (2.0 );
576576 auto bytes = td.serialize ();
577- write_bytes (bytes, kMaxOffset , std::numeric_limits<double >::quiet_NaN ());
577+ write_bytes (bytes, max_offset , std::numeric_limits<double >::quiet_NaN ());
578578 REQUIRE_THROWS_AS (tdigest_double::deserialize (bytes.data (), bytes.size ()), std::invalid_argument);
579579}
580580
@@ -583,7 +583,7 @@ TEST_CASE("deserialize bytes rejects infinity max", "[tdigest]") {
583583 td.update (1.0 );
584584 td.update (2.0 );
585585 auto bytes = td.serialize ();
586- write_bytes (bytes, kMaxOffset , std::numeric_limits<double >::infinity ());
586+ write_bytes (bytes, max_offset , std::numeric_limits<double >::infinity ());
587587 REQUIRE_THROWS_AS (tdigest_double::deserialize (bytes.data (), bytes.size ()), std::invalid_argument);
588588}
589589
@@ -592,7 +592,7 @@ TEST_CASE("deserialize bytes rejects infinity buffered value", "[tdigest]") {
592592 td.update (1.0 );
593593 td.update (2.0 );
594594 auto bytes = td.serialize (0 , true );
595- write_bytes (bytes, kFirstBufferedValueOffset , std::numeric_limits<double >::infinity ());
595+ write_bytes (bytes, first_buffered_value_offset , std::numeric_limits<double >::infinity ());
596596 REQUIRE_THROWS_AS (tdigest_double::deserialize (bytes.data (), bytes.size ()), std::invalid_argument);
597597}
598598
0 commit comments