Merge b92903a into 91d6e34

Author: vitstn

ydb/docs/en/core/postgresql/_includes/functions.md

@@ -3869,13 +3869,13 @@ Table 9.57. General-Purpose Aggregate Functions
 Collects all the input values, including nulls, into an array. (NOT SUPPORTED)|
 No|
 ```sql
-#SELECT array_agg(x) FROM (VALUES (1),(2)) a(x) → {1,2}
+SELECT array_agg(x) FROM (VALUES (1),(2)) a(x) → {1,2}
 ```||
 ||array_agg ( anyarray ) → anyarray|
 Concatenates all the input arrays into an array of one higher dimension. (The inputs must all have the same dimensionality, and cannot be empty or null.) (NOT SUPPORTED)|
 No|
 ```sql
-#SELECT array_agg(x) FROM (VALUES (Array[1,2]),(Array[3,4])) a(x) → {{1,2},{3,4}}
+SELECT array_agg(x) FROM (VALUES (Array[1,2]),(Array[3,4])) a(x) → {{1,2},{3,4}}
 ```||
 ||avg ( smallint ) → numeric  
 avg ( integer ) → numeric  

ydb/docs/ru/core/postgresql/_includes/functions.md

@@ -3869,13 +3869,13 @@ Table 9.57. General-Purpose Aggregate Functions
 Collects all the input values, including nulls, into an array. (NOT SUPPORTED)|
 No|
 ```sql
-#SELECT array_agg(x) FROM (VALUES (1),(2)) a(x) → {1,2}
+SELECT array_agg(x) FROM (VALUES (1),(2)) a(x) → {1,2}
 ```||
 ||array_agg ( anyarray ) → anyarray|
 Concatenates all the input arrays into an array of one higher dimension. (The inputs must all have the same dimensionality, and cannot be empty or null.) (NOT SUPPORTED)|
 No|
 ```sql
-#SELECT array_agg(x) FROM (VALUES (Array[1,2]),(Array[3,4])) a(x) → {{1,2},{3,4}}
+SELECT array_agg(x) FROM (VALUES (Array[1,2]),(Array[3,4])) a(x) → {{1,2},{3,4}}
 ```||
 ||avg ( smallint ) → numeric  
 avg ( integer ) → numeric  

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

