fixed FromVectorGenerator, fixed GenericColumnTest<ColumnFixedString>

Author: Enmk

ut/Column_ut.cpp

@@ -40,17 +40,18 @@ class GenericColumnTest : public testing::Test {
     static auto MakeColumn() {
         if constexpr (std::is_same_v<ColumnType, ColumnFixedString>) {
             return std::make_shared<ColumnFixedString>(12);
-        } if constexpr (std::is_same_v<ColumnType, ColumnDateTime64>) {
+        } else if constexpr (std::is_same_v<ColumnType, ColumnDateTime64>) {
                 return std::make_shared<ColumnDateTime64>(3);
         } else {
             return std::make_shared<ColumnType>();
         }
     }
 
     static auto GenerateValues(size_t values_size) {
-        if constexpr (std::is_same_v<ColumnType, ColumnFixedString>
-                || std::is_same_v<ColumnType, ColumnString>) {
+        if constexpr (std::is_same_v<ColumnType, ColumnString>) {
             return GenerateVector(values_size, FooBarGenerator);
+        } else if constexpr (std::is_same_v<ColumnType, ColumnFixedString>) {
+            return GenerateVector(values_size, FromVectorGenerator{MakeFixedStrings(12)});
         } else if constexpr (std::is_same_v<ColumnType, ColumnDate>) {
             return GenerateVector(values_size, FromVectorGenerator{MakeDates()});
         } else if constexpr (std::is_same_v<ColumnType, ColumnDateTime>) {

ut/columns_ut.cpp

@@ -59,7 +59,7 @@ TEST(ColumnsCase, NumericSlice) {
 
 
 TEST(ColumnsCase, FixedStringInit) {
-    const auto column_data = MakeFixedStrings();
+    const auto column_data = MakeFixedStrings(3);
     auto col = std::make_shared<ColumnFixedString>(3, column_data);
 
     ASSERT_EQ(col->Size(), column_data.size());
@@ -76,7 +76,7 @@ TEST(ColumnsCase, FixedString_Append_SmallStrings) {
     // are padded with zeroes on insertion.
 
     const size_t string_size = 7;
-    const auto column_data = MakeFixedStrings();
+    const auto column_data = MakeFixedStrings(3);
 
     auto col = std::make_shared<ColumnFixedString>(string_size);
     size_t i = 0;

ut/value_generators.cpp

@@ -17,9 +17,15 @@ std::vector<uint8_t> MakeBools() {
         {1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0};
 }
 
-std::vector<std::string> MakeFixedStrings() {
-    return std::vector<std::string>
+std::vector<std::string> MakeFixedStrings(size_t string_size) {
+    std::vector<std::string> result
         {"aaa", "bbb", "ccc", "ddd"};
+
+    std::for_each(result.begin(), result.end(), [string_size](auto& value) {
+        value.resize(string_size, '\0');
+    });
+
+    return result;
 }
 
 std::vector<std::string> MakeStrings() {

ut/value_generators.h

@@ -29,7 +29,7 @@ inline in6_addr MakeIPv6(uint8_t v10, uint8_t v11, uint8_t v12, uint8_t v13, uin
 
 std::vector<uint32_t> MakeNumbers();
 std::vector<uint8_t> MakeBools();
-std::vector<std::string> MakeFixedStrings();
+std::vector<std::string> MakeFixedStrings(size_t string_size);
 std::vector<std::string> MakeStrings();
 std::vector<uint64_t> MakeUUIDs();
 std::vector<clickhouse::Int64> MakeDateTime64s(size_t scale, size_t values_size = 200);
@@ -108,7 +108,7 @@ struct FromVectorGenerator {
 
     FromVectorGenerator(std::vector<T> data_)
         : data(std::move(data_)),
-          random_generator(0, 0, data.size())
+          random_generator(0, 0, data.size() - 1)
     {}
 
     auto operator()(size_t pos) {