add orderby initial test

feodor · feodor · commit f7e0d94f8c94 · 2016-05-11T19:34:07.000+03:00
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ EXTENSION = rum
 DATA = rum--1.0.sql
 PGFILEDESC = "RUM index access method"
 
-REGRESS = rum timestamp
+REGRESS = rum timestamp orderby
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/data/tsts.data b/data/tsts.data
diff --git a/expected/orderby.out b/expected/orderby.out
@@ -0,0 +1,3 @@
+CREATE TABLE tsts (id int, t tsvector, d timestamp);
+\copy tsts from 'data/tsts.data'
+CREATE INDEX tsts_idx ON tsts USING rum (t rum_tsvector_ops, d) WITH (orderby = 'd');
diff --git a/rum.h b/rum.h
@@ -294,6 +294,7 @@ typedef struct RumOptions
 {
 	int32		vl_len_;		/* varlena header (do not touch directly!) */
 	bool		useFastUpdate;	/* use fast updates? */
+	int			orderByColumn;
 } RumOptions;
 
 #define RUM_DEFAULT_USE_FASTUPDATE	false
@@ -315,6 +316,7 @@ typedef struct RumState
 {
 	Relation	index;
 	bool		oneCol;			/* true if single-column index */
+	AttrNumber	attrnOrderByColumn;
 
 	/*
 	 * origTupDesc is the nominal tuple descriptor of the index, ie, the i'th
diff --git a/rumutil.c b/rumutil.c
@@ -20,6 +20,7 @@
 #include "storage/lmgr.h"
 #include "utils/guc.h"
 #include "utils/index_selfuncs.h"
+#include "utils/lsyscache.h"
 
 #include "rum.h"
 
@@ -29,6 +30,8 @@ void		_PG_init(void);
 
 PG_FUNCTION_INFO_V1(rumhandler);
 
+/* Kind of relation optioms for rum index */
+static relopt_kind rum_relopt_kind;
 /*
  * Module load callback
  */
@@ -43,6 +46,12 @@ _PG_init(void)
 					0, 0, INT_MAX,
 					PGC_USERSET, 0,
 					NULL, NULL, NULL);
+
+	rum_relopt_kind = add_reloption_kind();
+
+	add_string_reloption(rum_relopt_kind, "orderby",
+						 "Column name to order by operation",
+						 NULL, NULL);
 }
 
 /*
@@ -242,6 +251,29 @@ initRumState(RumState *state, Relation index)
 		else
 			state->supportCollation[i] = DEFAULT_COLLATION_OID;
 	}
+
+	state->attrnOrderByColumn = InvalidAttrNumber;
+
+	if (index->rd_options)
+	{
+		RumOptions	*options = (RumOptions*) index->rd_options;
+
+		if (options->orderByColumn > 0)
+		{
+			char		*colname = (char *) options + options->orderByColumn;
+			AttrNumber	attrnOrderByHeapColumn;
+
+			attrnOrderByHeapColumn = get_attnum(index->rd_index->indrelid, colname);
+
+			if (!AttributeNumberIsValid(attrnOrderByHeapColumn))
+				elog(ERROR, "attribute \"%s\" is not found in table", colname);
+
+			state->attrnOrderByColumn = get_attnum(index->rd_id, colname);
+
+			if (!AttributeNumberIsValid(state->attrnOrderByColumn))
+				elog(ERROR, "attribute \"%s\" is not found in index", colname);
+		}
+	}
 }
 
 /*
@@ -685,10 +717,11 @@ rumoptions(Datum reloptions, bool validate)
 	RumOptions *rdopts;
 	int			numoptions;
 	static const relopt_parse_elt tab[] = {
-		{"fastupdate", RELOPT_TYPE_BOOL, offsetof(RumOptions, useFastUpdate)}
+		{"fastupdate", RELOPT_TYPE_BOOL, offsetof(RumOptions, useFastUpdate)},
+		{"orderby", RELOPT_TYPE_STRING, offsetof(RumOptions, orderByColumn)}
 	};
 
-	options = parseRelOptions(reloptions, validate, RELOPT_KIND_GIN,
+	options = parseRelOptions(reloptions, validate, rum_relopt_kind,
 							  &numoptions);
 
 	/* if none set, we're done */
diff --git a/sql/orderby.sql b/sql/orderby.sql
@@ -0,0 +1,6 @@
+CREATE TABLE tsts (id int, t tsvector, d timestamp);
+
+\copy tsts from 'data/tsts.data'
+
+CREATE INDEX tsts_idx ON tsts USING rum (t rum_tsvector_ops, d) WITH (orderby = 'd');
+

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+CREATE TABLE tsts (id int, t tsvector, d timestamp);`
	`2`	`+\copy tsts from 'data/tsts.data'`
	`3`	`+CREATE INDEX tsts_idx ON tsts USING rum (t rum_tsvector_ops, d) WITH (orderby = 'd');`
Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,7 @@ typedef struct RumOptions`
`294`	`294`	`{`
`295`	`295`	`int32 vl_len_; /* varlena header (do not touch directly!) */`
`296`	`296`	`bool useFastUpdate; /* use fast updates? */`
	`297`	`+ int orderByColumn;`
`297`	`298`	`} RumOptions;`
`298`	`299`
`299`	`300`	`#define RUM_DEFAULT_USE_FASTUPDATE false`
`@@ -315,6 +316,7 @@ typedef struct RumState`
`315`	`316`	`{`
`316`	`317`	`Relation index;`
`317`	`318`	`bool oneCol; /* true if single-column index */`
	`319`	`+ AttrNumber attrnOrderByColumn;`
`318`	`320`
`319`	`321`	`/*`
`320`	`322`	`* origTupDesc is the nominal tuple descriptor of the index, ie, the i'th`