rename WITH options

Author: feodor

expected/altorder.out

@@ -1,7 +1,7 @@
 CREATE TABLE atsts (id int, t tsvector, d timestamp);
 \copy atsts from 'data/tsts.data'
 CREATE INDEX atsts_idx ON atsts USING rum (t rum_tsvector_timestamp_ops, d)
-	WITH (orderby = 'd', addto = 't', use_alternative_order='t');
+	WITH (attach = 'd', to = 't', order_by_attach='t');
 INSERT INTO atsts VALUES (-1, 't1 t2',  '2016-05-02 02:24:22.326724'); 
 INSERT INTO atsts VALUES (-2, 't1 t2 t3',  '2016-05-02 02:26:22.326724'); 
 SELECT count(*) FROM atsts WHERE t @@ 'wr|qh';

expected/orderby.out

@@ -1,7 +1,7 @@
 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_timestamp_ops, d)
-	WITH (orderby = 'd', addto = 't');
+	WITH (attach = 'd', to = 't');
 INSERT INTO tsts VALUES (-1, 't1 t2',  '2016-05-02 02:24:22.326724'); 
 INSERT INTO tsts VALUES (-2, 't1 t2 t3',  '2016-05-02 02:26:22.326724'); 
 SELECT count(*) FROM tsts WHERE t @@ 'wr|qh';

rumutil.c

@@ -50,13 +50,13 @@ _PG_init(void)
 
 	rum_relopt_kind = add_reloption_kind();
 
-	add_string_reloption(rum_relopt_kind, "orderby",
-						 "Column name to order by operation",
+	add_string_reloption(rum_relopt_kind, "attach",
+						 "Column name to attach as additional info",
 						 NULL, NULL);
-	add_string_reloption(rum_relopt_kind, "addto",
+	add_string_reloption(rum_relopt_kind, "to",
 						 "Column name to add a order by column",
 						 NULL, NULL);
-	add_bool_reloption(rum_relopt_kind, "use_alternative_order",
+	add_bool_reloption(rum_relopt_kind, "order_by_attach",
 			  "Use (addinfo, itempointer) order instead of just itempointer",
 					   false);
 }
@@ -785,9 +785,9 @@ rumoptions(Datum reloptions, bool validate)
 	int			numoptions;
 	static const relopt_parse_elt tab[] = {
 		{"fastupdate", RELOPT_TYPE_BOOL, offsetof(RumOptions, useFastUpdate)},
-		{"orderby", RELOPT_TYPE_STRING, offsetof(RumOptions, orderByColumn)},
-		{"addto", RELOPT_TYPE_STRING, offsetof(RumOptions, addToColumn)},
-		{"use_alternative_order", RELOPT_TYPE_BOOL, offsetof(RumOptions, useAlternativeOrder)}
+		{"attach", RELOPT_TYPE_STRING, offsetof(RumOptions, orderByColumn)},
+		{"to", RELOPT_TYPE_STRING, offsetof(RumOptions, addToColumn)},
+		{"order_by_attach", RELOPT_TYPE_BOOL, offsetof(RumOptions, useAlternativeOrder)}
 	};
 
 	options = parseRelOptions(reloptions, validate, rum_relopt_kind,

sql/altorder.sql

@@ -3,7 +3,7 @@ CREATE TABLE atsts (id int, t tsvector, d timestamp);
 \copy atsts from 'data/tsts.data'
 
 CREATE INDEX atsts_idx ON atsts USING rum (t rum_tsvector_timestamp_ops, d)
-	WITH (orderby = 'd', addto = 't', use_alternative_order='t');
+	WITH (attach = 'd', to = 't', order_by_attach='t');
 
 
 INSERT INTO atsts VALUES (-1, 't1 t2',  '2016-05-02 02:24:22.326724'); 

sql/orderby.sql

@@ -3,7 +3,7 @@ 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_timestamp_ops, d)
-	WITH (orderby = 'd', addto = 't');
+	WITH (attach = 'd', to = 't');
 
 
 INSERT INTO tsts VALUES (-1, 't1 t2',  '2016-05-02 02:24:22.326724');