You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by yj...@apache.org on 2015/10/26 13:14:25 UTC

incubator-hawq git commit: HAWQ-73. Fix bug of 'Fail to unregister in HAWQ resource manager because of RPC error'. This closes #40

Repository: incubator-hawq
Updated Branches:
  refs/heads/master 3a8dcd219 -> 2fc73a095


HAWQ-73. Fix bug of 'Fail to unregister in HAWQ resource manager because of RPC error'. This closes #40


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

Branch: refs/heads/master
Commit: 2fc73a095de6eddabf343e3ea2dfd651975df1ff
Parents: 3a8dcd2
Author: Yi Jin <yj...@pivotal.io>
Authored: Mon Oct 26 20:13:55 2015 +0800
Committer: Yi Jin <yj...@pivotal.io>
Committed: Mon Oct 26 20:13:55 2015 +0800

----------------------------------------------------------------------
 src/backend/resourcemanager/requesthandler_ddl.c | 2 +-
 src/backend/resourcemanager/resqueuemanager.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2fc73a09/src/backend/resourcemanager/requesthandler_ddl.c
----------------------------------------------------------------------
diff --git a/src/backend/resourcemanager/requesthandler_ddl.c b/src/backend/resourcemanager/requesthandler_ddl.c
index 9005a22..773677b 100644
--- a/src/backend/resourcemanager/requesthandler_ddl.c
+++ b/src/backend/resourcemanager/requesthandler_ddl.c
@@ -45,7 +45,7 @@ void freeUpdateActionList(MCTYPE context, List **actions);
  * mapping with the definition of table pg_resqueue in pg_resqueue.h
  */
 const char* PG_Resqueue_Column_Names[Natts_pg_resqueue] = {
-	"name",
+	"rsqname",
 	"parentoid",
 	"activestats",
 	"memorylimit",

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2fc73a09/src/backend/resourcemanager/resqueuemanager.c
----------------------------------------------------------------------
diff --git a/src/backend/resourcemanager/resqueuemanager.c b/src/backend/resourcemanager/resqueuemanager.c
index 862eed9..fb01646 100644
--- a/src/backend/resourcemanager/resqueuemanager.c
+++ b/src/backend/resourcemanager/resqueuemanager.c
@@ -43,7 +43,7 @@ static char RSQTBLAttrNames[RSQ_TBL_ATTR_COUNT]
 	"nvseglowerlimitperseg",
 
 	"oid",
-	"name",
+	"rsqname",
 	"creationtime",
 	"updatetime",
 	"status"