Fix compilation issues

diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 26e1a8ff99ba796bff91065eb8e0852b08759832..f4a06de5d6bee3c702ab554c26057a55a98d6665 100644 (file)
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -229,7 +229,7 @@ initscan(HeapScanDesc scan, ScanKey key, bool keep_startblock)
         * results for a non-MVCC snapshot, the caller must hold some higher-level
         * lock that ensures the interesting tuple(s) won't change.)
         */
-       if (!is_rescan)
+       if (!keep_startblock)
                scan->rs_nblocks = RelationGetNumberOfBlocks(scan->rs_rd);
 
        /*

diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 0a15ad44c049c438fcf4f886256dd19de8b1476d..6458e7596cb2503d9fddd4bd965462b9ee72d3e3 100644 (file)
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -719,16 +719,6 @@ _outSeqScan(StringInfo str, const SeqScan *node)
        _outScanInfo(str, (const Scan *) node);
 }
 
-static void
-_outSampleScan(StringInfo str, const SampleScan *node)
-{
-       WRITE_NODE_TYPE("SAMPLESCAN");
-
-       _outScanInfo(str, (const Scan *) node);
-
-       WRITE_NODE_FIELD(tablesample);
-}
-
 static void
 _outIndexScan(StringInfo str, const IndexScan *node)
 {

diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index dc5b7b2dbe8e2a92d96ec6b3cd61f382dd692ec1..8da251651807519783e65d0d6e19fcf83616e696 100644 (file)
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -3546,8 +3546,6 @@ parseNodeString(void)
                return_value = _readScan();
        else if (MATCH("SEQSCAN", 7))
                return_value = _readSeqScan();
-       else if (MATCH("SAMPLESCAN", 10))
-               return_value = _readSampleScan();
        else if (MATCH("INDEXSCAN", 9))
                return_value = _readIndexScan();
        else if (MATCH("INDEXONLYSCAN", 13))