Fix spill to file threshold check

knizhnik · knizhnik · commit 6750490ba439 · 2016-04-25T23:44:51.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -505,6 +505,8 @@ MtmAdjustOldestXid(TransactionId xid)
         MtmTransState *ts, *prev = NULL;
         int i;
 
+		return  FirstNormalTransactionId;
+
 		MtmLock(LW_EXCLUSIVE);
         ts = (MtmTransState*)hash_search(MtmXid2State, &xid, HASH_FIND, NULL);
         if (ts != NULL && ts->status == TRANSACTION_STATUS_COMMITTED) { 
diff --git a/contrib/mmts/multimaster.h b/contrib/mmts/multimaster.h
@@ -47,6 +47,7 @@
 #define MULTIMASTER_ADMIN               "mtm_admin"
 
 #define USEC 1000000
+#define MB   (1024*1024)
 
 #define USEC_TO_MSEC(t) ((t)/1000)
 #define MSEC_TO_USEC(t) ((t)*1000)
diff --git a/contrib/mmts/pglogical_receiver.c b/contrib/mmts/pglogical_receiver.c
@@ -449,7 +449,7 @@ pglogical_receiver_main(Datum main_arg)
 			{
                 stmt = copybuf + hdr_len;
 				
-				if (buf.used >= MtmTransSpillThreshold) { 
+				if (buf.used >= MtmTransSpillThreshold*MB) { 
 					if (spill_file < 0) {
 						int file_id;
 						spill_file = MtmCreateSpillFile(nodeId, &file_id);

Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ pglogical_receiver_main(Datum main_arg)`
`449`	`449`	`{`
`450`	`450`	`stmt = copybuf + hdr_len;`
`451`	`451`
`452`		`- if (buf.used >= MtmTransSpillThreshold) {`
	`452`	`+ if (buf.used >= MtmTransSpillThreshold*MB) {`
`453`	`453`	`if (spill_file < 0) {`
`454`	`454`	`int file_id;`
`455`	`455`	`spill_file = MtmCreateSpillFile(nodeId, &file_id);`