Merge pull request #435 from ClickHouse/install-nullable-columns

Add nothing.h to the list of installed files

Author: slabko

clickhouse/CMakeLists.txt

@@ -221,6 +221,7 @@ INSTALL(FILES columns/ip4.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/ip6.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/itemview.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/lowcardinality.h DESTINATION include/clickhouse/columns/)
+INSTALL(FILES columns/nothing.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/nullable.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/numeric.h DESTINATION include/clickhouse/columns/)
 INSTALL(FILES columns/map.h DESTINATION include/clickhouse/columns/)

clickhouse/client.h

@@ -11,6 +11,7 @@
 #include "columns/ip4.h"
 #include "columns/ip6.h"
 #include "columns/lowcardinality.h"
+#include "columns/nothing.h"
 #include "columns/nullable.h"
 #include "columns/numeric.h"
 #include "columns/map.h"

ut/client_ut.cpp

@@ -434,6 +434,20 @@ TEST_P(ClientCase, Nullable) {
     EXPECT_EQ(sizeof(TEST_DATA) / sizeof(TEST_DATA[0]), row);
 }
 
+TEST_P(ClientCase, Nothing) {
+    size_t total_row_count = 0;
+    client_->Select("SELECT NULL", [&total_row_count](const Block & block)
+        {
+            total_row_count += block.GetRowCount();
+            for (size_t i = 0; i < block.GetRowCount(); ++i) {
+                EXPECT_TRUE(block[0]->AsStrict<ColumnNullable>()->IsNull(i));
+                auto column = ColumnNullableT<ColumnNothing>::Wrap(block[0]->AsStrict<ColumnNullable>());
+                EXPECT_FALSE(column->At(i).has_value());
+            }
+        });
+    ASSERT_EQ(total_row_count, 1UL);
+}
+
 TEST_P(ClientCase, Numbers) {
     try {
         size_t num = 0;