hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject [1/2] incubator-hawq git commit: Revert "HAWQ-404. Add sort during INSERT of append only row oriented partition tables"
Date Fri, 26 Feb 2016 06:08:10 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master f94b8194c -> 6fb57949a


Revert "HAWQ-404. Add sort during INSERT of append only row oriented partition tables"

This reverts commit 321f7e2b737baf6fe674bd0ebc0ea05f9b166897.


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

Branch: refs/heads/master
Commit: c398ceb2e94978c561b9ec65fdda1000520a1caf
Parents: f94b819
Author: Ming LI <mli@pivotal.io>
Authored: Fri Feb 26 14:07:17 2016 +0800
Committer: Ming LI <mli@pivotal.io>
Committed: Fri Feb 26 14:07:17 2016 +0800

----------------------------------------------------------------------
 src/backend/gpopt/ivy.xml                                |  2 +-
 src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp |  9 ---------
 src/backend/gpopt/utils/COptTasks.cpp                    |  4 +---
 src/backend/utils/misc/guc.c                             | 11 -----------
 src/include/gpopt/translate/CTranslatorUtils.h           |  4 ++++
 src/include/utils/guc.h                                  |  1 -
 6 files changed, 6 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c398ceb2/src/backend/gpopt/ivy.xml
----------------------------------------------------------------------
diff --git a/src/backend/gpopt/ivy.xml b/src/backend/gpopt/ivy.xml
index 3cc3137..db5c89f 100644
--- a/src/backend/gpopt/ivy.xml
+++ b/src/backend/gpopt/ivy.xml
@@ -38,7 +38,7 @@ under the License.
     </configurations>
 
     <dependencies>
-      <dependency org="emc"             name="optimizer"       rev="1.622"          conf="osx106_x86->osx106_x86_32;osx106_x86_32->osx106_x86_32;rhel5_x86_64->rhel5_x86_64;suse10_x86_64->suse10_x86_64"
/>
+      <dependency org="emc"             name="optimizer"       rev="1.617"          conf="osx106_x86->osx106_x86_32;osx106_x86_32->osx106_x86_32;rhel5_x86_64->rhel5_x86_64;suse10_x86_64->suse10_x86_64"
/>
       <dependency org="emc"             name="libgpos"         rev="1.133"          conf="osx106_x86->osx106_x86_32;osx106_x86_32->osx106_x86_32;rhel5_x86_64->rhel5_x86_64;suse10_x86_64->suse10_x86_64"
/>
       <dependency org="xerces"          name="xerces-c"        rev="3.1.1-p1"       conf="osx106_x86->osx106_x86_32;osx106_x86_32->osx106_x86_32;rhel5_x86_64->rhel5_x86_64;suse10_x86_64->suse10_x86_64"
/>
     </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c398ceb2/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp
----------------------------------------------------------------------
diff --git a/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp b/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp
index 8cb468a..80a81ee 100644
--- a/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp
+++ b/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp
@@ -597,7 +597,6 @@ CTranslatorRelcacheToDXL::Pmdrel
 	DrgPmdid *pdrgpmdidIndexes = NULL;
 	DrgPmdid *pdrgpmdidTriggers = NULL;
 	DrgPul *pdrgpulPartKeys = NULL;
-	ULONG ulLeafPartitions = 0;
 	BOOL fConvertHashToRandom = false;
 	DrgPdrgPul *pdrgpdrgpulKeys = NULL;
 	DrgPmdid *pdrgpmdidCheckConstraints = NULL;
@@ -653,13 +652,6 @@ CTranslatorRelcacheToDXL::Pmdrel
 				erelstorage = IMDRelation::ErelstorageAppendOnlyParquet;
 			}
 		}
-
-		// get number of leaf partitions
-		if (gpdb::FRelPartIsRoot(oid))
-		{
-		   ulLeafPartitions = gpdb::UlLeafPartitions(oid);
-		}
-
 		// get key sets
 		BOOL fAddDefaultKeys = FHasSystemColumns(rel->rd_rel->relkind);
 		pdrgpdrgpulKeys = PdrgpdrgpulKeys(pmp, oid, fAddDefaultKeys, fPartitioned, pulAttnoMapping);
