Some comments

Author: Arthur Zakirov

Makefile

@@ -35,6 +35,15 @@ endif
 wal-check: temp-install
 	$(prove_check)
 
+all: rum--1.1.sql
+
+#9.6 requires 1.1 file but 10.0 could live with 1.0 + 1.0-1.1 files
+rum--1.1.sql:  rum--1.0.sql rum--1.0--1.1.sql
+	cat rum--1.0.sql rum--1.0--1.1.sql > rum--1.1.sql
+
+rum--1.0--1.1.sql: Makefile gen_rum_sql--1.0--1.1.pl
+	perl gen_rum_sql--1.0--1.1.pl > rum--1.0--1.1.sql
+
 install: installincludes
 
 installincludes:

src/rum.h

@@ -702,12 +702,12 @@ typedef struct RumScanOpaqueData
 	int			norderbys;		/* Number of columns in ordering.
 								   Will be assigned to sortstate->nKeys */
 
-	RumItem		item;
+	RumItem		item;			/* current item used in index scan */
 	bool		firstCall;
+
 	bool		isVoidRes;		/* true if query is unsatisfiable */
-	bool		willSort;
+	bool		willSort;		/* is there any columns in ordering */
 	RumScanType	scanType;
-	TIDBitmap  *tbm;
 
 	ScanDirection	naturalOrder;
 	bool			secondPass;

src/rumget.c

@@ -2044,17 +2044,6 @@ rumgetbitmap(IndexScanDesc scan, TIDBitmap *tbm)
 
 	ntids = 0;
 
-	/*
-	 * First, scan the pending list and collect any matching entries into the
-	 * bitmap.  After we scan a pending item, some other backend could post it
-	 * into the main index, and so we might visit it a second time during the
-	 * main scan.  This is okay because we'll just re-set the same bit in the
-	 * bitmap.  (The possibility of duplicate visits is a major reason why RUM
-	 * can't support the amgettuple API, however.) Note that it would not do
-	 * to scan the main index before the pending list, since concurrent
-	 * cleanup could then make us miss entries entirely.
-	 */
-	so->tbm = tbm;
 	so->entriesIncrIndex = -1;
 
 	/*

src/rumscan.c

@@ -534,7 +534,6 @@ rumNewScanKey(IndexScanDesc scan)
 
 	so->naturalOrder = NoMovementScanDirection;
 	so->secondPass = false;
-	so->tbm = NULL;
 	so->entriesIncrIndex = -1;
 	so->norderbys = scan->numberOfOrderBys;
 	so->willSort = false;