Allow clients that lack absl to built and use the library

.travis.yml

@@ -44,15 +44,20 @@ before_install: |
  sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E0C56BD4
  echo "deb https://repo.clickhouse.tech/deb/stable/ main/" | sudo tee \
  /etc/apt/sources.list.d/clickhouse.list
- sudo apt-get update -q && sudo apt-get install -q -y --allow-unauthenticated clickhouse-server
+ sudo apt-get update -q
+ sudo apt-get install -q -y --allow-unauthenticated clickhouse-server
  sudo service clickhouse-server start
  fi
 
 # Build steps
-script:
- - eval "${MATRIX_EVAL}"
- - mkdir build
- - cd build
- - cmake .. -DBUILD_TESTS=ON && make
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./ut/clickhouse-cpp-ut ; fi
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./ut/clickhouse-cpp-ut --gtest_filter=-"Client/*:*Performance*" ; fi
+script: |
+ eval "${MATRIX_EVAL}"
+ mkdir build
+ cd build
+ cmake .. -DBUILD_TESTS=ON && cmake --build . --target all
+ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./ut/clickhouse-cpp-ut ; fi
+ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./ut/clickhouse-cpp-ut --gtest_filter=-"Client/*:*Performance*" ; fi
+ # Test clients that do not have absl in the system still can be built
+ cmake --install . && cmake --build . --target clean
+ cd ../tests/simple && mkdir build && cd ./build
+ cmake .. -DBUILD_SAMPLE_WITH_INT128=ON -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD_REQUIRED=ON && cmake --build . --target all

CMakeLists.txt

@@ -10,9 +10,9 @@ PROJECT (CLICKHOUSE-CLIENT)
 
  USE_CXX17()
 
- IF ("${CMAKE_BUILD_TYPE}" STREQUAL "")
- set(CMAKE_BUILD_TYPE "Debug")
- ENDIF()
+ IF ("${CMAKE_BUILD_TYPE}" STREQUAL "")
+ set(CMAKE_BUILD_TYPE "Debug")
+ ENDIF()
 
  IF (UNIX)
  IF (APPLE)
@@ -43,4 +43,4 @@ PROJECT (CLICKHOUSE-CLIENT)
  tests/simple
  ut
  )
- ENDIF (BUILD_TESTS)
+ ENDIF (BUILD_TESTS)

clickhouse/CMakeLists.txt

@@ -100,3 +100,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/int128.h DESTINATION include/clickhouse/types/)

clickhouse/columns/date.cpp

@@ -1,5 +1,7 @@
 #include "date.h"
 
