Rename loop to cycle

knizhnik · knizhnik · commit d401df6f3994 · 2015-11-10T13:42:26.000+03:00
diff --git a/contrib/pg_dtm/dtmd/include/ddd.h b/contrib/pg_dtm/dtmd/include/ddd.h
@@ -34,6 +34,6 @@ typedef struct Graph
 
 extern void initGraph(Graph* graph);
 extern void addSubgraph(Instance* instance, Graph* graph, xid_t* xids, int n_xids);
-extern bool findLoop(Graph* graph, xid_t root);
+extern bool findCycle(Graph* graph, xid_t root);
 
 #endif
diff --git a/contrib/pg_dtm/dtmd/src/ddd.c b/contrib/pg_dtm/dtmd/src/ddd.c
@@ -119,7 +119,7 @@ static bool recursiveTraverseGraph(Vertex* root, Vertex* v, int marker)
     return false;        
 }
 
-bool findLoop(Graph* graph, xid_t root)
+bool findCycle(Graph* graph, xid_t root)
 {
     Vertex* v;
     for (v = graph->hashtable[root % MAX_TRANSACTIONS]; v != NULL; v = v->next) { 
diff --git a/contrib/pg_dtm/dtmd/src/main.c b/contrib/pg_dtm/dtmd/src/main.c
@@ -547,7 +547,7 @@ static void ondeadlock(client_t client, int argc, xid_t *argv) {
     xid_t root = argv[1];
     Instance* instance = &CLIENT_USERDATA(client)->instance;
     addSubgraph(instance, &graph, argv+2, argc-2);
-    bool hasDeadLock = findLoop(&graph, root);
+    bool hasDeadLock = findCycle(&graph, root);
     client_message_shortcut(client, hasDeadLock ? RES_DEADLOCK : RES_OK);
 }
     
diff --git a/contrib/pg_dtm/pg_dtm.c b/contrib/pg_dtm/pg_dtm.c
@@ -445,7 +445,7 @@ DtmGetNewTransactionId(bool isSubXact)
 
 		if (IsUnderPostmaster && TransactionIdFollowsOrEquals(xid, xidStopLimit))
 		{
-			char oldest_datname = get_database_name(oldest_datoid);
+			char *oldest_datname = get_database_name(oldest_datoid);
 
 			/* complain even if that DB has disappeared */
 			if (oldest_datname)
@@ -466,7 +466,7 @@ DtmGetNewTransactionId(bool isSubXact)
 		else
 		if (TransactionIdFollowsOrEquals(xid, xidWarnLimit))
 		{
-			char oldest_datname = get_database_name(oldest_datoid);
+			char *oldest_datname = get_database_name(oldest_datoid);
 
 			/* complain even if that DB has disappeared */
 			if (oldest_datname)

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ static bool recursiveTraverseGraph(Vertex* root, Vertex* v, int marker)`
`119`	`119`	`return false;`
`120`	`120`	`}`
`121`	`121`
`122`		`-bool findLoop(Graph* graph, xid_t root)`
	`122`	`+bool findCycle(Graph* graph, xid_t root)`
`123`	`123`	`{`
`124`	`124`	`Vertex* v;`
`125`	`125`	`for (v = graph->hashtable[root % MAX_TRANSACTIONS]; v != NULL; v = v->next) {`
Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ static void ondeadlock(client_t client, int argc, xid_t *argv) {`
`547`	`547`	`xid_t root = argv[1];`
`548`	`548`	`Instance* instance = &CLIENT_USERDATA(client)->instance;`
`549`	`549`	`addSubgraph(instance, &graph, argv+2, argc-2);`
`550`		`- bool hasDeadLock = findLoop(&graph, root);`
	`550`	`+ bool hasDeadLock = findCycle(&graph, root);`
`551`	`551`	`client_message_shortcut(client, hasDeadLock ? RES_DEADLOCK : RES_OK);`
`552`	`552`	`}`
`553`	`553`
Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ DtmGetNewTransactionId(bool isSubXact)`
`445`	`445`
`446`	`446`	`if (IsUnderPostmaster && TransactionIdFollowsOrEquals(xid, xidStopLimit))`
`447`	`447`	`{`
`448`		`- char oldest_datname = get_database_name(oldest_datoid);`
	`448`	`+ char *oldest_datname = get_database_name(oldest_datoid);`
`449`	`449`
`450`	`450`	`/* complain even if that DB has disappeared */`
`451`	`451`	`if (oldest_datname)`
`@@ -466,7 +466,7 @@ DtmGetNewTransactionId(bool isSubXact)`
`466`	`466`	`else`
`467`	`467`	`if (TransactionIdFollowsOrEquals(xid, xidWarnLimit))`
`468`	`468`	`{`
`469`		`- char oldest_datname = get_database_name(oldest_datoid);`
	`469`	`+ char *oldest_datname = get_database_name(oldest_datoid);`
`470`	`470`
`471`	`471`	`/* complain even if that DB has disappeared */`
`472`	`472`	`if (oldest_datname)`