change rum versioning

feodor · feodor · commit 7212340c8c29 · 2016-05-17T00:58:44.000+03:00
diff --git a/rum.h b/rum.h
@@ -59,6 +59,11 @@ typedef RumPageOpaqueData *RumPageOpaque;
 
 typedef struct RumMetaPageData
 {
+	/*
+	 * RUM version number
+	 */
+	uint32		rumVersion;
+
 	/*
 	 * Pointers to head and tail of pending list, which consists of RUM_LIST
 	 * pages.  These store fast-inserted entries that haven't yet been moved
@@ -86,21 +91,9 @@ typedef struct RumMetaPageData
 	BlockNumber nEntryPages;
 	BlockNumber nDataPages;
 	int64		nEntries;
-
-	/*
-	 * RUM version number (ideally this should have been at the front, but too
-	 * late now.  Don't move it!)
-	 *
-	 * Currently 1 (for indexes initialized in 9.1 or later)
-	 *
-	 * Version 0 (indexes initialized in 9.0 or before) is compatible but may
-	 * be missing null entries, including both null keys and placeholders.
-	 * Reject full-index-scan attempts on such indexes.
-	 */
-	int32		rumVersion;
 } RumMetaPageData;
 
-#define RUM_CURRENT_VERSION		1
+#define RUM_CURRENT_VERSION		(0xC0DE0001)
 
 #define RumPageGetMeta(p) \
 	((RumMetaPageData *) PageGetContents(p))
diff --git a/rumscan.c b/rumscan.c
@@ -436,24 +436,6 @@ rumNewScanKey(IndexScanDesc scan)
 					   NULL, NULL, NULL, NULL, false);
 	}
 
-	/*
-	 * If the index is version 0, it may be missing null and placeholder
-	 * entries, which would render searches for nulls and full-index scans
-	 * unreliable.  Throw an error if so.
-	 */
-	if (hasNullQuery && !so->isVoidRes)
-	{
-		GinStatsData rumStats;
-
-		rumGetStats(scan->indexRelation, &rumStats);
-		if (rumStats.ginVersion < 1)
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("old RUM indexes do not support whole-index scans nor searches for nulls"),
-					 errhint("To fix this, do REINDEX INDEX \"%s\".",
-							 RelationGetRelationName(scan->indexRelation))));
-	}
-
 	pgstat_count_index_scan(scan->indexRelation);
 }
 
diff --git a/rumutil.c b/rumutil.c
@@ -811,6 +811,9 @@ rumGetStats(Relation index, GinStatsData *stats)
 	stats->nEntries = metadata->nEntries;
 	stats->ginVersion = metadata->rumVersion;
 
+	if (stats->ginVersion != RUM_CURRENT_VERSION)
+		elog(ERROR, "unexpected RUM index version. Reindex");
+
 	UnlockReleaseBuffer(metabuffer);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -811,6 +811,9 @@ rumGetStats(Relation index, GinStatsData *stats)`
`811`	`811`	`stats->nEntries = metadata->nEntries;`
`812`	`812`	`stats->ginVersion = metadata->rumVersion;`
`813`	`813`
	`814`	`+ if (stats->ginVersion != RUM_CURRENT_VERSION)`
	`815`	`+ elog(ERROR, "unexpected RUM index version. Reindex");`
	`816`	`+`
`814`	`817`	`UnlockReleaseBuffer(metabuffer);`
`815`	`818`	`}`
`816`	`819`