+#include "../types/int128.h"
+
 namespace clickhouse {
 
 ColumnDate::ColumnDate()

clickhouse/columns/decimal.cpp

@@ -1,5 +1,7 @@
 #include "decimal.h"
 
+#include "../types/int128.h"
+
 namespace
 {
 using namespace clickhouse;
@@ -117,6 +119,10 @@ ColumnDecimal::ColumnDecimal(TypeRef type, ColumnRef data)
 {
 }
 
+void ColumnDecimal::Append(Int64 value) {
+ Append(static_cast<Int128>(value));
+}
+
 void ColumnDecimal::Append(const Int128& value) {
  if (data_->Type()->GetCode() == Type::Int32) {
  data_->As<ColumnInt32>()->Append(static_cast<ColumnInt32::DataType>(value));
@@ -191,6 +197,10 @@ Int128 ColumnDecimal::At(size_t i) const {
  }
 }
 
+Int64 ColumnDecimal::AtAsInt64(size_t i) const {
+ return static_cast<Int64>(At(i));
+}
+
 void ColumnDecimal::Append(ColumnRef column) {
  if (auto col = column->As<ColumnDecimal>()) {
  data_->Append(col->data_);

clickhouse/columns/decimal.h

@@ -12,10 +12,12 @@ class ColumnDecimal : public Column {
 public:
  ColumnDecimal(size_t precision, size_t scale);
 
+ void Append(Int64 value); /// When Int128 is not supported by\not available to users.
  void Append(const Int128& value);
  void Append(const std::string& value);
 
  Int128 At(size_t i) const;
+ Int64 AtAsInt64(size_t i) const; /// result will overflow if value doesn't fit into Int64.
 
 public:
  void Append(ColumnRef column) override;

clickhouse/columns/factory.cpp

@@ -16,6 +16,7 @@
 #include "uuid.h"
 
 #include "../types/type_parser.h"
+#include "../types/int128.h"
 
 #include <stdexcept>
 

clickhouse/columns/numeric.cpp

@@ -1,6 +1,8 @@
 #include "numeric.h"
 #include "utils.h"
 
+#include "../types/int128.h"
+
 namespace clickhouse {
 
 template <typename T>

clickhouse/columns/numeric.h

@@ -1,7 +1,11 @@
 #pragma once
 
 #include "column.h"
-#include "absl/numeric/int128.h"
+
+namespace absl
+{
+class int128;
+}
 
 namespace clickhouse {
 

clickhouse/types/int128.h

@@ -0,0 +1,9 @@
+#pragma once
+
+/// In a separate header to allow basic non-Int128 functionality on systems that lack absl.
+#include <absl/numeric/int128.h>
+
+namespace clickhouse
+{
+using Int128 = absl::int128;
+}

clickhouse/types/types.h

@@ -1,13 +1,16 @@
 #pragma once
 
-#include "absl/numeric/int128.h"
-
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 #include <stdexcept>
 
+namespace absl
+{
+class int128;
+}
+
 namespace clickhouse {
 
 using Int128 = absl::int128;

tests/simple/CMakeLists.txt

@@ -2,6 +2,12 @@ ADD_EXECUTABLE (simple-test
  main.cpp
 )
 
+OPTION(BUILD_SAMPLE_WITH_INT128 "Build sample program with Int128 support" ON)
+
 TARGET_LINK_LIBRARIES (simple-test
  clickhouse-cpp-lib
-)
+)
+
+if (BUILD_TESTS_WITH_INT128)
+ target_compile_definitions(simple-test WITH_INT128)
+endif()

tests/simple/main.cpp

@@ -2,6 +2,10 @@
 #include <clickhouse/error_codes.h>
 #include <clickhouse/types/type_parser.h>
 
+#if WITH_INT128
+#include <clickhouse/types/int128.h>
+#endif
+
 #include <stdexcept>
 #include <iostream>
 #include <cmath>
@@ -145,12 +149,15 @@ inline void DateTime64Example(Client& client) {
  /// Create a table.
  client.Execute("CREATE TABLE IF NOT EXISTS test.datetime64 (dt64 DateTime64(6)) ENGINE = Memory");
 
- auto d = std::make_shared<ColumnDateTime64>(6);
- d->Append(std::time(nullptr) * 1000000 + 123456);
- b.AppendColumn("d", d);
+ {
+ auto dt64 = std::make_shared<ColumnDateTime64>(6);
+ dt64->Append(std::time(nullptr) * 1000000 + 123456);
+ b.AppendColumn("dt64", dt64);
+ }
+
  client.Insert("test.datetime64", b);
 
- client.Select("SELECT d FROM test.date", [](const Block& block)
+ client.Select("SELECT dt64 FROM test.datetime64", [](const Block& block)
  {
  for (size_t c = 0; c < block.GetRowCount(); ++c) {
  auto col = block[0]->As<ColumnDateTime64>();
@@ -183,7 +190,7 @@ inline void DecimalExample(Client& client) {
  {
  for (size_t c = 0; c < block.GetRowCount(); ++c) {
  auto col = block[0]->As<ColumnDecimal>();
- cout << (int)col->At(c) << endl;
+ cout << (int)col->AtAsInt64(c) << endl;
  }
  }
  );
@@ -192,7 +199,7 @@ inline void DecimalExample(Client& client) {
  {
  for (size_t c = 0; c < block.GetRowCount(); ++c) {
  auto col = block[0]->As<ColumnDecimal>();
- cout << (int)col->At(c) << endl;
+ cout << (int)col->AtAsInt64(c) << endl;
  }
  }
  );
@@ -478,6 +485,7 @@ inline void IPExample(Client &client) {
 }
 
 static void RunTests(Client& client) {
+ client.Execute("CREATE DATABASE IF NOT EXISTS test");
  ArrayExample(client);
  CancelableExample(client);
  DateExample(client);

ut/client_ut.cpp

@@ -1,6 +1,8 @@
 #include <clickhouse/client.h>
 #include <contrib/gtest/gtest.h>
 
+#include <clickhouse/types/int128.h>
+
 #include <cmath>
 
 using namespace clickhouse;

ut/columns_ut.cpp

@@ -7,6 +7,7 @@
 #include <clickhouse/columns/numeric.h>
 #include <clickhouse/columns/string.h>
 #include <clickhouse/columns/uuid.h>
+#include <clickhouse/types/int128.h>
 
 #include <contrib/gtest/gtest.h>
 #include "utils.h"

ut/itemview_ut.cpp

@@ -1,5 +1,6 @@
 #include <clickhouse/columns/itemview.h>
 #include <clickhouse/columns/numeric.h>
+#include <clickhouse/types/int128.h>
 
 #include <contrib/gtest/gtest.h>
 #include "utils.h"