Merge pull request #270 from den818/LC-bug

fix bug in ColumnLowCardinality::Load
ClickHouse · Dec 19, 2022 · d03dbfe · d03dbfe
2 parents 4251535 + 76cc8ee
commit d03dbfe
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/clickhouse/columns/lowcardinality.cpp b/clickhouse/columns/lowcardinality.cpp
@@ -281,7 +281,7 @@ auto Load(ColumnRef new_dictionary_column, InputStream& input, size_t rows) {
 
     if (auto nullable = new_dictionary_column->As<ColumnNullable>()) {
         nullable->Append(true);
-        for(std::size_t i = 1; i < new_index_column->Size(); i++) {
+        for(std::size_t i = 1; i < dataColumn->Size(); i++) {
             nullable->Append(false);
         }
     }

diff --git a/ut/low_cardinality_nullable_tests.cpp b/ut/low_cardinality_nullable_tests.cpp
@@ -78,6 +78,43 @@ TEST(LowCardinalityOfNullable, InsertAndQuery) {
     });
 }
 
+TEST(LowCardinalityOfNullable, InsertAndQueryOneRow) {
+    const auto rowsData = std::vector<std::string> {
+        "eminem"
+    };
+
+    const auto nulls = std::vector<uint8_t> {
+        false
+    };
+
+    auto column = buildTestColumn(rowsData, nulls);
+
+    Block block;
+    block.AppendColumn("words", column);
+
+    Client client(ClientOptions(localHostEndpoint)
+                             .SetBakcwardCompatibilityFeatureLowCardinalityAsWrappedColumn(false)
+                             .SetPingBeforeQuery(true));
+
+    createTable(client);
+
+    client.Insert("lc_of_nullable", block);
+
+    client.Select("SELECT * FROM lc_of_nullable", [&](const Block& bl) {
+        for (size_t row = 0; row < bl.GetRowCount(); row++) {
+            auto lc_col = bl[0]->As<ColumnLowCardinality>();
+            auto item = lc_col->GetItem(row);
+
+            if (nulls[row]) {
+                ASSERT_EQ(Type::Code::Void, item.type);
+            } else {
+                ASSERT_EQ(rowsData[row], item.get<std::string_view>());
+            }
+        }
+    });
+}
+
+
 TEST(LowCardinalityOfNullable, InsertAndQueryEmpty) {
     auto column = buildTestColumn({}, {});
 
@@ -113,4 +150,4 @@ TEST(LowCardinalityOfNullable, ThrowOnBackwardsCompatibleLCColumn) {
     client.Select("SELECT * FROM lc_of_nullable", [&](const Block& bl) {
         ASSERT_EQ(bl.GetRowCount(), 0u);
     });
-}
+}