avoid extra allocations (ClickHouse#96)

* don't build tests by default
* avoid extra allocations
* fix travis
* add GetTupleType Function

Author: artpaul

.travis.yml

@@ -49,6 +49,6 @@ script:
   - eval "${MATRIX_EVAL}"
   - mkdir build
   - cd build
-  - cmake .. && make
+  - 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/*' ; fi

CMakeLists.txt

@@ -4,11 +4,16 @@ INCLUDE (cmake/cpp17.cmake)
 INCLUDE (cmake/subdirs.cmake)
 
 OPTION(BUILD_BENCHMARK "Build benchmark" OFF)
+OPTION(BUILD_TESTS "Build tests" OFF)
 
 PROJECT (CLICKHOUSE-CLIENT)
 
     USE_CXX17()
 
+	IF ("${CMAKE_BUILD_TYPE}" STREQUAL "")
+		set(CMAKE_BUILD_TYPE "Debug")
+	ENDIF()
+
     IF (UNIX)
         IF (APPLE)
             SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall -Wextra -Werror")
@@ -24,12 +29,17 @@ PROJECT (CLICKHOUSE-CLIENT)
     SUBDIRS (
         clickhouse
         contrib/cityhash
-        contrib/gtest
         contrib/lz4
-        tests/simple
-        ut
     )
 
     IF (BUILD_BENCHMARK)
         SUBDIRS(bench)
     ENDIF (BUILD_BENCHMARK)
+
+    IF (BUILD_TESTS)
+        SUBDIRS(
+            contrib/gtest
+            tests/simple
+            ut
+        )
+	ENDIF (BUILD_TESTS)

README.md

@@ -23,7 +23,7 @@ C++ client for [Yandex ClickHouse](https://clickhouse.yandex/)
 ```sh
 $ mkdir build .
 $ cd build
-$ cmake ..
+$ cmake .. [-DBUILD_TESTS=ON]
 $ make
 ```
 

clickhouse/columns/factory.cpp

@@ -105,6 +105,7 @@ static ColumnRef CreateColumnFromAst(const TypeAst& ast) {
         case TypeAst::Tuple: {
             std::vector<ColumnRef> columns;
 
+            columns.reserve(ast.elements.size());
             for (const auto& elem : ast.elements) {
                 if (auto col = CreateColumnFromAst(elem)) {
                     columns.push_back(col);
@@ -119,6 +120,7 @@ static ColumnRef CreateColumnFromAst(const TypeAst& ast) {
         case TypeAst::Enum: {
             std::vector<Type::EnumItem> enum_items;
 
+            enum_items.reserve(ast.elements.size());
             for (const auto& elem : ast.elements) {
                 enum_items.push_back(
                     Type::EnumItem{elem.name, (int16_t)elem.value});

clickhouse/columns/string.cpp

@@ -52,7 +52,7 @@ bool ColumnFixedString::Load(CodedInputStream* input, size_t rows) {
             return false;
         }
 
-        data_.emplace_back(std::move(s));
+        data_.push_back(std::move(s));
     }
 
     return true;
@@ -122,7 +122,7 @@ bool ColumnString::Load(CodedInputStream* input, size_t rows) {
             return false;
         }
 
-        data_.emplace_back(std::move(s));
+        data_.push_back(std::move(s));
     }
 
     return true;

clickhouse/columns/uuid.cpp

@@ -15,7 +15,7 @@ ColumnUUID::ColumnUUID(ColumnRef data)
     : Column(Type::CreateUUID())
     , data_(data->As<ColumnUInt64>())
 {
-    if (data_->Size()%2 != 0) {
+    if (data_->Size() % 2 != 0) {
         throw std::runtime_error("number of entries must be even (two 64-bit numbers for each UUID)");
     }
 }

clickhouse/types/types.h

@@ -181,6 +181,9 @@ class TupleType : public Type {
 
     std::string GetName() const;
 
+    /// Type of nested Tuple element type.
+    std::vector<TypeRef> GetTupleType() const { return item_types_; }
+
 private:
     std::vector<TypeRef> item_types_;
 };