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: HAWQ-613. rename variable for code convention
Date Thu, 31 Mar 2016 09:47:47 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 323f265aa -> 012716357


HAWQ-613. rename variable for code convention


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

Branch: refs/heads/master
Commit: 01271635761f449891d7e7810b3ca1e8d36787e5
Parents: ac5ab17
Author: Ming LI <mli@pivotal.io>
Authored: Thu Mar 31 17:43:54 2016 +0800
Committer: Ming LI <mli@pivotal.io>
Committed: Thu Mar 31 17:47:00 2016 +0800

----------------------------------------------------------------------
 src/backend/executor/execQual.c | 16 ++++++++--------
 src/backend/tcop/postgres.c     | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/01271635/src/backend/executor/execQual.c
----------------------------------------------------------------------
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 3d12c02..6059a66 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -1619,13 +1619,13 @@ restart:
 				fcinfo.isnull = false;
 				rsinfo.isDone = ExprSingleResult;
 
-				bool save_ImmediateInterruptOK = ImmediateInterruptOK;
+				bool savedImmediateInterruptOK = ImmediateInterruptOK;
 				/* Allow "die" interrupt to be processed while waiting */
 				ImmediateInterruptOK = true;
 				InterruptWhenCallingPLUDF = true;
 				result = FunctionCallInvoke(&fcinfo);
 				InterruptWhenCallingPLUDF = false;
-				ImmediateInterruptOK = save_ImmediateInterruptOK;
+				ImmediateInterruptOK = savedImmediateInterruptOK;
 
 				*isNull = fcinfo.isnull;
 				*isDone = rsinfo.isDone;
@@ -1755,13 +1755,13 @@ restart:
 		}
 		fcinfo.isnull = false;
 
-		bool save_ImmediateInterruptOK = ImmediateInterruptOK;
+		bool savedImmediateInterruptOK = ImmediateInterruptOK;
 		/* Allow "die" interrupt to be processed while waiting */
 		ImmediateInterruptOK = true;
 		InterruptWhenCallingPLUDF = true;
 		result = FunctionCallInvoke(&fcinfo);
 		InterruptWhenCallingPLUDF = false;
-		ImmediateInterruptOK = save_ImmediateInterruptOK;
+		ImmediateInterruptOK = savedImmediateInterruptOK;
 
 		*isNull = fcinfo.isnull;
 	}
@@ -1824,13 +1824,13 @@ ExecMakeFunctionResultNoSets(FuncExprState *fcache,
 	}
 	/* fcinfo.isnull = false; */	/* handled by InitFunctionCallInfoData */
 
-	bool save_ImmediateInterruptOK = ImmediateInterruptOK;
+	bool savedImmediateInterruptOK = ImmediateInterruptOK;
 	/* Allow "die" interrupt to be processed while waiting */
 	ImmediateInterruptOK = true;
 	InterruptWhenCallingPLUDF = true;
 	result = FunctionCallInvoke(&fcinfo);
 	InterruptWhenCallingPLUDF = false;
-	ImmediateInterruptOK = save_ImmediateInterruptOK;
+	ImmediateInterruptOK = savedImmediateInterruptOK;
 
 	*isNull = fcinfo.isnull;
 
@@ -1987,13 +1987,13 @@ ExecMakeTableFunctionResult(ExprState *funcexpr,
 			fcinfo.isnull = false;
 			rsinfo.isDone = ExprSingleResult;
 
-			bool save_ImmediateInterruptOK = ImmediateInterruptOK;
+			bool savedImmediateInterruptOK = ImmediateInterruptOK;
 			/* Allow "die" interrupt to be processed while waiting */
 			ImmediateInterruptOK = true;
 			InterruptWhenCallingPLUDF = true;
 			result = FunctionCallInvoke(&fcinfo);
 			InterruptWhenCallingPLUDF = false;
-			ImmediateInterruptOK = save_ImmediateInterruptOK;
+			ImmediateInterruptOK = savedImmediateInterruptOK;
 		}
 		else
 		{

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/01271635/src/backend/tcop/postgres.c
----------------------------------------------------------------------
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 9ffd0d9..5910582 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -266,8 +266,8 @@ static int getSlaveHostNumber(FILE *fp);
 static bool CheckSlaveFile();
 
 /*saved interrupt global variable for client_read_xxx functions*/
-static bool saveImmediateInterruptOK = false;
-static bool saveQueryCancelPending = false;
+static bool SavedImmediateInterruptOK = false;
+static bool SavedQueryCancelPending = false;
 
 /*
  * Change the priority of the current process to the specified level
@@ -611,11 +611,11 @@ prepare_for_client_read(void)
 		EnableClientWaitTimeoutInterrupt();
 
 		/* Allow "die" interrupt to be processed while waiting */
-		saveImmediateInterruptOK = ImmediateInterruptOK;
+		SavedImmediateInterruptOK = ImmediateInterruptOK;
 		ImmediateInterruptOK = true;
 
 		/* And don't forget to detect one that already arrived */
-		saveQueryCancelPending = QueryCancelPending;
+		SavedQueryCancelPending = QueryCancelPending;
 		QueryCancelPending = false;
 		CHECK_FOR_INTERRUPTS();
 	}
@@ -630,8 +630,8 @@ client_read_ended(void)
 	if (DoingCommandRead)
 	{
 		/* set back to saved status so that not overwrite when set before calling PL UDF */
-		ImmediateInterruptOK = saveImmediateInterruptOK;
-		QueryCancelPending = saveQueryCancelPending;
+		ImmediateInterruptOK = SavedImmediateInterruptOK;
+		QueryCancelPending = SavedQueryCancelPending;
 
 		DisableClientWaitTimeoutInterrupt();
 		DisableNotifyInterrupt();


Mime
View raw message