Browse Source

Add GEN_FBS

spreis 1 year ago
parent
commit
4b4ac0bca2

+ 1 - 0
build/conf/fbs.conf

@@ -100,6 +100,7 @@ macro FBS_NAMESPACE(NAMESPACE, PATH...) {
 multimodule FBS_LIBRARY {
     module CPP_FBS: LIBRARY {
         ENABLE(CPP_FBS)
+        ENABLE(GEN_FBS)
         SET(PEERDIR_TAGS CPP_FBS)
     }
 

+ 2 - 2
yt/yt/core/http/http.cpp

@@ -11,7 +11,7 @@ using namespace NConcurrency;
 
 TStringBuf ToHttpString(EMethod method)
 {
-    switch(method) {
+    switch (method) {
 #define XX(num, name, string) case EMethod::name: return #string;
         YT_HTTP_METHOD_MAP(XX)
 #undef XX
@@ -21,7 +21,7 @@ TStringBuf ToHttpString(EMethod method)
 
 TStringBuf ToHttpString(EStatusCode code)
 {
-    switch(code) {
+    switch (code) {
 #define XX(num, name, string) case EStatusCode::name: return #string;
         YT_HTTP_STATUS_MAP(XX)
 #undef XX

+ 5 - 5
yt/yt/core/yson/protobuf_interop.cpp

@@ -1026,11 +1026,11 @@ protected:
                     data);
                 return;
             case EUtf8Check::ThrowOnFail:
-                THROW_ERROR_EXCEPTION("String field got non UTF-8 value (Path: %v)",
+                THROW_ERROR_EXCEPTION("Non UTF-8 value in string field %v",
                     YPathStack_.GetHumanReadablePath())
+                    << TErrorAttribute("non_utf8_string", data)
                     << TErrorAttribute("ypath", YPathStack_.GetPath())
-                    << TErrorAttribute("proto_field", fieldFullName)
-                    << TErrorAttribute("non_utf8_string", data);
+                    << TErrorAttribute("proto_field", fieldFullName);
         }
     }
 };
@@ -2511,7 +2511,7 @@ private:
 
                     case FieldDescriptor::TYPE_ENUM: {
                         ParseScalar([&] {
-                            switch(field->GetEnumYsonStorageType()) {
+                            switch (field->GetEnumYsonStorageType()) {
                                 case EEnumYsonStorageType::String:
                                     storeEnumAsString(unsignedValue);
                                     break;
@@ -2753,7 +2753,7 @@ private:
 
                     case FieldDescriptor::TYPE_ENUM: {
                         ParseVarintPacked<ui32>(length, field, [&] (auto value) {
-                            switch(field->GetEnumYsonStorageType()) {
+                            switch (field->GetEnumYsonStorageType()) {
                                 case EEnumYsonStorageType::String:
                                     storeEnumAsString(value);
                                     break;

+ 2 - 2
yt/yt/core/yson/unittests/protobuf_yson_ut.cpp

@@ -1033,7 +1033,7 @@ TEST(TYsonToProtobufTest, ValidUtf8StringCheck)
                 .EndMap();
         };
         if (option == EUtf8Check::ThrowOnFail) {
-            EXPECT_THROW_WITH_SUBSTRING(check(), "String field got non UTF-8 value");
+            EXPECT_THROW_WITH_SUBSTRING(check(), "Non UTF-8 value in string field");
         } else {
             EXPECT_NO_THROW(check());
         }
@@ -1045,7 +1045,7 @@ TEST(TYsonToProtobufTest, ValidUtf8StringCheck)
         TYsonWriter ysonWriter(&newYsonOutputStream, EYsonFormat::Pretty);
         if (option == EUtf8Check::ThrowOnFail) {
             EXPECT_THROW_WITH_SUBSTRING(
-                WriteProtobufMessage(&ysonWriter, message), "String field got non UTF-8 value");
+                WriteProtobufMessage(&ysonWriter, message), "Non UTF-8 value in string field");
         } else {
             EXPECT_NO_THROW(WriteProtobufMessage(&ysonWriter, message));
         }