Replace macros with inline functions

Artur Zakirov · Artur Zakirov · commit dbc2a08d3cfb · 2016-07-07T11:34:40.000+03:00
diff --git a/rum.h b/rum.h
@@ -299,22 +299,6 @@ typedef struct
 #define RumPageGetIndexes(page) \
 	((RumDataLeafItemIndex *)(RumDataPageGetData(page) + RumDataPageSize))
 
-/*
- * Macros to handle generic XLOG
- */
-#define RumGenericXLogStart(index, isbuild) \
-	(!(isbuild) ? GenericXLogStart(index) : NULL)
-
-#define RumGenericXLogRegisterBuffer(state, buffer, flags, isbuild) \
-	(!(isbuild) ? GenericXLogRegisterBuffer(state, buffer, flags) : \
-	BufferGetPage(buffer))
-
-#define RumGenericXLogFinish(state, isbuild) \
-	(!(isbuild) ? GenericXLogFinish(state) : 0)
-
-#define RumGenericXLogAbort(state, isbuild) \
-	(!(isbuild) ? GenericXLogAbort(state) : (void) 0)
-
 /*
  * Storage type for RUM's reloptions
  */
@@ -781,6 +765,41 @@ extern Datum rum_ts_distance(PG_FUNCTION_ARGS);
 /* GUC parameters */
 extern PGDLLIMPORT int RumFuzzySearchLimit;
 
+/*
+ * Functions to handle generic XLOG
+ */
+static inline GenericXLogState *
+RumGenericXLogStart(Relation relation, bool isbuild)
+{
+	if (!isbuild)
+		return GenericXLogStart(relation);
+	return NULL;
+}
+
+static inline Page
+RumGenericXLogRegisterBuffer(GenericXLogState *state, Buffer buffer, int flags,
+							 bool isbuild)
+{
+	if (!isbuild)
+		return GenericXLogRegisterBuffer(state, buffer, flags);
+	return BufferGetPage(buffer);
+}
+
+static inline XLogRecPtr
+RumGenericXLogFinish(GenericXLogState *state, bool isbuild)
+{
+	if (!isbuild)
+		return GenericXLogFinish(state);
+	return InvalidXLogRecPtr;
+}
+
+static inline void
+RumGenericXLogAbort(GenericXLogState *state, bool isbuild)
+{
+	if (!isbuild)
+		GenericXLogAbort(state);
+}
+
 /*
  * Functions for reading ItemPointers with additional information. Used in
  * various .c files and have to be inline for being fast.
diff --git a/rumget.c b/rumget.c
@@ -1605,8 +1605,6 @@ scanPage(RumState * rumstate, RumScanEntry entry, RumKey *item, Page page,
 static void
 entryFindItem(RumState * rumstate, RumScanEntry entry, RumKey * item)
 {
-	Page		page = NULL;
-
 	if (entry->nlist == 0)
 	{
 		entry->isFinished = TRUE;
@@ -1660,8 +1658,6 @@ entryFindItem(RumState * rumstate, RumScanEntry entry, RumKey * item)
 	entry->gdi->stack = rumReFindLeafPage(&entry->gdi->btree, entry->gdi->stack);
 	entry->buffer = entry->gdi->stack->buffer;
 
-	page = BufferGetPage(entry->buffer);
-
 	if (scanPage(rumstate, entry, item,
 				 BufferGetPage(entry->buffer),
 				 true))
@@ -1685,7 +1681,6 @@ entryFindItem(RumState * rumstate, RumScanEntry entry, RumKey * item)
 		}
 
 		entry->gdi->stack->blkno = BufferGetBlockNumber(entry->buffer);
-		page = BufferGetPage(entry->buffer);
 
 		if (scanPage(rumstate, entry, item,
 					 BufferGetPage(entry->buffer),
