Merge 72f15bb into e44bcd8

Author: avevad

ydb/library/yql/core/type_ann/type_ann_core.cpp

@@ -12346,6 +12346,8 @@ template <NKikimr::NUdf::EDataSlot DataSlot>
         Functions["ListFlatten"] = &ListFlattenWrapper;
         Functions["ListUniq"] = &ListUniqWrapper;
         Functions["ListUniqStable"] = &ListUniqStableWrapper;
+        Functions["ListTop"] = &ListTopSortWrapper;
+        Functions["ListTopSort"] = &ListTopSortWrapper;
 
         Functions["ExpandMap"] = &ExpandMapWrapper;
         Functions["WideMap"] = &WideMapWrapper;

ydb/library/yql/core/type_ann/type_ann_list.cpp

@@ -1436,6 +1436,36 @@ namespace {
         return OptListWrapperImpl<3U>(input, output, ctx, "Sort");
     }
 
+    IGraphTransformer::TStatus ListTopSortWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx) {
+        TExprNode::TPtr outputPre = nullptr;
+        auto res = OptListWrapperImpl<2U, 3U>(input, outputPre, ctx, input->Content().Skip(4));
+        if (res != IGraphTransformer::TStatus::Repeat) {
+            return res;
+        }
+        TExprNode::TPtr sortLambda = nullptr;
+        if (outputPre->ChildrenSize() == 3) {
+            sortLambda = outputPre->ChildPtr(2);
+        } else {
+            sortLambda = ctx.Expr.Builder(input->Pos())
+                .Lambda()
+                    .Param("item")
+                    .Arg("item")
+                .Seal()
+            .Build();
+        }
+        output = ctx.Expr.Builder(input->Pos())
+            .Callable(outputPre->Content())
+                .Add(0, outputPre->ChildPtr(0))
+                .Add(1, outputPre->ChildPtr(1))
+                .Callable(2, "Bool")
+                    .Atom(0, "true")
+                .Seal()
+                .Add(3, sortLambda)
+            .Seal()
+        .Build();
+        return res;
+    }
+
     IGraphTransformer::TStatus ListExtractWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx) {
         return OptListWrapperImpl<2U>(input, output, ctx, "OrderedExtract");
     }

ydb/library/yql/core/type_ann/type_ann_list.h

@@ -37,6 +37,8 @@ namespace NTypeAnnImpl {
     IGraphTransformer::TStatus ListEnumerateWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx);
     IGraphTransformer::TStatus ListReverseWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx);
     IGraphTransformer::TStatus ListSortWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx);
+    IGraphTransformer::TStatus ListTopWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx);
+    IGraphTransformer::TStatus ListTopSortWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx);
     IGraphTransformer::TStatus ListExtractWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx);
     IGraphTransformer::TStatus ListCollectWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx);
     IGraphTransformer::TStatus FoldMapWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx);

ydb/library/yql/sql/v1/builtin.cpp

@@ -2904,6 +2904,8 @@ struct TBuiltinFuncData {
             {"listcollect", BuildNamedArgcBuiltinFactoryCallback<TCallNodeImpl>("ListCollect", 1, 1) },
             {"listnotnull", BuildNamedArgcBuiltinFactoryCallback<TCallNodeImpl>("ListNotNull", 1, 1)},
             {"listflatten", BuildNamedArgcBuiltinFactoryCallback<TCallNodeImpl>("ListFlatten", 1, 1)},
+            {"listtop", BuildNamedArgcBuiltinFactoryCallback<TCallNodeImpl>("ListTop", 2, 3)},
+            {"listtopsort", BuildNamedArgcBuiltinFactoryCallback<TCallNodeImpl>("ListTopSort", 2, 3)},
 
             // Dict builtins
             {"dictlength", BuildNamedArgcBuiltinFactoryCallback<TCallNodeImpl>("Length", 1, 1)},