@@ -22,7 +22,7 @@ bool IsCastRequired(ui32 fromTypeId, ui32 toTypeId) {
     if (toTypeId == fromTypeId) {
         return false;
     }
-    if (toTypeId == NPg::AnyOid || toTypeId == NPg::AnyArrayOid) {
+    if (toTypeId == NPg::AnyOid || toTypeId == NPg::AnyArrayOid || toTypeId == NPg::AnyNonArrayOid) {
         return false;
     }
     return true;

ydb/library/yql/core/yql_expr_type_annotation.cpp

@@ -6331,6 +6331,7 @@ TExprNode::TPtr ExpandPgAggregationTraits(TPositionHandle pos, const NPg::TAggre
     auto saveLambda = idLambda;
     auto loadLambda = idLambda;
     auto finishLambda = idLambda;
+    auto nullValue = ctx.NewCallable(pos, "Null", {});
     if (aggDesc.FinalFuncId) {
         finishLambda = ctx.Builder(pos)
             .Lambda()
@@ -6341,12 +6342,18 @@ TExprNode::TPtr ExpandPgAggregationTraits(TPositionHandle pos, const NPg::TAggre
                 .List(2)
                 .Seal()
                 .Arg(3, "state")
+                .Do([&aggDesc, nullValue](TExprNodeBuilder& builder) -> TExprNodeBuilder& {
+                    if (aggDesc.FinalExtra) {
+                        builder.Add(4, nullValue);
+                    }
+
+                    return builder;
+                })
             .Seal()
             .Seal()
             .Build();
     }
 
-    auto nullValue = ctx.NewCallable(pos, "Null", {});
     auto initValue = nullValue;
     if (aggDesc.InitValue) {
         initValue = ctx.Builder(pos)

ydb/library/yql/parser/pg_catalog/catalog.cpp

@@ -73,6 +73,12 @@ bool IsCompatibleTo(ui32 actualTypeId, ui32 expectedTypeId, const TTypes& types)
         return actualDescPtr->ArrayTypeId == actualDescPtr->TypeId;
     }
 
+    if (expectedTypeId == AnyNonArrayOid) {
+        const auto& actualDescPtr = types.FindPtr(actualTypeId);
+        Y_ENSURE(actualDescPtr);
+        return actualDescPtr->ArrayTypeId != actualDescPtr->TypeId;
+    }
+
     return false;
 }
 
@@ -753,6 +759,8 @@ class TAggregationsParser : public TParser {
             }
         } else if (key == "agginitval") {
             LastAggregation.InitValue = value;
+        } else if (key == "aggfinalextra") {
+            LastAggregation.FinalExtra = (value == "t");;
         }
     }
 
@@ -1920,7 +1928,6 @@ bool IsCoercible(ui32 fromTypeId, ui32 toTypeId, ECoercionCode coercionType, con
     if (toTypeId == AnyOid) {
         return true;
     }
-
     //TODO: support polymorphic types
 
     if (fromTypeId == UnknownOid) {
@@ -1943,6 +1950,12 @@ bool IsCoercible(ui32 fromTypeId, ui32 toTypeId, ECoercionCode coercionType, con
         return actualDescPtr->ArrayTypeId == actualDescPtr->TypeId;
     }
 
+    if (toTypeId == AnyNonArrayOid) {
+        const auto& actualDescPtr = catalog.Types.FindPtr(fromTypeId);
+        Y_ENSURE(actualDescPtr);
+        return actualDescPtr->ArrayTypeId != actualDescPtr->TypeId;
+    }
+
     return false;
 }
 

ydb/library/yql/parser/pg_catalog/catalog.h

@@ -12,6 +12,7 @@ namespace NYql::NPg {
 constexpr ui32 UnknownOid = 705;
 constexpr ui32 AnyOid = 2276;
 constexpr ui32 AnyArrayOid = 2277;
+constexpr ui32 AnyNonArrayOid = 2776;
 constexpr ui32 RecordOid = 2249;
 constexpr ui32 VarcharOid = 1043;
 constexpr ui32 TextOid = 25;
@@ -156,6 +157,7 @@ struct TAggregateDesc {
     ui32 SerializeFuncId = 0;
     ui32 DeserializeFuncId = 0;
     TString InitValue;
+    bool FinalExtra = false;
 };
 
 enum class EAmType {

ydb/library/yql/parser/pg_catalog/ut/catalog_consts_ut.cpp

@@ -51,6 +51,8 @@ Y_UNIT_TEST_SUITE(TConstantsTests) {
         UNIT_ASSERT_VALUES_EQUAL(typeDesc.TypeId, VarcharOid);
         typeDesc = LookupType("text");
         UNIT_ASSERT_VALUES_EQUAL(typeDesc.TypeId, TextOid);
+        typeDesc = LookupType("anynonarray");
+        UNIT_ASSERT_VALUES_EQUAL(typeDesc.TypeId, AnyNonArrayOid);
     }
 
     Y_UNIT_TEST(TRelationOidConsts) {

ydb/library/yql/parser/pg_wrapper/syscache.cpp

@@ -11,6 +11,7 @@ extern "C" {
 #include "catalog/pg_type_d.h"
 #include "catalog/pg_authid.h"
 #include "access/htup_details.h"
+#include "utils/fmgroids.h"
 }
 
 #undef TypeName
@@ -183,7 +184,7 @@ struct TSysCache {
             std::fill_n(nulls, Natts_pg_type, true);
             std::fill_n(nulls, Anum_pg_type_typcollation, false); // fixed part of Form_pg_type
             FillDatum(Natts_pg_type, values, nulls, Anum_pg_type_oid, oid);
-            auto name = MakeFixedString(desc.Name, NPg::LookupType(NAMEOID).TypeLen);
+            auto name = MakeFixedString(desc.Name, NAMEDATALEN);
             FillDatum(Natts_pg_type, values, nulls, Anum_pg_type_typname, (Datum)name);
             FillDatum(Natts_pg_type, values, nulls, Anum_pg_type_typbyval, desc.PassByValue);
             FillDatum(Natts_pg_type, values, nulls, Anum_pg_type_typlen, desc.TypeLen);
@@ -193,6 +194,8 @@ struct TSysCache {
             FillDatum(Natts_pg_type, values, nulls, Anum_pg_type_typisdefined, true);
             FillDatum(Natts_pg_type, values, nulls, Anum_pg_type_typdelim, desc.TypeDelim);
             FillDatum(Natts_pg_type, values, nulls, Anum_pg_type_typarray, desc.ArrayTypeId);
+            FillDatum(Natts_pg_type, values, nulls, Anum_pg_type_typsubscript,
+                (desc.ArrayTypeId == desc.TypeId) ? F_ARRAY_SUBSCRIPT_HANDLER : desc.TypeSubscriptFuncId);
             FillDatum(Natts_pg_type, values, nulls, Anum_pg_type_typelem, desc.ElementTypeId);
             FillDatum(Natts_pg_type, values, nulls, Anum_pg_type_typinput, desc.InFuncId);
             FillDatum(Natts_pg_type, values, nulls, Anum_pg_type_typoutput, desc.OutFuncId);