Skip to content

Commit 99dda8a

Browse files
committed
Fix of INSERT with no columns specified + removed redundant patches + updated tests
1 parent 8ce7edb commit 99dda8a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+6388
-1616
lines changed

ydb/library/yql/providers/common/provider/yql_provider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1475,7 +1475,7 @@ bool NeedToRenamePgSelectColumns(const TCoPgSelect& pgSelect) {
14751475
bool RenamePgSelectColumns(
14761476
const TCoPgSelect& node,
14771477
TExprNode::TPtr& output,
1478-
TMaybe<TVector<TString>> tableColumnOrder,
1478+
const TMaybe<TColumnOrder>& tableColumnOrder,
14791479
TExprContext& ctx,
14801480
TTypeAnnotationContext& types) {
14811481

ydb/library/yql/providers/common/provider/yql_provider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ bool NeedToRenamePgSelectColumns(const NNodes::TCoPgSelect& pgSelect);
209209
bool RenamePgSelectColumns(
210210
const NNodes::TCoPgSelect& node,
211211
TExprNode::TPtr& output,
212-
TMaybe<TVector<TString>> tableColumnOrder,
212+
const TMaybe<TColumnOrder>& tableColumnOrder,
213213
TExprContext& ctx,
214214
TTypeAnnotationContext& types);
215215
} // namespace NCommon

ydb/library/yql/providers/yt/provider/yql_yt_datasink_type_ann.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,9 +445,8 @@ class TYtDataSinkTypeAnnotationTransformer : public TVisitorTransformerBase {
445445
}
446446
}
447447

448-
TMaybe<TColumnOrder> contentColumnOrder;
448+
const TMaybe<TColumnOrder> contentColumnOrder = outTableInfo.RowSpec->GetColumnOrder();
449449
if (content) {
450-
contentColumnOrder = State_->Types->LookupColumnOrder(*content);
451450
if (content->IsCallable("AssumeColumnOrder")) {
452451
YQL_ENSURE(contentColumnOrder);
453452
YQL_CLOG(INFO, ProviderYt) << "Dropping top level " << content->Content() << " from WriteTable input";

ydb/library/yql/tests/postgresql/cases/aggregates.out

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,13 @@ SELECT covar_pop(1::float8,'nan'::float8), covar_samp(3::float8,'nan'::float8);
270270
-- test accum and combine functions directly
271271
CREATE TABLE regr_test (x float8, y float8);
272272
INSERT INTO regr_test VALUES (10,150),(20,250),(30,350),(80,540),(100,200);
273+
SELECT count(*), sum(x), regr_sxx(y,x), sum(y),regr_syy(y,x), regr_sxy(y,x)
274+
FROM regr_test;
275+
count | sum | regr_sxx | sum | regr_syy | regr_sxy
276+
-------+-----+----------+------+----------+----------
277+
5 | 240 | 6280 | 1490 | 95080 | 8680
278+
(1 row)
279+
273280
SELECT float8_accum('{4,140,2900}'::float8[], 100);
274281
float8_accum
275282
--------------

ydb/library/yql/tests/postgresql/cases/aggregates.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ SELECT covar_pop(1::float8,'nan'::float8), covar_samp(3::float8,'nan'::float8);
6565
-- test accum and combine functions directly
6666
CREATE TABLE regr_test (x float8, y float8);
6767
INSERT INTO regr_test VALUES (10,150),(20,250),(30,350),(80,540),(100,200);
68+
SELECT count(*), sum(x), regr_sxx(y,x), sum(y),regr_syy(y,x), regr_sxy(y,x)
69+
FROM regr_test;
6870
SELECT float8_accum('{4,140,2900}'::float8[], 100);
6971
SELECT float8_regr_accum('{4,140,2900,1290,83075,15050}'::float8[], 200, 100);
7072
SELECT float8_combine('{3,60,200}'::float8[], '{0,0,0}'::float8[]);

0 commit comments

Comments
 (0)