hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odiache...@apache.org
Subject [10/13] incubator-hawq git commit: Fix Orca error message: Orca supports Rollup #117665973
Date Tue, 03 May 2016 00:33:26 GMT
Fix Orca error message: Orca supports Rollup #117665973


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/3be28ec5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/3be28ec5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/3be28ec5

Branch: refs/heads/HAWQ-703
Commit: 3be28ec5f537a619d70de0a7cbca4161f7cbaebb
Parents: 1b0e6e2
Author: Venkatesh (Venky) Raghavan <vraghavan@pivotal.io>
Authored: Tue Apr 26 11:18:08 2016 -0700
Committer: Ming LI <mli@pivotal.io>
Committed: Wed Apr 27 18:28:12 2016 +0800

----------------------------------------------------------------------
 src/backend/gpopt/translate/CTranslatorUtils.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/3be28ec5/src/backend/gpopt/translate/CTranslatorUtils.cpp
----------------------------------------------------------------------
diff --git a/src/backend/gpopt/translate/CTranslatorUtils.cpp b/src/backend/gpopt/translate/CTranslatorUtils.cpp
index 4c47455..2b12f1b 100644
--- a/src/backend/gpopt/translate/CTranslatorUtils.cpp
+++ b/src/backend/gpopt/translate/CTranslatorUtils.cpp
@@ -1571,7 +1571,9 @@ CTranslatorUtils::PdrgpbsGroupBy
 	}
 
 	// grouping sets
-	if (1 != gpdb::UlListLength(plGroupClause))
+	const ULONG ulGroupClause = gpdb::UlListLength(plGroupClause);
+	GPOS_ASSERT(0 < ulGroupClause);
+	if (1 < ulGroupClause)
 	{
 		GPOS_RAISE(gpdxl::ExmaDXL, gpdxl::ExmiQuery2DXLUnsupportedFeature, GPOS_WSZ_LIT("Multiple
grouping sets specifications"));
 	}
@@ -1583,9 +1585,9 @@ CTranslatorUtils::PdrgpbsGroupBy
 		return PdrgpbsRollup(pmp, pgrcl, ulCols, phmululGrpColPos, pbsGrpCols);
 	}
 
-	if (GROUPINGTYPE_GROUPING_SETS != pgrcl->groupType)
+	if (GROUPINGTYPE_CUBE == pgrcl->groupType)
 	{
-		GPOS_RAISE(gpdxl::ExmaDXL, gpdxl::ExmiQuery2DXLUnsupportedFeature, GPOS_WSZ_LIT("Rollup
and cube"));
+		GPOS_RAISE(gpdxl::ExmaDXL, gpdxl::ExmiQuery2DXLUnsupportedFeature, GPOS_WSZ_LIT(“Cube”));
 	}
 
 	DrgPbs *pdrgpbs = GPOS_NEW(pmp) DrgPbs(pmp);
@@ -1606,7 +1608,7 @@ CTranslatorUtils::PdrgpbsGroupBy
 		}
 		else if (IsA(pnodeGroupingSet, GroupingClause))
 		{
-			GPOS_RAISE(gpdxl::ExmaDXL, gpdxl::ExmiQuery2DXLUnsupportedFeature, GPOS_WSZ_LIT("Rollup
and cube"));
+			GPOS_RAISE(gpdxl::ExmaDXL, gpdxl::ExmiQuery2DXLUnsupportedFeature, GPOS_WSZ_LIT("Multiple
grouping sets specifications"));
 		}
 		else
 		{


Mime
View raw message