From: Pavan Deolasee <pavan.deolasee@gmail.com>
Date: Tue, 18 Oct 2016 10:57:13 +0000 (+0530)
Subject: Fix compilation issues
X-Git-Tag: XL_10_R1BETA1~558
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=c6d2869e21fbeea7612d0e986b38efd7127774ae;p=postgres-xl.git

Fix compilation issues
---

diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 26e1a8ff99..f4a06de5d6 100644
--- 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 0a15ad44c0..6458e7596c 100644
--- 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 dc5b7b2dbe..8da2516518 100644
--- 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))