change int128 lib

Author: inkrement

CMakeLists.txt

@@ -29,8 +29,8 @@ PROJECT (CLICKHOUSE-CLIENT)
     SUBDIRS (
         clickhouse
         contrib/cityhash
-        contrib/abseil-cpp
         contrib/lz4
+        contrib/bigint
     )
 
     IF (BUILD_BENCHMARK)

clickhouse/CMakeLists.txt

@@ -32,16 +32,12 @@ SET_TARGET_PROPERTIES(clickhouse-cpp-lib PROPERTIES LINKER_LANGUAGE CXX)
 TARGET_LINK_LIBRARIES (clickhouse-cpp-lib
     cityhash-lib
     lz4-lib
-    absl::numeric
-    absl::strings
 )
 
 ADD_LIBRARY (clickhouse-cpp-lib-static STATIC ${clickhouse-cpp-lib-src})
 TARGET_LINK_LIBRARIES (clickhouse-cpp-lib-static
     cityhash-lib
     lz4-lib
-    absl::numeric
-    absl::strings
 )
 
 IF (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
@@ -55,7 +51,6 @@ INSTALL(TARGETS clickhouse-cpp-lib clickhouse-cpp-lib-static
     LIBRARY DESTINATION lib
 )
 
-
 # general
 INSTALL(FILES block.h DESTINATION include/clickhouse/)
 INSTALL(FILES client.h DESTINATION include/clickhouse/)
@@ -95,4 +90,4 @@ INSTALL(FILES columns/uuid.h DESTINATION include/clickhouse/columns/)
 
 # types
 INSTALL(FILES types/type_parser.h DESTINATION include/clickhouse/types/)
-INSTALL(FILES types/types.h DESTINATION include/clickhouse/types/)
+INSTALL(FILES types/types.h DESTINATION include/clickhouse/types/)

clickhouse/columns/decimal.cpp

@@ -1,6 +1,5 @@
 #include "decimal.h"
 
-#include <absl/strings/numbers.h>
 #include <iostream>
 
 namespace clickhouse {
@@ -22,21 +21,21 @@ ColumnDecimal::ColumnDecimal(TypeRef type)
 {
 }
 
-void ColumnDecimal::Append(const Int128& value) {
+void ColumnDecimal::Append(const BigInt& value) {
     if (data_->Type()->GetCode() == Type::Int32) {
         //data_->As<ColumnInt32>()->Append(static_cast<ColumnInt32::DataType>(value));
-        static_cast<std::shared_ptr<ColumnInt32>>(data_->As<ColumnInt32>())->Append(static_cast<ColumnInt32::DataType>(value));
+        static_cast<std::shared_ptr<ColumnInt32>>(data_->As<ColumnInt32>())->Append(static_cast<ColumnInt32::DataType>(value.to_long()));
     } else if (data_->Type()->GetCode() == Type::Int64) {
         //data_->As<ColumnInt64>()->Append(static_cast<ColumnInt64::DataType>(value));
-        static_cast<std::shared_ptr<ColumnInt64>>(data_->As<ColumnInt64>())->Append(static_cast<ColumnInt64::DataType>(value));
+        static_cast<std::shared_ptr<ColumnInt64>>(data_->As<ColumnInt64>())->Append(static_cast<ColumnInt64::DataType>(value.to_long_long()));
     } else {
         //data_->As<ColumnInt128>()->Append(static_cast<ColumnInt128::DataType>(value));
         static_cast<std::shared_ptr<ColumnInt128>>(data_->As<ColumnInt128>())->Append(static_cast<ColumnInt128::DataType>(value));
     }
 }
 
 void ColumnDecimal::Append(const std::string& value) {
-    Int128 int_value = 0;
+    BigInt int_value = 0; 
     auto c = value.begin();
     auto end = value.end();
     bool sign = true;
@@ -64,11 +63,6 @@ void ColumnDecimal::Append(const std::string& value) {
         } else if (*c >= '0' && *c <= '9') {
             int_value *= 10;
             int_value += *c - '0';
-            // TODO: check overflows
-            //if (__builtin_mul_overflow(int_value, 10, &int_value) ||
-            //    __builtin_add_overflow(int_value, *c - '0', &int_value)) {
-            //    throw std::runtime_error("value is too big for 128-bit integer");
-            //}
         } else {
             throw std::runtime_error(std::string("unexpected symbol '") + (*c) + "' in decimal value");
         }
@@ -81,21 +75,17 @@ void ColumnDecimal::Append(const std::string& value) {
 
     while (zeros) {
         int_value *= 10;
-        // TODO: check overflows
-        //if (__builtin_mul_overflow(int_value, 10, &int_value)) {
-        //    throw std::runtime_error("value is too big for 128-bit integer");
-        //}
         --zeros;
     }
 
     Append(sign ? int_value : -int_value);
 }
 
-Int128 ColumnDecimal::At(size_t i) const {
+BigInt ColumnDecimal::At(size_t i) const {
     if (data_->Type()->GetCode() == Type::Int32) {
-        return static_cast<Int128>(data_->As<ColumnInt32>()->At(i));
+        return static_cast<BigInt>(data_->As<ColumnInt32>()->At(i));
     } else if (data_->Type()->GetCode() == Type::Int64) {
-        return static_cast<Int128>(data_->As<ColumnInt64>()->At(i));
+        return static_cast<BigInt>(data_->As<ColumnInt64>()->At(i));
     } else {
         return data_->As<ColumnInt128>()->At(i);
     }

clickhouse/columns/decimal.h

@@ -12,10 +12,10 @@ class ColumnDecimal : public Column {
 public:
     ColumnDecimal(size_t precision, size_t scale);
 
-    void Append(const Int128& value);
+    void Append(const BigInt& value);
     void Append(const std::string& value);
 
-    Int128 At(size_t i) const;
+    BigInt At(size_t i) const;
 
 public:
     void Append(ColumnRef column) override;

clickhouse/columns/numeric.cpp

@@ -74,7 +74,7 @@ template class ColumnVector<uint8_t>;
 template class ColumnVector<uint16_t>;
 template class ColumnVector<uint32_t>;
 template class ColumnVector<uint64_t>;
-template class ColumnVector<Int128>;
+template class ColumnVector<BigInt>;
 
 template class ColumnVector<float>;
 template class ColumnVector<double>;

clickhouse/columns/numeric.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <absl/numeric/int128.h>
 #include "column.h"
 
 namespace clickhouse {
@@ -49,8 +48,6 @@ class ColumnVector : public Column {
     std::vector<T> data_;
 };
 
-using Int128 = absl::int128;
-
 using ColumnUInt8   = ColumnVector<uint8_t>;
 using ColumnUInt16  = ColumnVector<uint16_t>;
 using ColumnUInt32  = ColumnVector<uint32_t>;
@@ -60,7 +57,7 @@ using ColumnInt8    = ColumnVector<int8_t>;
 using ColumnInt16   = ColumnVector<int16_t>;
 using ColumnInt32   = ColumnVector<int32_t>;
 using ColumnInt64   = ColumnVector<int64_t>;
-using ColumnInt128  = ColumnVector<Int128>;
+using ColumnInt128  = ColumnVector<BigInt>;
 
 using ColumnFloat32 = ColumnVector<float>;
 using ColumnFloat64 = ColumnVector<double>;

clickhouse/types/types.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <absl/numeric/int128.h>
+#include <BigInt.hpp>
 
 #include <map>
 #include <memory>
@@ -9,7 +9,6 @@
 
 namespace clickhouse {
 
-using Int128 = absl::int128;
 using TypeRef = std::shared_ptr<class Type>;
 
 class Type {
@@ -203,7 +202,7 @@ inline TypeRef Type::CreateSimple<int64_t>() {
 }
 
 template <>
-inline TypeRef Type::CreateSimple<Int128>() {
+inline TypeRef Type::CreateSimple<BigInt>() {
     return TypeRef(new Type(Int128));
 }