Review changes

Author: rtcote

clickhouse/columns/column.h

@@ -80,12 +80,6 @@ class Column : public std::enable_shared_from_this<Column> {
     /// Returns count of rows in the column.
     virtual size_t Size() const = 0;
 
-    /// Increase the capacity of the column (currently only supported by numeric/date types at this time)
-    virtual void Reserve([[maybe_unused]]size_t new_cap) {}
-
-    /// Returns the capacity of the column (currently only supported by numeric/date types at this time)
-    virtual size_t Capacity() const { return Size(); }
-
     /// Makes slice of the current column.
     virtual ColumnRef Slice(size_t begin, size_t len) const = 0;
 

clickhouse/columns/date.cpp

@@ -31,22 +31,22 @@ uint16_t ColumnDate::RawAt(size_t n) const {
     return data_->At(n);
 }
 
-void ColumnDate::SwapElements(size_t pos1, size_t pos2) {
-    data_->SwapElements(pos1, pos2);
+void ColumnDate::Append(ColumnRef column) {
+    if (auto col = column->As<ColumnDate>()) {
+        data_->Append(col->data_);
+    }
 }
 
-bool ColumnDate::CompareElementsGT(size_t pos1, size_t pos2) const {
-    return data_->CompareElementsGT(pos1, pos2);
+std::vector<uint16_t> &ColumnDate::GetRawVector() {
+    return data_->GetRawVector();
 }
 
-bool ColumnDate::CompareElementsLT(size_t pos1, size_t pos2) const {
-    return data_->CompareElementsLT(pos1, pos2);
+void ColumnDate::Reserve(size_t new_cap) {
+    data_->Reserve(new_cap);
 }
 
-void ColumnDate::Append(ColumnRef column) {
-    if (auto col = column->As<ColumnDate>()) {
-        data_->Append(col->data_);
-    }
+size_t ColumnDate::Capacity() const {
+    return data_->Capacity();
 }
 
 bool ColumnDate::LoadBody(InputStream* input, size_t rows) {
@@ -61,14 +61,6 @@ size_t ColumnDate::Size() const {
     return data_->Size();
 }
 
-void ColumnDate::Reserve(size_t new_cap) {
-    data_->Reserve(new_cap);
-}
-
-size_t ColumnDate::Capacity() const {
-    return data_->Capacity();
-}
-
 ColumnRef ColumnDate::Slice(size_t begin, size_t len) const {
     auto col = data_->Slice(begin, len)->As<ColumnUInt16>();
     auto result = std::make_shared<ColumnDate>();
@@ -118,24 +110,24 @@ void ColumnDate32::Append(ColumnRef column) {
     }
 }
 
-void ColumnDate32::AppendRaw(int32_t value) {
-    data_->Append(value);
+std::vector<int32_t> & ColumnDate32::GetRawVector() {
+    return data_->GetRawVector();
 }
 
-int32_t ColumnDate32::RawAt(size_t n) const {
-    return data_->At(n);
+void ColumnDate32::Reserve(size_t new_cap) {
+    data_->Reserve(new_cap);
 }
 
-void ColumnDate32::SwapElements(size_t pos1, size_t pos2) {
-    data_->SwapElements(pos1, pos2);
+size_t ColumnDate32::Capacity() const {
+    return data_->Capacity();
 }
 
-bool ColumnDate32::CompareElementsGT(size_t pos1, size_t pos2) const {
-    return data_->CompareElementsGT(pos1, pos2);
+void ColumnDate32::AppendRaw(int32_t value) {
+    data_->Append(value);
 }
 
-bool ColumnDate32::CompareElementsLT(size_t pos1, size_t pos2) const {
-    return data_->CompareElementsLT(pos1, pos2);
+int32_t ColumnDate32::RawAt(size_t n) const {
+    return data_->At(n);
 }
 
 bool ColumnDate32::LoadBody(InputStream* input, size_t rows) {
@@ -150,14 +142,6 @@ size_t ColumnDate32::Size() const {
     return data_->Size();
 }
 
-void ColumnDate32::Reserve(size_t new_cap) {
-    data_->Reserve(new_cap);
-}
-
-size_t ColumnDate32::Capacity() const {
-    return data_->Capacity();
-}
-
 ColumnRef ColumnDate32::Slice(size_t begin, size_t len) const {
     auto col = data_->Slice(begin, len)->As<ColumnInt32>();
     auto result = std::make_shared<ColumnDate32>();
@@ -208,22 +192,22 @@ std::string ColumnDateTime::Timezone() const {
     return type_->As<DateTimeType>()->Timezone();
 }
 
-void ColumnDateTime::SwapElements(size_t pos1, size_t pos2) {
-    data_->SwapElements(pos1, pos2);
+void ColumnDateTime::Append(ColumnRef column) {
+    if (auto col = column->As<ColumnDateTime>()) {
+        data_->Append(col->data_);
+    }
 }
 
-bool ColumnDateTime::CompareElementsGT(size_t pos1, size_t pos2) const {
-    return data_->CompareElementsGT(pos1, pos2);
+std::vector<uint32_t> & ColumnDateTime::GetRawVector() {
+    return data_->GetRawVector();
 }
 
-bool ColumnDateTime::CompareElementsLT(size_t pos1, size_t pos2) const {
-    return data_->CompareElementsLT(pos1, pos2);
+void ColumnDateTime::Reserve(size_t new_cap) {
+    data_->Reserve(new_cap);
 }
 
-void ColumnDateTime::Append(ColumnRef column) {
-    if (auto col = column->As<ColumnDateTime>()) {
-        data_->Append(col->data_);
-    }
+size_t ColumnDateTime::Capacity() const {
+    return data_->Capacity();
 }
 
 bool ColumnDateTime::LoadBody(InputStream* input, size_t rows) {
@@ -238,14 +222,6 @@ size_t ColumnDateTime::Size() const {
     return data_->Size();
 }
 
-void ColumnDateTime::Reserve(size_t new_cap) {
-    data_->Reserve(new_cap);
-}
-
-size_t ColumnDateTime::Capacity() const {
-    return data_->Capacity();
-}
-
 void ColumnDateTime::Clear() {
     data_->Clear();
 }
@@ -301,18 +277,6 @@ Int64 ColumnDateTime64::At(size_t n) const {
     return static_cast<Int64>(data_->At(n));
 }
 
-void ColumnDateTime64::SwapElements(size_t pos1, size_t pos2) {
-    data_->SwapElements(pos1, pos2);
-}
-
-bool ColumnDateTime64::CompareElementsGT(size_t pos1, size_t pos2) const {
-    return data_->CompareElementsGT(pos1, pos2);
-}
-
-bool ColumnDateTime64::CompareElementsLT(size_t pos1, size_t pos2) const {
-    return data_->CompareElementsLT(pos1, pos2);
-}
-
 std::string ColumnDateTime64::Timezone() const {
     return type_->As<DateTime64Type>()->Timezone();
 }
@@ -339,14 +303,6 @@ size_t ColumnDateTime64::Size() const {
     return data_->Size();
 }
 
-void ColumnDateTime64::Reserve(size_t new_cap) {
-    data_->Reserve(new_cap);
-}
-
-size_t ColumnDateTime64::Capacity() const {
-    return data_->Capacity();
-}
-
 ItemView ColumnDateTime64::GetItem(size_t index) const {
     return ItemView(Type::DateTime64, data_->GetItem(index));
 }

clickhouse/columns/date.h

@@ -27,19 +27,17 @@ class ColumnDate : public Column {
     void AppendRaw(uint16_t value);
     uint16_t RawAt(size_t n) const;
 
-    /// Swap two Elements/rows in the column
-    void SwapElements(size_t pos1, size_t pos2);
+    /// Appends content of given column to the end of current one.
+    void Append(ColumnRef column) override;
 
-    /// Test if the value at position 1 is greater than the value at position 2
-    /// No range checking is performed for performance
-    bool CompareElementsGT(size_t pos1, size_t pos2) const;
+    /// Get Raw Vector Contents
+    std::vector<uint16_t> & GetRawVector();
 
-    /// Test if the value at position 1 is less than the value at position 2
-    /// No range checking is performed for performance
-    bool CompareElementsLT(size_t pos1, size_t pos2) const;
+    /// Increase the capacity of the column
+    void Reserve(size_t new_cap);
 
-    /// Appends content of given column to the end of current one.
-    void Append(ColumnRef column) override;
+    /// Returns the capacity of the column
+    size_t Capacity() const;
 
     /// Loads column data from input stream.
     bool LoadBody(InputStream* input, size_t rows) override;
@@ -53,12 +51,6 @@ class ColumnDate : public Column {
     /// Returns count of rows in the column.
     size_t Size() const override;
 
-    /// Increase the capacity of the column
-    void Reserve(size_t new_cap) override;
-
-    /// Returns the capacity of the column
-    size_t Capacity() const override;
-
     /// Makes slice of the current column.
     ColumnRef Slice(size_t begin, size_t len) const override;
     ColumnRef CloneEmpty() const override;
@@ -94,16 +86,14 @@ class ColumnDate32 : public Column {
     void AppendRaw(int32_t value);
     int32_t RawAt(size_t n) const;
 
-    /// Swap two Elements/rows in the column
-    void SwapElements(size_t pos1, size_t pos2);
+    /// Get Raw Vector Contents
+    std::vector<int32_t> & GetRawVector();
 
-    /// Test if the value at position 1 is greater than the value at position 2
-    /// No range checking is performed for performance
-    bool CompareElementsGT(size_t pos1, size_t pos2) const;
+    /// Increase the capacity of the column
+    void Reserve(size_t new_cap);
 
-    /// Test if the value at position 1 is less than the value at position 2
-    /// No range checking is performed for performance
-    bool CompareElementsLT(size_t pos1, size_t pos2) const;
+    /// Returns the capacity of the column
+    size_t Capacity() const;
 
     /// Loads column data from input stream.
     bool LoadBody(InputStream* input, size_t rows) override;
@@ -117,12 +107,6 @@ class ColumnDate32 : public Column {
     /// Returns count of rows in the column.
     size_t Size() const override;
 
-    /// Increase the capacity of the column
-    void Reserve(size_t new_cap) override;
-
-    /// Returns the capacity of the column
-    size_t Capacity() const override;
-
     /// Makes slice of the current column.
     ColumnRef Slice(size_t begin, size_t len) const override;
     ColumnRef CloneEmpty() const override;
@@ -156,16 +140,14 @@ class ColumnDateTime : public Column {
     /// Timezone associated with a data column.
     std::string Timezone() const;
 
-    /// Swap two Elements/rows in the column
-    void SwapElements(size_t pos1, size_t pos2);
+    /// Get Raw Vector Contents
+    std::vector<uint32_t> & GetRawVector();
 
-    /// Test if the value at position 1 is greater than the value at position 2
-    /// No range checking is performed for performance
-    bool CompareElementsGT(size_t pos1, size_t pos2) const;
+    /// Increase the capacity of the column
+    void Reserve(size_t new_cap);
 
-    /// Test if the value at position 1 is less than the value at position 2
-    /// No range checking is performed for performance
-    bool CompareElementsLT(size_t pos1, size_t pos2) const;
+    /// Returns the capacity of the column
+    size_t Capacity() const;
 
 public:
     /// Appends content of given column to the end of current one.
@@ -183,12 +165,6 @@ class ColumnDateTime : public Column {
     /// Returns count of rows in the column.
     size_t Size() const override;
 
-    /// Increase the capacity of the column
-    void Reserve(size_t new_cap) override;
-
-    /// Returns the capacity of the column
-    size_t Capacity() const override;
-
     /// Makes slice of the current column.
     ColumnRef Slice(size_t begin, size_t len) const override;
     ColumnRef CloneEmpty() const override;
@@ -223,17 +199,6 @@ class ColumnDateTime64 : public Column {
     /// Timezone associated with a data column.
     std::string Timezone() const;
 
-    /// Swap two Elements/rows in the column
-    void SwapElements(size_t pos1, size_t pos2);
-
-    /// Test if the value at position 1 is greater than the value at position 2
-    /// No range checking is performed for performance
-    bool CompareElementsGT(size_t pos1, size_t pos2) const;
-
-    /// Test if the value at position 1 is less than the value at position 2
-    /// No range checking is performed for performance
-    bool CompareElementsLT(size_t pos1, size_t pos2) const;
-
 public:
     /// Appends content of given column to the end of current one.
     void Append(ColumnRef column) override;
@@ -250,12 +215,6 @@ class ColumnDateTime64 : public Column {
     /// Returns count of rows in the column.
     size_t Size() const override;
 
-    /// Increase the capacity of the column
-    void Reserve(size_t new_cap) override;
-
-    /// Returns the capacity of the column
-    size_t Capacity() const override;
-
     /// Makes slice of the current column.
     ColumnRef Slice(size_t begin, size_t len) const override;
     ColumnRef CloneEmpty() const override;

clickhouse/columns/decimal.cpp

@@ -205,36 +205,6 @@ void ColumnDecimal::SaveBody(OutputStream* output) {
     data_->SaveBody(output);
 }
 
-void ColumnDecimal::SwapElements(size_t pos1, size_t pos2) {
-    if (data_->Type()->GetCode() == Type::Int32) {
-        data_->As<ColumnInt32>()->SwapElements(pos1, pos2);
-    } else if (data_->Type()->GetCode() == Type::Int64) {
-        data_->As<ColumnInt64>()->SwapElements(pos1, pos2);
-    } else {
-        data_->As<ColumnInt128>()->SwapElements(pos1, pos2);
-    }
-}
-
-bool ColumnDecimal::CompareElementsGT(size_t pos1, size_t pos2) const {
-    if (data_->Type()->GetCode() == Type::Int32) {
-        return data_->As<ColumnInt32>()->CompareElementsGT(pos1, pos2);
-    } else if (data_->Type()->GetCode() == Type::Int64) {
-        return data_->As<ColumnInt64>()->CompareElementsGT(pos1, pos2);
-    } else {
-        return data_->As<ColumnInt128>()->CompareElementsGT(pos1, pos2);
-    }
-}
-
-bool ColumnDecimal::CompareElementsLT(size_t pos1, size_t pos2) const {
-    if (data_->Type()->GetCode() == Type::Int32) {
-        return data_->As<ColumnInt32>()->CompareElementsLT(pos1, pos2);
-    } else if (data_->Type()->GetCode() == Type::Int64) {
-        return data_->As<ColumnInt64>()->CompareElementsLT(pos1, pos2);
-    } else {
-        return data_->As<ColumnInt128>()->CompareElementsLT(pos1, pos2);
-    }
-}
-
 void ColumnDecimal::Clear() {
     data_->Clear();
 }
@@ -243,14 +213,6 @@ size_t ColumnDecimal::Size() const {
     return data_->Size();
 }
 
-void ColumnDecimal::Reserve(size_t new_cap) {
-    data_->Reserve(new_cap);
-}
-
-size_t ColumnDecimal::Capacity() const {
-    return data_->Capacity();
-}
-
 ColumnRef ColumnDecimal::Slice(size_t begin, size_t len) const {
     // coundn't use std::make_shared since this c-tor is private
     return ColumnRef{new ColumnDecimal(type_, data_->Slice(begin, len))};