Minor fixes in pglogical receiver spill buffer

knizhnik · kelvich · commit d307417c185e · 2017-11-13T02:17:36.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -2848,9 +2848,9 @@ _PG_init(void)
 		&MtmTransSpillThreshold,
 		1000, /* 1Gb */
 		0,
-		INT_MAX,
+		(MaxAllocSize-1)/MB,
 		PGC_BACKEND,
-		0,\
+		0,
 		NULL,
 		NULL,
 		NULL
diff --git a/multimaster.h b/multimaster.h
@@ -70,7 +70,7 @@
 
 #define MULTIMASTER_DEFAULT_ARBITER_PORT 5433
 
-#define MB (1024*1024L)
+#define MB ((size_t)1024*1024)
 
 #define USEC_TO_MSEC(t) ((t)/1000)
 #define MSEC_TO_USEC(t) ((timestamp_t)(t)*1000)
diff --git a/pglogical_apply.c b/pglogical_apply.c
@@ -1097,7 +1097,7 @@ void MtmExecutor(void* work, size_t size)
 			}
  		    case '(':
 			{
-			    int64 size = pq_getmsgint(&s, 4);    
+			    size_t size = pq_getmsgint(&s, 4);    
 				s.data = palloc(size);
 				save_cursor = s.cursor;
 				save_len = s.len;
diff --git a/pglogical_receiver.c b/pglogical_receiver.c
@@ -583,6 +583,7 @@ pglogical_receiver_main(Datum main_arg)
 								}
 							} else if (spill_file >= 0) { 
 								MtmCloseSpillFile(spill_file);
+								resetStringInfo(&spill_info);
 								spill_file = -1;
 							}
 							ByteBufferReset(&buf);

Original file line number	Diff line number	Diff line change
`@@ -1097,7 +1097,7 @@ void MtmExecutor(void* work, size_t size)`
`1097`	`1097`	`}`
`1098`	`1098`	`case '(':`
`1099`	`1099`	`{`
`1100`		`- int64 size = pq_getmsgint(&s, 4);`
	`1100`	`+ size_t size = pq_getmsgint(&s, 4);`
`1101`	`1101`	`s.data = palloc(size);`
`1102`	`1102`	`save_cursor = s.cursor;`
`1103`	`1103`	`save_len = s.len;`
Original file line number	Diff line number	Diff line change
`@@ -583,6 +583,7 @@ pglogical_receiver_main(Datum main_arg)`
`583`	`583`	`}`
`584`	`584`	`} else if (spill_file >= 0) {`
`585`	`585`	`MtmCloseSpillFile(spill_file);`
	`586`	`+ resetStringInfo(&spill_info);`
`586`	`587`	`spill_file = -1;`
`587`	`588`	`}`
`588`	`589`	`ByteBufferReset(&buf);`