@@ -730,7 +722,6 @@ CTranslatorRelcacheToDXL::Pmdrel
 							pdrgpmdcol,
 							pdrpulDistrCols,
 							pdrgpulPartKeys,
-							ulLeafPartitions,
 							fConvertHashToRandom,
 							pdrgpdrgpulKeys,
 							pdrgpmdidIndexes,

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c398ceb2/src/backend/gpopt/utils/COptTasks.cpp
----------------------------------------------------------------------
diff --git a/src/backend/gpopt/utils/COptTasks.cpp b/src/backend/gpopt/utils/COptTasks.cpp
index 4d10d39..893cde2 100644
--- a/src/backend/gpopt/utils/COptTasks.cpp
+++ b/src/backend/gpopt/utils/COptTasks.cpp
@@ -774,15 +774,13 @@ COptTasks::PoconfCreate
 	DOUBLE dDampingFactorGroupBy = (DOUBLE) optimizer_damping_factor_groupby;
 
 	ULONG ulCTEInliningCutoff =  (ULONG) optimizer_cte_inlining_bound;
-	ULONG ulPartsToForceSortOnInsert =  (ULONG) optimizer_parts_to_force_sort_on_insert;
 
 	return GPOS_NEW(pmp) COptimizerConfig
 						(
 						GPOS_NEW(pmp) CEnumeratorConfig(pmp, ullPlanId, ullSamples, dCostThreshold),
 						GPOS_NEW(pmp) CStatisticsConfig(pmp, dDampingFactorFilter, dDampingFactorJoin, dDampingFactorGroupBy),
 						GPOS_NEW(pmp) CCTEConfig(ulCTEInliningCutoff),
-						pcm,
-						GPOS_NEW(pmp) CHint(ulPartsToForceSortOnInsert)
+						pcm
 						);
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c398ceb2/src/backend/utils/misc/guc.c
----------------------------------------------------------------------
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 20c9e48..a8f3f37 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -762,7 +762,6 @@ bool 		optimizer_multilevel_partitioning;
 bool        optimizer_enable_derive_stats_all_groups;
 bool		optimizer_explain_show_status;
 bool		optimizer_prefer_scalar_dqa_multistage_agg;
-int			optimizer_parts_to_force_sort_on_insert;
 
 /* Security */
 bool		gp_reject_internal_tcp_conn = true;
@@ -6147,16 +6146,6 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
-		{"optimizer_parts_to_force_sort_on_insert", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Minimum number of partitions required to force sorting tuples during insertion
in an append only row-oriented partitioned table"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_parts_to_force_sort_on_insert,
-		INT_MAX, 0, INT_MAX, NULL, NULL
-	},
-
-	{
 		{"pxf_stat_max_fragments", PGC_USERSET, EXTERNAL_TABLES,
 			gettext_noop("Max number of fragments to be sampled during ANALYZE on a PXF table."),
 			NULL,

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c398ceb2/src/include/gpopt/translate/CTranslatorUtils.h
----------------------------------------------------------------------
diff --git a/src/include/gpopt/translate/CTranslatorUtils.h b/src/include/gpopt/translate/CTranslatorUtils.h
index d0a0f71..1f8776a 100644
--- a/src/include/gpopt/translate/CTranslatorUtils.h
+++ b/src/include/gpopt/translate/CTranslatorUtils.h
@@ -70,6 +70,10 @@ namespace gpdxl
 {
 	using namespace gpopt;
 
+	// hash maps mapping INT -> ULONG
+	typedef CHashMap<INT, ULONG, gpos::UlHash<INT>, gpos::FEqual<INT>,
+					CleanupDelete<INT>, CleanupDelete<ULONG> > HMIUl;
+
 	//---------------------------------------------------------------------------
 	//	@class:
 	//		CTranslatorUtils

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c398ceb2/src/include/utils/guc.h
----------------------------------------------------------------------
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 475cae1..befeaf6 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -434,7 +434,6 @@ extern bool optimizer_multilevel_partitioning;
 extern bool optimizer_enable_derive_stats_all_groups;
 extern bool optimizer_explain_show_status;
 extern bool optimizer_prefer_scalar_dqa_multistage_agg;
-extern int  optimizer_parts_to_force_sort_on_insert;
 
 /**
  * Enable logging of DPE match in optimizer.


Mime
View raw message