copy-based assignment

Author: Gillgamesh

include/sketch/sketch_columns.h

@@ -28,7 +28,11 @@ class FixedSizeSketchColumn {
 
   FixedSizeSketchColumn(uint8_t capacity, uint64_t seed);
   FixedSizeSketchColumn(const FixedSizeSketchColumn &other);
+  FixedSizeSketchColumn& operator=(const FixedSizeSketchColumn &other);
+
   FixedSizeSketchColumn(FixedSizeSketchColumn &&other);
+  FixedSizeSketchColumn& operator=(FixedSizeSketchColumn &&other);
+
   ~FixedSizeSketchColumn();
   SketchSample<vec_t> sample() const;
   void clear();
@@ -63,8 +67,6 @@ class FixedSizeSketchColumn {
     }
     return true;
   }
-  // move assignment operator
-  FixedSizeSketchColumn& operator=(FixedSizeSketchColumn &&other);
 
   friend std::ostream& operator<<(std::ostream &os, const FixedSizeSketchColumn &sketch) {
     os << "FixedSizeSketchColumn: " << std::endl;
@@ -92,6 +94,8 @@ class ResizeableSketchColumn {
 
   ResizeableSketchColumn(uint8_t start_capacity, uint64_t seed);
   ResizeableSketchColumn(const ResizeableSketchColumn &other);
+  ResizeableSketchColumn& operator=(const ResizeableSketchColumn &other);
+
   ResizeableSketchColumn(ResizeableSketchColumn &&other);
   ResizeableSketchColumn& operator=(ResizeableSketchColumn &&other);
   ~ResizeableSketchColumn();
@@ -160,6 +164,8 @@ class ResizeableAlignedSketchColumn {
 
   ResizeableAlignedSketchColumn(uint8_t start_capacity, uint64_t seed);
   ResizeableAlignedSketchColumn(const ResizeableAlignedSketchColumn &other);
+  ResizeableAlignedSketchColumn& operator=(const ResizeableAlignedSketchColumn &other);
+
   ResizeableAlignedSketchColumn(ResizeableAlignedSketchColumn &&other);
   ResizeableAlignedSketchColumn& operator=(ResizeableAlignedSketchColumn &&other);
   ~ResizeableAlignedSketchColumn();

src/sketch_columns.cpp

@@ -42,6 +42,19 @@ FixedSizeSketchColumn& FixedSizeSketchColumn::operator=(FixedSizeSketchColumn &&
   }
   return *this;
 }
+FixedSizeSketchColumn& FixedSizeSketchColumn::operator=(const FixedSizeSketchColumn &other) {
+  if (this != &other) {
+    delete[] buckets;
+    capacity = other.capacity;
+    seed = other.seed;
+    deterministic_bucket = other.deterministic_bucket;
+    
+    buckets = new Bucket[capacity];
+    std::memcpy(buckets, other.buckets, capacity * sizeof(Bucket));
+  }
+  // TODO - an else case?
+  return *this;
+}
 
 FixedSizeSketchColumn::~FixedSizeSketchColumn() {
   // note nullptr is safe to delete
@@ -141,6 +154,19 @@ ResizeableSketchColumn& ResizeableSketchColumn::operator=(ResizeableSketchColumn
   }
   return *this;
 }
+ResizeableSketchColumn& ResizeableSketchColumn::operator=(const ResizeableSketchColumn &other) {
+  if (this != &other) {
+    delete[] buckets;
+    capacity = other.capacity;
+    seed = other.seed;
+    deterministic_bucket = other.deterministic_bucket;
+    
+    buckets = new Bucket[capacity];
+    std::memcpy(buckets, other.buckets, capacity * sizeof(Bucket));
+  }
+  // TODO - an else case?
+  return *this;
+}
 
 ResizeableSketchColumn::~ResizeableSketchColumn() {
   delete[] buckets;