Merge branch 'svace-fix' into public_master

Author: feodor

Diff for: src/btree_rum.c

@@ -112,6 +112,7 @@ rum_btree_extract_query(FunctionCallInfo fcinfo,
 		case BTGreaterEqualStrategyNumber:
 		case BTGreaterStrategyNumber:
 			*ptr_partialmatch = true;
+			/*FALLTHROUGH*/
 		case BTEqualStrategyNumber:
 		case RUM_DISTANCE:
 		case RUM_LEFT_DISTANCE:

Diff for: src/rum_ts_utils.c

@@ -62,7 +62,7 @@ PG_FUNCTION_INFO_V1(rum_ts_join_pos);
 
 PG_FUNCTION_INFO_V1(tsquery_to_distance_query);
 
-static int	count_pos(char *ptr, int len);
+static unsigned int	count_pos(char *ptr, int len);
 static char *decompress_pos(char *ptr, WordEntryPos *pos);
 static Datum build_tsvector_entry(TSVector vector, WordEntry *we);
 static Datum build_tsvector_hash_entry(TSVector vector, WordEntry *we);
@@ -919,7 +919,7 @@ rum_tsquery_timestamp_consistent(PG_FUNCTION_ARGS)
 #define SIXTHBIT 0x20
 #define LOWERMASK 0x1F
 
-static int
+static unsigned int
 compress_pos(char *target, WordEntryPos *pos, int npos)
 {
 	int			i;
@@ -980,7 +980,7 @@ decompress_pos(char *ptr, WordEntryPos *pos)
 	}
 }
 
-static int
+static unsigned int
 count_pos(char *ptr, int len)
 {
 	int			count = 0,

Diff for: src/rumdatapage.c

@@ -99,7 +99,7 @@ rumDatumWrite(Pointer ptr, Datum datum, bool typbyval, char typalign,
 				elog(ERROR, "unsupported byval length: %d", (int) (typlen));
 		}
 
-		data_length = typlen;
+		data_length = (Size)typlen;
 	}
 	else if (typlen == -1)
 	{
@@ -149,7 +149,7 @@ rumDatumWrite(Pointer ptr, Datum datum, bool typbyval, char typalign,
 		/* fixed-length pass-by-reference */
 		ptr = (char *) att_align_nominal(ptr, typalign);
 		Assert(typlen > 0);
-		data_length = typlen;
+		data_length = (Size)typlen;
 		memmove(ptr, DatumGetPointer(datum), data_length);
 	}
 
@@ -736,7 +736,7 @@ RumDataPageAddItem(Page page, void *data, OffsetNumber offset)
 		if (offset <= maxoff)
 			memmove(ptr + sizeof(PostingItem),
 					ptr,
-					(maxoff - offset + 1) * sizeof(PostingItem));
+				    ((uint16_t)(maxoff - offset + 1)) * sizeof(PostingItem));
 	}
 	memcpy(ptr, data, sizeof(PostingItem));
 	RumPageGetOpaque(page)->maxoff++;
@@ -763,7 +763,7 @@ RumPageDeletePostingItem(Page page, OffsetNumber offset)
 		char	   *dstptr = RumDataPageGetItem(page, offset),
 				   *sourceptr = RumDataPageGetItem(page, offset + 1);
 
-		memmove(dstptr, sourceptr, sizeof(PostingItem) * (maxoff - offset));
+		memmove(dstptr, sourceptr, sizeof(PostingItem) * (uint16_t)(maxoff - offset));
 	}
 
 	RumPageGetOpaque(page)->maxoff--;
