Improve support PostgreSQL 11devel

Author: za-arthur

Makefile

@@ -13,7 +13,7 @@ OBJS = src/rumsort.o src/rum_ts_utils.o src/rumtsquery.o \
 
 DATA = rum--1.0.sql
 DATA_updates = rum--1.0--1.1.sql rum--1.1--1.2.sql
-DATA_built = rum--$(EXTVERSION).sql $(DATA_updates)
+SQL_built = rum--$(EXTVERSION).sql $(DATA_updates)
 
 INCLUDES = rum.h rumsort.h
 RELATIVE_INCLUDES = $(addprefix src/, $(INCLUDES))
@@ -47,7 +47,7 @@ endif
 wal-check: temp-install
 	$(prove_check)
 
-all: rum--$(EXTVERSION).sql
+all: $(SQL_built)
 
 #9.6 requires 1.2 file but 10.0 could live with update files
 rum--$(EXTVERSION).sql: $(DATA) $(DATA_updates)
@@ -62,11 +62,13 @@ install: installincludes
 installincludes:
 	$(INSTALL) -d '$(DESTDIR)$(includedir_server)/'
 	$(INSTALL_DATA) $(addprefix $(srcdir)/, $(RELATIVE_INCLUDES)) '$(DESTDIR)$(includedir_server)/'
+	$(INSTALL_DATA) $(SQL_built) '$(DESTDIR)$(datadir)/$(datamoduledir)/'
 
 uninstall: uninstallincludes
 
 uninstallincludes:
 	rm -f $(addprefix '$(DESTDIR)$(includedir_server)/', $(INCLUDES))
+	rm -f $(addprefix '$(DESTDIR)$(datadir)/$(datamoduledir)'/, $(notdir $(SQL_built)))
 
 ISOLATIONCHECKS= predicate-rum predicate-rum-2
 

src/rum_ts_utils.c

@@ -171,7 +171,7 @@ rum_tsquery_pre_consistent(PG_FUNCTION_ARGS)
 
 	Pointer    *extra_data = (Pointer *) PG_GETARG_POINTER(4);
 	bool		recheck;
