YQL-19758 fixed parsing of Error type, prevent expanding of aggregation/window over inputs with errors

commit_hash:fa39bb9947d55827107b96ddf0c102fe6a5ae0bd

Author: vitstn

yql/essentials/ast/yql_type_string.cpp

@@ -92,6 +92,7 @@ enum EToken
     TOKEN_TZDATETIME64 = -57,
     TOKEN_TZTIMESTAMP64 = -58,
     TOKEN_MULTI = -59,
+    TOKEN_ERROR = -60,
 
     // identifiers
     TOKEN_IDENTIFIER = -100,
@@ -164,6 +165,7 @@ EToken TokenTypeFromStr(TStringBuf str)
         { TStringBuf("TzDate32"), TOKEN_TZDATE32 },
         { TStringBuf("TzDatetime64"), TOKEN_TZDATETIME64},
         { TStringBuf("TzTimestamp64"), TOKEN_TZTIMESTAMP64 },
+        { TStringBuf("Error"), TOKEN_ERROR},
     };
 
     auto it = map.find(str);
@@ -343,6 +345,10 @@ class TTypeParser
             type = ParseScalarType();
             break;
 
+        case TOKEN_ERROR:
+            type = ParseErrorType();
+            break;
+
         default:
             if (Identifier.empty()) {
                 return AddError("Expected type");
@@ -703,6 +709,51 @@ class TTypeParser
         return MakeScalarType(itemType);
     }
 
+    TAstNode* ParseErrorType() {
+        GetNextToken(); // eat keyword
+        EXPECT_AND_SKIP_TOKEN('<', nullptr);
+
+        TString file;
+        if (Token == TOKEN_IDENTIFIER ||
+            Token == TOKEN_ESCAPED_IDENTIFIER)
+        {
+            file = Identifier;
+        } else {
+            return AddError("Expected file name");
+        }
+
+        GetNextToken(); // eat file name
+        EXPECT_AND_SKIP_TOKEN(':', nullptr);
+        ui32 line;
+        if (!(Token == TOKEN_IDENTIFIER ||
+            Token == TOKEN_ESCAPED_IDENTIFIER) || !TryFromString(Identifier, line)) {
+            return AddError("Expected line");
+        }
+
+        GetNextToken();
+        EXPECT_AND_SKIP_TOKEN(':', nullptr);
+        ui32 column;
+        if (!(Token == TOKEN_IDENTIFIER ||
+            Token == TOKEN_ESCAPED_IDENTIFIER) || !TryFromString(Identifier, column)) {
+            return AddError("Expected column");
+        }
+
+        GetNextToken();
+        EXPECT_AND_SKIP_TOKEN(':', nullptr);
+        TString message;
+        if (Token == TOKEN_IDENTIFIER ||
+            Token == TOKEN_ESCAPED_IDENTIFIER)
+        {
+            message = Identifier;
+        } else {
+            return AddError("Expected message");
+        }
+
+        GetNextToken();
+        EXPECT_AND_SKIP_TOKEN('>', nullptr);
+        return MakeErrorType(file, line, column, message);
+    }
+
     TAstNode* ParseDecimalType() {
         GetNextToken(); // eat keyword
         EXPECT_AND_SKIP_TOKEN('(', nullptr);
@@ -974,6 +1025,17 @@ class TTypeParser
         return MakeList(items, Y_ARRAY_SIZE(items));
     }
 
+    TAstNode* MakeErrorType(TStringBuf file, ui32 row, ui32 column, TStringBuf message) {
+        TAstNode* items[] = {
+            MakeLiteralAtom(TStringBuf("ErrorType")),
+            MakeQuotedAtom(ToString(row)),
+            MakeQuotedAtom(ToString(column)),
+            MakeQuotedAtom(file, TNodeFlags::ArbitraryContent),
+            MakeQuotedAtom(message, TNodeFlags::ArbitraryContent)
+        };
+        return MakeList(items, Y_ARRAY_SIZE(items));
+    }
+
     TAstNode* MakeVariantType(TAstNode* underlyingType) {
         TAstNode* items[] = {
             MakeLiteralAtom(TStringBuf("VariantType")),

yql/essentials/ast/yql_type_string_ut.cpp

@@ -520,6 +520,10 @@ Y_UNIT_TEST_SUITE(TTypeString)
         TestOk("Struct<>", "(StructType)");
     }
 
+    Y_UNIT_TEST(ParseErrorType) {
+        TestOk("Error<'<main>':1:2:'message'>", "(ErrorType '1 '2 '\"<main>\" '\"message\")");
+    }
+
     void TestFormat(const TString& yql, const TString& expectedTypeStr) {
         TMemoryPool pool(4096);
 

yql/essentials/core/yql_aggregate_expander.cpp

@@ -12,6 +12,12 @@ namespace NYql {
 
 TExprNode::TPtr TAggregateExpander::ExpandAggregate() {
     YQL_CLOG(DEBUG, Core) << "Expand " << Node->Content();
+    if (Node->Head().GetTypeAnn()->HasErrors()) {
+        TErrorTypeVisitor errorVisitor(Ctx);
+        Node->Head().GetTypeAnn()->Accept(errorVisitor);
+        return nullptr;
+    }
+
     auto result = ExpandAggregateWithFullOutput();
     if (result) {
         auto outputColumns = GetSetting(*Node->Child(NNodes::TCoAggregate::idx_Settings), "output_columns");

yql/essentials/core/yql_opt_window.cpp

@@ -3292,6 +3292,12 @@ TExprNode::TPtr ExpandCalcOverWindow(const TExprNode::TPtr& node, TExprContext&
         return input;
     }
 
+    if (input->GetTypeAnn()->HasErrors()) {
+        TErrorTypeVisitor errorVisitor(ctx);
+        input->GetTypeAnn()->Accept(errorVisitor);
+        return nullptr;
+    }
+
     TCoCalcOverWindowTuple calc(calcs.front());
     if (calc.Frames().Size() != 0 || calc.SessionColumns().Size() != 0) {
         const TStructExprType& outputRowType = *node->GetTypeAnn()->Cast<TListExprType>()->GetItemType()->Cast<TStructExprType>();