Fix bug in monotonic sequences support

knizhnik · knizhnik · commit a1aeea6c52a0 · 2017-06-13T14:04:52.000+03:00
diff --git a/contrib/mmts/pglogical_apply.c b/contrib/mmts/pglogical_apply.c
@@ -1161,11 +1161,13 @@ void MtmExecutor(void* work, size_t size)
  		    case 'N':
 			{
 				int64 next;
+				Oid relid;
 			    Assert(rel != NULL);
-				next = pq_getmsgint64(&s); 
-				AdjustSequence(RelationGetRelid(rel), next);
+				relid = RelationGetRelid(rel);
   			    close_rel(rel);
 				rel = NULL;
+				next = pq_getmsgint64(&s); 
+				AdjustSequence(relid, next);
 				break;
 			}			   
 		    case '0':
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
@@ -861,9 +861,6 @@ void AdjustSequence(Oid relid, int64 next)
 	/* open and AccessShareLock sequence */
 	init_sequence(relid, &elm, &seqrel);
 
-	/* lock page' buffer and read tuple */
-	seq = read_seq_tuple(elm, seqrel, &buf, &seqtuple);
-
 	if (elm->last != elm->cached && elm->last + elm->increment > next) /* cached number is greater than received */
 	{
 		relation_close(seqrel, NoLock);

Original file line number	Diff line number	Diff line change
`@@ -861,9 +861,6 @@ void AdjustSequence(Oid relid, int64 next)`
`861`	`861`	`/* open and AccessShareLock sequence */`
`862`	`862`	`init_sequence(relid, &elm, &seqrel);`
`863`	`863`
`864`		`- /* lock page' buffer and read tuple */`
`865`		`- seq = read_seq_tuple(elm, seqrel, &buf, &seqtuple);`
`866`		`-`
`867`	`864`	`if (elm->last != elm->cached && elm->last + elm->increment > next) /* cached number is greater than received */`
`868`	`865`	`{`
`869`	`866`	`relation_close(seqrel, NoLock);`