Merge pull request #320 from Enmk/Date_and_Date32_immediate_value_access

Implemented Append/RawAt/operator[] for ColumnDate and ColumnDate32 that work with uint16_t/int32_t

Author: Enmk

clickhouse/CMakeLists.txt

@@ -17,7 +17,6 @@ SET ( clickhouse-cpp-lib-src
     columns/ip4.cpp
     columns/ip6.cpp
     columns/lowcardinality.cpp
-    columns/lowcardinalityadaptor.h
     columns/nullable.cpp
     columns/numeric.cpp
     columns/map.cpp
@@ -33,6 +32,55 @@ SET ( clickhouse-cpp-lib-src
     block.cpp
     client.cpp
     query.cpp
+
+    # Headers
+    base/buffer.h
+    base/compressed.h
+    base/endpoints_iterator.h
+    base/input.h
+    base/open_telemetry.h
+    base/output.h
+    base/platform.h
+    base/projected_iterator.h
+    base/singleton.h
+    base/socket.h
+    base/sslsocket.h
+    base/string_utils.h
+    base/string_view.h
+    base/uuid.h
+    base/wire_format.h
+
+    columns/array.h
+    columns/column.h
+    columns/date.h
+    columns/decimal.h
+    columns/enum.h
+    columns/factory.h
+    columns/geo.h
+    columns/ip4.h
+    columns/ip6.h
+    columns/itemview.h
+    columns/lowcardinality.h
+    columns/lowcardinalityadaptor.h
+    columns/map.h
+    columns/nothing.h
+    columns/nullable.h
+    columns/numeric.h
+    columns/string.h
+    columns/tuple.h
+    columns/utils.h
+    columns/uuid.h
+
+    types/type_parser.h
+    types/types.h
+
+    block.h
+    client.h
+    error_codes.h
+    exceptions.h
+    protocol.h
+    query.h
+    server_exception.h
 )
 
 if (MSVC)

clickhouse/columns/date.cpp

@@ -1,4 +1,5 @@
 #include "date.h"
+#include <cstdint>
 
 namespace clickhouse {
 
@@ -9,7 +10,7 @@ ColumnDate::ColumnDate()
 }
 
 void ColumnDate::Append(const std::time_t& value) {
-    /// TODO: This code is fundamentally wrong.
+    /// The implementation is fundamentally wrong, ignores timezones, leap years and daylight saving.
     data_->Append(static_cast<uint16_t>(value / std::time_t(86400)));
 }
 
@@ -18,9 +19,18 @@ void ColumnDate::Clear() {
 }
 
 std::time_t ColumnDate::At(size_t n) const {
+    /// The implementation is fundamentally wrong, ignores timezones, leap years and daylight saving.
     return static_cast<std::time_t>(data_->At(n)) * 86400;
 }
 
+void ColumnDate::AppendRaw(uint16_t value) {
+    data_->Append(value);
+}
+
+uint16_t ColumnDate::RawAt(size_t n) const {
+    return data_->At(n);
+}
+
 void ColumnDate::Append(ColumnRef column) {
     if (auto col = column->As<ColumnDate>()) {
         data_->Append(col->data_);
@@ -62,15 +72,14 @@ ItemView ColumnDate::GetItem(size_t index) const {
 }
 
 
-
 ColumnDate32::ColumnDate32()
     : Column(Type::CreateDate32())
     , data_(std::make_shared<ColumnInt32>())
 {
 }
 
 void ColumnDate32::Append(const std::time_t& value) {
-    /// TODO: This code is fundamentally wrong.
+    /// The implementation is fundamentally wrong, ignores timezones, leap years and daylight saving.
     data_->Append(static_cast<int32_t>(value / std::time_t(86400)));
 }
 
@@ -79,6 +88,7 @@ void ColumnDate32::Clear() {
 }
 
 std::time_t ColumnDate32::At(size_t n) const {
+    /// The implementation is fundamentally wrong, ignores timezones, leap years and daylight saving.
     return static_cast<std::time_t>(data_->At(n)) * 86400;
 }
 
@@ -88,6 +98,14 @@ void ColumnDate32::Append(ColumnRef column) {
     }
 }
 
+void ColumnDate32::AppendRaw(int32_t value) {
+    data_->Append(value);
+}
+
+int32_t ColumnDate32::RawAt(size_t n) const {
+    return data_->At(n);
+}
+
 bool ColumnDate32::LoadBody(InputStream* input, size_t rows) {
     return data_->LoadBody(input, rows);
 }
@@ -122,7 +140,6 @@ ItemView ColumnDate32::GetItem(size_t index) const {
     return ItemView{Type()->GetCode(), data_->GetItem(index)};
 }
 
-
 ColumnDateTime::ColumnDateTime()
     : Column(Type::CreateDateTime())
     , data_(std::make_shared<ColumnUInt32>())
@@ -241,6 +258,7 @@ void ColumnDateTime64::SaveBody(OutputStream* output) {
 void ColumnDateTime64::Clear() {
     data_->Clear();
 }
+
 size_t ColumnDateTime64::Size() const {
     return data_->Size();
 }

clickhouse/columns/date.h

@@ -15,12 +15,17 @@ class ColumnDate : public Column {
     ColumnDate();
 
     /// Appends one element to the end of column.
-    /// TODO: The implementation is fundamentally wrong.
+    /// The implementation is fundamentally wrong, ignores timezones, leap years and daylight saving.
     void Append(const std::time_t& value);
 
     /// Returns element at given row number.
-    /// TODO: The implementation is fundamentally wrong.
+    /// The implementation is fundamentally wrong, ignores timezones, leap years and daylight saving.
     std::time_t At(size_t n) const;
+    inline std::time_t operator [] (size_t n) const { return At(n); }
+
+    /// Do append data as is -- number of day in Unix epoch, no conversions performed.
+    void AppendRaw(uint16_t value);
+    uint16_t RawAt(size_t n) const;
 
     /// Appends content of given column to the end of current one.
     void Append(ColumnRef column) override;
@@ -56,16 +61,22 @@ class ColumnDate32 : public Column {
     ColumnDate32();
 
     /// Appends one element to the end of column.
-    /// TODO: The implementation is fundamentally wrong.
+    /// The implementation is fundamentally wrong, ignores timezones, leap years and daylight saving.
     void Append(const std::time_t& value);
 
     /// Returns element at given row number.
-    /// TODO: The implementation is fundamentally wrong.
+    /// The implementation is fundamentally wrong, ignores timezones, leap years and daylight saving.
     std::time_t At(size_t n) const;
 
     /// Appends content of given column to the end of current one.
     void Append(ColumnRef column) override;
 
+    inline std::time_t operator [] (size_t n) const { return At(n); }
+
+    /// Do append data as is -- number of day in Unix epoch (32bit signed), no conversions performed.
+    void AppendRaw(int32_t value);
+    int32_t RawAt(size_t n) const;
+
     /// Loads column data from input stream.
     bool LoadBody(InputStream* input, size_t rows) override;
 
@@ -90,7 +101,7 @@ class ColumnDate32 : public Column {
 };
 
 
-/** */
+/** DateTime64 supports date-time values (number of seconds since UNIX epoch), from 1970 up to 2130. */
 class ColumnDateTime : public Column {
 public:
     using ValueType = std::time_t;
@@ -103,6 +114,7 @@ class ColumnDateTime : public Column {
 
     /// Returns element at given row number.
     std::time_t At(size_t n) const;
+    inline std::time_t operator [] (size_t n) const { return At(n); }
 
     /// Timezone associated with a data column.
     std::string Timezone() const;
@@ -135,7 +147,7 @@ class ColumnDateTime : public Column {
 };
 
 
-/** */
+/** DateTime64 supports date-time values of arbitrary sub-second precision, from 1900 up to 2300. */
 class ColumnDateTime64 : public Column {
 public:
     using ValueType = Int64;
@@ -152,6 +164,8 @@ class ColumnDateTime64 : public Column {
     /// Returns element at given row number.
     Int64 At(size_t n) const;
 
+    inline Int64 operator[](size_t n) const { return At(n); }
+
     /// Timezone associated with a data column.
     std::string Timezone() const;
 

clickhouse/columns/decimal.h

@@ -18,6 +18,7 @@ class ColumnDecimal : public Column {
     void Append(const std::string& value);
 
     Int128 At(size_t i) const;
+    inline auto operator[](size_t i) const { return At(i); }
 
 public:
     void Append(ColumnRef column) override;

clickhouse/columns/enum.cpp

@@ -55,11 +55,6 @@ std::string_view ColumnEnum<T>::NameAt(size_t n) const {
     return type_->As<EnumType>()->GetEnumName(data_.at(n));
 }
 
-template <typename T>
-const T& ColumnEnum<T>::operator[] (size_t n) const {
-    return data_[n];
-}
-
 template <typename T>
 void ColumnEnum<T>::SetAt(size_t n, const T& value, bool checkValue) {
     if (checkValue) {

clickhouse/columns/enum.h

@@ -23,7 +23,7 @@ class ColumnEnum : public Column {
     std::string_view NameAt(size_t n) const;
 
     /// Returns element at given row number.
-    const T& operator[] (size_t n) const;
+    inline const T& operator[] (size_t n) const { return At(n); }
 
     /// Set element at given row number.
     void SetAt(size_t n, const T& value, bool checkValue = false);

clickhouse/columns/geo.cpp

@@ -54,11 +54,6 @@ const typename ColumnGeo<NestedColumnType, type_code>::ValueType ColumnGeo<Neste
     return data_->At(n);
 }
 
-template <typename NestedColumnType, Type::Code type_code>
-const typename ColumnGeo<NestedColumnType, type_code>::ValueType ColumnGeo<NestedColumnType, type_code>::operator[](size_t n) const {
-    return data_->At(n);
-}
-
 template <typename NestedColumnType, Type::Code type_code>
 void ColumnGeo<NestedColumnType, type_code>::Append(ColumnRef column) {
     if (auto col = column->template As<ColumnGeo>()) {

clickhouse/columns/geo.h

@@ -26,7 +26,7 @@ class ColumnGeo : public Column {
     const ValueType At(size_t n) const;
 
     /// Returns element at given row number.
-    const ValueType operator[](size_t n) const;
+    inline const ValueType operator[](size_t n) const { return At(n); }
 
 public:
     /// Appends content of given column to the end of current one.

clickhouse/columns/map.h

@@ -212,7 +212,7 @@ class ColumnMapT : public ColumnMap {
 
     inline auto At(size_t index) const { return MapValueView{typed_data_->At(index)}; }
 
-    inline auto operator[](size_t index) const { return MapValueView{typed_data_->At(index)}; }
+    inline auto operator[](size_t index) const { return At(index); }
 
     using ColumnMap::Append;
 

clickhouse/columns/nothing.h

@@ -33,7 +33,7 @@ class ColumnNothing : public Column {
     std::nullptr_t At(size_t) const { return nullptr; };
 
     /// Returns element at given row number.
-    std::nullptr_t operator [] (size_t) const { return nullptr; };
+    inline std::nullptr_t operator [] (size_t) const { return nullptr; };
 
     /// Makes slice of the current column.
     ColumnRef Slice(size_t, size_t len) const override {