float and double columns have been added

Author: dorooleg

ydb/services/ydb/ydb_bulk_upsert_olap_ut.cpp

@@ -131,6 +131,49 @@ NKikimrConfig::TAppConfig GetAppConfig() {
     return appConfig;
 }
 
+void CreateExtTable(const TServerSettings& settings, ui32 shards = 2,
+                        const TString& storeName = TTestOlap::StoreName, const TString& tableName = TTestOlap::TableName) {
+    TString tableDescr = Sprintf(R"(
+        Name: "%s"
+        ColumnShardCount: 4
+        SchemaPresets {
+            Name: "default"
+            Schema {
+                Columns { Name: "timestamp" Type: "Timestamp" NotNull : true }
+                Columns { Name: "resource_type" Type: "Utf8" }
+                Columns { Name: "resource_id" Type: "Utf8" }
+                Columns { Name: "uid" Type: "Utf8" NotNull : true }
+                Columns { Name: "level" Type: "Int32" }
+                Columns { Name: "message" Type: "Utf8" }
+                Columns { Name: "json_payload" Type: "JsonDocument" }
+                Columns { Name: "ingested_at" Type: "Timestamp" }
+                Columns { Name: "saved_at" Type: "Timestamp" }
+                Columns { Name: "request_id" Type: "Utf8" }
+                Columns { Name: "flt" Type: "Float" }
+                Columns { Name: "dbl" Type: "Double" }
+                KeyColumnNames: "timestamp"
+                KeyColumnNames: "uid"
+            }
+        }
+    )", storeName.c_str());
+
+    TClient annoyingClient(settings);
+    annoyingClient.SetSecurityToken("root@builtin");
+    NMsgBusProxy::EResponseStatus status = annoyingClient.CreateOlapStore("/Root", tableDescr);
+    UNIT_ASSERT_VALUES_EQUAL(status, NMsgBusProxy::EResponseStatus::MSTATUS_OK);
+    status = annoyingClient.CreateColumnTable("/Root", Sprintf(R"(
+        Name: "%s/%s"
+        ColumnShardCount : %d
+        Sharding {
+            HashSharding {
+                Function: HASH_FUNCTION_CLOUD_LOGS
+                Columns: ["timestamp", "uid"]
+            }
+        }
+    )", storeName.c_str(), tableName.c_str(), shards));
+    UNIT_ASSERT_VALUES_EQUAL(status, NMsgBusProxy::EResponseStatus::MSTATUS_OK);
+}
+
 }
 
 Y_UNIT_TEST_SUITE(YdbTableBulkUpsertOlap) {
@@ -580,7 +623,7 @@ Y_UNIT_TEST_SUITE(YdbTableBulkUpsertOlap) {
         TKikimrWithGrpcAndRootSchema server(GetAppConfig());
         server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
 
-        TTestOlap::CreateTable(*server.ServerSettings);
+        TTestOlap::CreateTable(*server.ServerSettings); // 2 shards
 
         ui16 grpc = server.GetPort();
         TString location = TStringBuilder() << "localhost:" << grpc;
@@ -953,7 +996,7 @@ Y_UNIT_TEST_SUITE(YdbTableBulkUpsertOlap) {
         TKikimrWithGrpcAndRootSchema server(GetAppConfig());
         server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
 
-        TTestOlap::CreateTable(*server.ServerSettings);
+        CreateExtTable(*server.ServerSettings);
 
         ui16 grpc = server.GetPort();
         TString location = TStringBuilder() << "localhost:" << grpc;
@@ -965,8 +1008,8 @@ Y_UNIT_TEST_SUITE(YdbTableBulkUpsertOlap) {
 
         {
             TString csv =
-            "timestamp|resource_type|resource_id|uid|level|message|json_payload|ingested_at|saved_at|request_id\n"
-            "1970-01-01T00:00:00Z|OBJECT|123|guid|5|data|{}|1970-01-01T00:00:00Z|1970-01-01T00:00:00Z|125";
+            "timestamp|resource_type|resource_id|uid|level|message|json_payload|ingested_at|saved_at|request_id|flt|dbl\n"
+            "1970-01-01T00:00:00Z|OBJECT|123|guid|5|data|{\"key\":\"value\"}|1970-01-01T00:00:00Z|1970-01-01T00:00:00Z|1250|1e-17|1e-80";
 
             Ydb::Formats::CsvSettings csvSettings;
             csvSettings.set_header(true);
@@ -991,14 +1034,16 @@ Y_UNIT_TEST_SUITE(YdbTableBulkUpsertOlap) {
                 .BeginStruct()
                 .AddMember("timestamp").OptionalTimestamp(TInstant::Now())
                 .AddMember("resource_type").OptionalUtf8("FILE")
-                .AddMember("resource_id").OptionalUtf8("124")
+                .AddMember("resource_id").OptionalUtf8("12")
                 .AddMember("uid").OptionalUtf8("guid7")
-                .AddMember("level").OptionalInt32(6)
+                .AddMember("level").OptionalInt32(687)
                 .AddMember("message").OptionalUtf8("data2")
-                .AddMember("json_payload").OptionalJsonDocument("{}")
+                .AddMember("json_payload").OptionalJsonDocument("{\"key1\": \"value1\"}")
                 .AddMember("ingested_at").OptionalTimestamp(TInstant::Now())
                 .AddMember("saved_at").OptionalTimestamp(TInstant::Now())
                 .AddMember("request_id").OptionalUtf8("126")
+                .AddMember("flt").OptionalFloat(23.0)
+                .AddMember("dbl").OptionalDouble(1e+113)
                 .EndStruct();
             rowsBuilder.EndList();