changed depth calculations to normal for sketch columns

Author: Gillgamesh

include/bucket.h

@@ -50,6 +50,13 @@ namespace Bucket_Boruvka {
   inline static col_hash_t get_index_depth(const vec_t update_idx, const long seed, const long col,
    const vec_hash_t max_depth);
 
+  
+  inline static col_hash_t get_index_depth_legacy(const vec_t update_idx, const long seed_and_col, const vec_hash_t max_depth) {
+    col_hash_t depth_hash = col_hash(&update_idx, sizeof(vec_t), seed_and_col);
+    depth_hash |= (1ull << max_depth); // assert not > max_depth by ORing
+    return __builtin_ctzll(depth_hash); 
+  }
+
   inline static void get_all_index_depths(
     const vec_t update_idx,
     uint32_t *depths_buffer, 

src/sketch_columns.cpp

@@ -59,7 +59,7 @@ void FixedSizeSketchColumn::merge(FixedSizeSketchColumn &other) {
 
 void FixedSizeSketchColumn::update(const vec_t update) {
   vec_hash_t checksum = Bucket_Boruvka::get_index_hash(update, seed);
-  col_hash_t depth = Bucket_Boruvka::get_index_depth(update, seed, col_idx, capacity-1);
+  col_hash_t depth = Bucket_Boruvka::get_index_depth_legacy(update, seed + col_idx, capacity-1);
   // assert(depth < capacity);
   buckets[depth] ^= {update, checksum};
   deterministic_bucket ^= {update, checksum};
@@ -128,7 +128,7 @@ void ResizeableSketchColumn::update(const vec_t update) {
   // TODO - remove magic number
   // TODO - get_index_depth needs to be fixed. hashes need to be longer
   // than 32 bits if we're not using the deep bucket buffer idea.
-  col_hash_t depth = Bucket_Boruvka::get_index_depth(update, seed, col_idx, 60);
+  col_hash_t depth = Bucket_Boruvka::get_index_depth_legacy(update, seed + col_idx, 60);
   deterministic_bucket ^= {update, checksum};
 
   if (depth >= capacity) {
@@ -221,7 +221,7 @@ void ResizeableAlignedSketchColumn::update(const vec_t update) {
   // TODO - remove magic number
   // TODO - get_index_depth needs to be fixed. hashes need to be longer
   // than 32 bits if we're not using the deep bucket buffer idea.
-  col_hash_t depth = Bucket_Boruvka::get_index_depth(update, seed, col_idx, 60);
+  col_hash_t depth = Bucket_Boruvka::get_index_depth_legacy(update, seed + col_idx, 60);
   deterministic_bucket ^= {update, checksum};
 
   if (depth >= capacity) {