YQL-19790 allow distinct over keys

commit_hash:5f778a5600a05b527c9ff0b07dcf55e207782165

4 files changed, 9 insertions, 1 deletions

diff --git a/yql/essentials/sql/v1/aggregation.cpp b/yql/essentials/sql/v1/aggregation.cpp
index 3d19862f865..a1e98d2352c 100644
--- a/yql/essentials/sql/v1/aggregation.cpp
+++ b/yql/essentials/sql/v1/aggregation.cpp
@@ -196,7 +196,7 @@ protected:
                     DistinctKey = DotJoin(*sourcePtr, DistinctKey);
                 }
             }
-            if (src->IsGroupByColumn(DistinctKey)) {
+            if (!ctx.DistinctOverKeys && src->IsGroupByColumn(DistinctKey)) {
                 ctx.Error(Expr->GetPos()) << ErrorDistinctByGroupKey(DistinctKey);
                 return false;
             }
diff --git a/yql/essentials/sql/v1/context.cpp b/yql/essentials/sql/v1/context.cpp
index de2668608ea..1a0a1f4b18d 100644
--- a/yql/essentials/sql/v1/context.cpp
+++ b/yql/essentials/sql/v1/context.cpp
@@ -68,6 +68,7 @@ THashMap<TStringBuf, TPragmaField> CTX_PRAGMA_FIELDS = {
     {"DistinctOverWindow", &TContext::DistinctOverWindow},
     {"EmitUnionMerge", &TContext::EmitUnionMerge},
     {"SeqMode", &TContext::SeqMode},
+    {"DistinctOverKeys", &TContext::DistinctOverKeys},
 };
 
 typedef TMaybe<bool> TContext::*TPragmaMaybeField;
diff --git a/yql/essentials/sql/v1/context.h b/yql/essentials/sql/v1/context.h
index 17e86c77c3d..3bdfa1ceab4 100644
--- a/yql/essentials/sql/v1/context.h
+++ b/yql/essentials/sql/v1/context.h
@@ -372,6 +372,7 @@ namespace NSQLTranslationV1 {
         bool AnsiImplicitCrossJoin = false; // select * from A,B
         bool DistinctOverWindow = false;
         bool SeqMode = false;
+        bool DistinctOverKeys = false;
         bool EmitUnionMerge = false;
         TVector<size_t> ForAllStatementsParts;
 
diff --git a/yql/essentials/sql/v1/sql_query.cpp b/yql/essentials/sql/v1/sql_query.cpp
index a860571698b..b60a338d02f 100644
--- a/yql/essentials/sql/v1/sql_query.cpp
+++ b/yql/essentials/sql/v1/sql_query.cpp
@@ -3387,6 +3387,12 @@ TNodePtr TSqlQuery::PragmaStatement(const TRule_pragma_stmt& stmt, bool& success
         } else if (normalizedPragma == "disableemitunionmerge") {
             Ctx.EmitUnionMerge = false;
             Ctx.IncrementMonCounter("sql_pragma", "DisableEmitUnionMerge");
+        } else if (normalizedPragma == "distinctoverkeys") {
+            Ctx.DistinctOverKeys = true;
+            Ctx.IncrementMonCounter("sql_pragma", "DistinctOverKeys");
+        } else if (normalizedPragma == "disabledistinctoverkeys") {
+            Ctx.DistinctOverKeys = false;
+            Ctx.IncrementMonCounter("sql_pragma", "DisableDistinctOverKeys");
         } else if (normalizedPragma == "engine") {
             Ctx.IncrementMonCounter("sql_pragma", "Engine");