Merge pull request #360 from apache/359-use-non-colliding-family-id-in-count-min

Changed family id to 18

Author: c-dickens

count/include/count_min.hpp

@@ -319,8 +319,7 @@ class count_min_sketch{
   static const uint8_t PREAMBLE_LONGS_SHORT = 2; // Empty -> need second byte for sketch parameters
   static const uint8_t PREAMBLE_LONGS_FULL = 3; // Not empty -> need (at least) third byte for total weight.
   static const uint8_t SERIAL_VERSION_1 = 1;
-  static const uint8_t FAMILY_ID = 1;
-  //static const size_t DATA_START = 24;
+  static const uint8_t FAMILY_ID = 18;
   static const uint8_t NULL_8 = 0;
   static const uint32_t NULL_32 = 0;
 

count/include/count_min_impl.hpp

@@ -491,9 +491,9 @@ void count_min_sketch<W,A>::check_header_validity(uint8_t preamble_longs, uint8_
   bool valid = true;
 
   switch (sw) { // exhaustive list and description of all valid cases
-    case 70 : break; // !empty, ser_ver==1, family==1, preLongs=2;
-    case 71 : break; // empty, ser_ver==1, family==1, preLongs=2;
-    //case 102 : break ; // !empty, ser_ver==1, family==1, preLongs=3 ;
+    case 138 : break; // !empty, ser_ver==1, family==18, preLongs=2;
+    case 139 : break; // empty, ser_ver==1, family==18, preLongs=2;
+    //case 170 : break ; // !empty, ser_ver==1, family==18, preLongs=3 ;
     default : // all other case values are invalid
       valid = false;
   }