-	bool		res = FALSE;
+	bool		res = false;
 
 	if (query->size > 0)
 	{
@@ -268,7 +268,7 @@ rum_tsquery_consistent(PG_FUNCTION_ARGS)
 	bool	   *recheck = (bool *) PG_GETARG_POINTER(5);
 	Datum	   *addInfo = (Datum *) PG_GETARG_POINTER(8);
 	bool	   *addInfoIsNull = (bool *) PG_GETARG_POINTER(9);
-	bool		res = FALSE;
+	bool		res = false;
 
 	/*
 	 * The query requires recheck only if it involves weights
@@ -313,7 +313,7 @@ rum_tsquery_timestamp_consistent(PG_FUNCTION_ARGS)
 	bool	   *recheck = (bool *) PG_GETARG_POINTER(5);
 	Datum	   *addInfo = (Datum *) PG_GETARG_POINTER(8);
 	bool	   *addInfoIsNull = (bool *) PG_GETARG_POINTER(9);
-	bool		res = FALSE;
+	bool		res = false;
 
 	/*
 	 * The query requires recheck only if it involves weights

src/rumbtree.c

@@ -32,7 +32,7 @@ rumTraverseLock(Buffer buffer, bool searchMode)
 	page = BufferGetPage(buffer);
 	if (RumPageIsLeaf(page))
 	{
-		if (searchMode == FALSE)
+		if (searchMode == false)
 		{
 			/* we should relock our page */
 			LockBuffer(buffer, RUM_UNLOCK);
@@ -120,7 +120,7 @@ rumReFindLeafPage(RumBtree btree, RumBtreeStack * stack)
 RumBtreeStack *
 rumFindLeafPage(RumBtree btree, RumBtreeStack * stack)
 {
-	bool		isfirst = TRUE;
+	bool		isfirst = true;
 	BlockNumber rootBlkno;
 
 	if (!stack)
@@ -141,7 +141,7 @@ rumFindLeafPage(RumBtree btree, RumBtreeStack * stack)
 		{
 			if (RumPageIsLeaf(page) && !btree->searchMode)
 				access = RUM_EXCLUSIVE;
-			isfirst = FALSE;
+			isfirst = false;
 		}
 		else
 			access = rumTraverseLock(stack->buffer, btree->searchMode);
@@ -150,7 +150,7 @@ rumFindLeafPage(RumBtree btree, RumBtreeStack * stack)
 		 * ok, page is correctly locked, we should check to move right ..,
 		 * root never has a right link, so small optimization
 		 */
-		while (btree->fullScan == FALSE && stack->blkno != rootBlkno &&
+		while (btree->fullScan == false && stack->blkno != rootBlkno &&
 			   btree->isMoveRight(btree, page))
 		{
 			BlockNumber rightlink = RumPageGetOpaque(page)->rightlink;
@@ -605,7 +605,7 @@ rumInsertValue(Relation index, RumBtree btree, RumBtreeStack * stack,
 			}
 		}
 
-		btree->isDelete = FALSE;
+		btree->isDelete = false;
 
 		/* search parent to lock */
 		LockBuffer(parent->buffer, RUM_EXCLUSIVE);

src/rumbulk.c

@@ -56,7 +56,7 @@ rumCombineData(RBNode *existing, const RBNode *newdata, void *arg)
 		Assert(res != 0);
 
 		if (res > 0)
-			eo->shouldSort = TRUE;
+			eo->shouldSort = true;
 	}
 
 	eo->list[eo->count] = en->list[0];

src/rumdatapage.c

@@ -631,7 +631,7 @@ dataLocateLeafItem(RumBtree btree, RumBtreeStack * stack)
 	if (btree->fullScan)
 	{
 		stack->off = FirstOffsetNumber;
-		return TRUE;
+		return true;
 	}
 
 	return findInLeafPage(btree, page, &stack->off, &iptr, &ptr);
@@ -1460,10 +1460,10 @@ rumPrepareDataScan(RumBtree btree, Relation index, OffsetNumber attnum, RumState
 	btree->splitPage = dataSplitPage;
 	btree->fillRoot = rumDataFillRoot;
 
-	btree->isData = TRUE;
-	btree->searchMode = FALSE;
-	btree->isDelete = FALSE;
-	btree->fullScan = FALSE;
+	btree->isData = true;
+	btree->searchMode = false;
+	btree->isDelete = false;
+	btree->fullScan = false;
 	btree->scanDirection = ForwardScanDirection;
 
 	btree->entryAttnum = attnum;

src/rumentrypage.c

@@ -125,7 +125,7 @@ entryIsMoveRight(RumBtree btree, Page page)
 	RumNullCategory category;
 
 	if (RumPageRightMost(page))
-		return FALSE;
+		return false;
 
 	itup = getRightMostTuple(page);
 	attnum = rumtuple_get_attrnum(btree->rumstate, itup);
@@ -134,9 +134,9 @@ entryIsMoveRight(RumBtree btree, Page page)
 	if (rumCompareAttEntries(btree->rumstate,
 				   btree->entryAttnum, btree->entryKey, btree->entryCategory,
 							 attnum, key, category) > 0)
-		return TRUE;
+		return true;
 
-	return FALSE;
+	return false;
 }
 
 /*
@@ -232,7 +232,7 @@ entryLocateLeafEntry(RumBtree btree, RumBtreeStack * stack)
 	if (btree->fullScan)
 	{
 		stack->off = FirstOffsetNumber;
-		return TRUE;
+		return true;
 	}
 
 	low = FirstOffsetNumber;
@@ -558,12 +558,12 @@ rumPrepareEntryScan(RumBtree btree, OffsetNumber attnum,
 	btree->splitPage = entrySplitPage;
 	btree->fillRoot = rumEntryFillRoot;
 
-	btree->isData = FALSE;
-	btree->searchMode = FALSE;
-	btree->fullScan = FALSE;
+	btree->isData = false;
+	btree->searchMode = false;
+	btree->fullScan = false;
 
 	btree->entryAttnum = attnum;
 	btree->entryKey = key;
 	btree->entryCategory = category;
-	btree->isDelete = FALSE;
+	btree->isDelete = false;
 }