make work

Author: etwest

include/bucket.h

@@ -13,10 +13,15 @@ struct Bucket {
 };
 #pragma pack(pop)
 
-typedef col_hash_t[2] ColumnDepths;
-
 namespace SketchBucket {
 
+struct Depths {
+ private:
+  col_hash_t depths[2];
+ public:
+  col_hash_t& operator[](size_t i) { return depths[i]; }
+};
+
 static constexpr size_t col_hash_bits = sizeof(col_hash_t) * 8;
 /**
  * Hashes the column index and the update index together to determine the depth of an update
@@ -33,16 +38,16 @@ inline static col_hash_t get_index_depth(const vec_t update_idx, const long seed
   return __builtin_ctzll(depth_hash);
 }
 
-inline static depths get_index_depths(vec_t update_idx, size_t seed, col_hash_t max_depth) {
-  col_hash_t depth_hash = col_hash(&update_idx, sizeof(vec_t), seed);
-  depths ret;
+inline static Depths get_index_depths(vec_t update_idx, size_t seed, col_hash_t max_depth) {
+  uint64_t depth_hash = col_hash(&update_idx, sizeof(vec_t), seed);
+  Depths ret;
 
   depth_hash |= (1ull << max_depth);  // assert not > max_depth by ORing
   ret[0] = __builtin_ctzll(depth_hash);
 
   // shift hash over and reassert max_depth
   depth_hash >>= 32;
-  depth_hash depth_hash |= (1ull << max_depth);
+  depth_hash |= (1ull << max_depth);
   ret[1] = __builtin_ctzll(depth_hash);
 
   return ret;
@@ -56,7 +61,7 @@ inline static depths get_index_depths(vec_t update_idx, size_t seed, col_hash_t
  * @return           The depth of the bucket to update
  */
 inline static vec_hash_t get_index_hash(const vec_t index, const long sketch_seed) {
-  return vec_hash(&update_idx, sizeof(vec_t), sketch_seed);
+  return vec_hash(&index, sizeof(vec_t), sketch_seed);
 }
 
 /**

src/sparse_sketch.cpp

@@ -249,7 +249,7 @@ void SparseSketch::update(const vec_t update_idx) {
 
   // Update depth 0 bucket
   SketchBucket::update(deterministic_bucket(), update_idx, checksum);
-  ColumnDepths depths;
+  SketchBucket::Depths depths;
 
   // Update higher depth buckets
   for (size_t i = 0; i < num_columns; i++) {

test/sketch_test.cpp

@@ -35,7 +35,7 @@ TEST(SketchTestSuite, TestSampleResults) {
         continue;
       }
 
-      col_hash_t depth = SketchBucket::get_index_depth(k, sketch2.column_seed(i), guesses);
+      col_hash_t depth = SketchBucket::get_index_depths(k, sketch2.column_seed(i - (i % 2)), guesses)[i & 0x1];
       if (depth >= 2) {
         vec_idx[k] = false; // force all updates to only touch depths <= 1
         i = 0;