@@ -1229,7 +1229,7 @@ dataSplitPageInternal(RumBtree btree, Buffer lbuf, Buffer rbuf,
 	RumItem	   *bound;
 	Page		newlPage = PageGetTempPageCopy(BufferGetPage(lbuf));
 	RumItem		oldbound = *RumDataPageGetRightBound(newlPage);
-	int			sizeofitem = sizeof(PostingItem);
+	unsigned int	sizeofitem = sizeof(PostingItem);
 	OffsetNumber maxoff = RumPageGetOpaque(newlPage)->maxoff;
 	Size		pageSize = PageGetPageSize(newlPage);
 	Size		freeSpace;
@@ -1246,7 +1246,7 @@ dataSplitPageInternal(RumBtree btree, Buffer lbuf, Buffer rbuf,
 	Assert(!RumPageIsLeaf(newlPage));
 	ptr = vector + (off - 1) * sizeofitem;
 	if (maxoff + 1 - off != 0)
-		memmove(ptr + sizeofitem, ptr, (maxoff - off + 1) * sizeofitem);
+		memmove(ptr + sizeofitem, ptr, (uint16_t)(maxoff - off + 1) * sizeofitem);
 	memcpy(ptr, &(btree->pitem), sizeofitem);
 
 	maxoff++;
@@ -1273,7 +1273,7 @@ dataSplitPageInternal(RumBtree btree, Buffer lbuf, Buffer rbuf,
 
 	ptr = RumDataPageGetItem(rPage, FirstOffsetNumber);
 	memcpy(ptr, vector + separator * sizeofitem,
-		   (maxoff - separator) * sizeofitem);
+		   (uint16_t)(maxoff - separator) * sizeofitem);
 	RumPageGetOpaque(rPage)->maxoff = maxoff - separator;
 	/* Adjust pd_lower */
 	((PageHeader) rPage)->pd_lower = (ptr +
@@ -1501,8 +1501,10 @@ rumInsertItemPointers(RumState * rumstate,
 					  RumItem * items, uint32 nitem,
 					  GinStatsData *buildStats)
 {
-	BlockNumber rootBlkno = gdi->stack->blkno;
+	BlockNumber rootBlkno;
 
+	Assert(gdi->stack);
+	rootBlkno = gdi->stack->blkno;
 	gdi->btree.items = items;
 	gdi->btree.nitem = nitem;
 	gdi->btree.curitem = 0;

Diff for: src/rumentrypage.c

@@ -113,6 +113,8 @@ getRightMostTuple(Page page)
 {
 	OffsetNumber maxoff = PageGetMaxOffsetNumber(page);
 
+	Assert(maxoff != InvalidOffsetNumber);
+
 	return (IndexTuple) PageGetItem(page, PageGetItemId(page, maxoff));
 }
 

Diff for: src/rumget.c

@@ -687,7 +687,7 @@ startScanEntry(RumState * rumstate, RumScanEntry entry, Snapshot snapshot)
 		else if (RumGetNPosting(itup) > 0)
 		{
 			entry->nlist = RumGetNPosting(itup);
-			entry->predictNumberResult = entry->nlist;
+			entry->predictNumberResult = (uint32_t)entry->nlist;
 			entry->list = (RumItem *) palloc(sizeof(RumItem) * entry->nlist);
 
 			rumReadTuple(rumstate, entry->attnum, itup, entry->list, true);
@@ -1104,7 +1104,7 @@ entryGetNextItemList(RumState * rumstate, RumScanEntry entry, Snapshot snapshot)
 	else if (RumGetNPosting(itup) > 0)
 	{
 		entry->nlist = RumGetNPosting(itup);
-		entry->predictNumberResult = entry->nlist;
+		entry->predictNumberResult = (uint32_t)entry->nlist;
 		entry->list = (RumItem *) palloc(sizeof(RumItem) * entry->nlist);
 
 		rumReadTuple(rumstate, entry->attnum, itup, entry->list, true);

Diff for: src/rumscan.c

@@ -469,12 +469,12 @@ lookupScanDirection(RumState *state, AttrNumber attno, StrategyNumber strategy)
 	int			i;
 	RumConfig	*rumConfig = state->rumConfig + attno - 1;
 
-	for(i = 0; rumConfig->strategyInfo[i].strategy != InvalidStrategy &&
-			   i < MAX_STRATEGIES; i++)
+	for(i = 0; i < MAX_STRATEGIES; i++)
 	{
+		if (rumConfig->strategyInfo[i].strategy != InvalidStrategy)
+			break;
 		if (rumConfig->strategyInfo[i].strategy == strategy)
 			return rumConfig->strategyInfo[i].direction;
-
 	}
 
 	return NoMovementScanDirection;