Merge branch 'add_btree'

Author: feodor

Makefile

@@ -5,15 +5,21 @@ OBJS = src/rumsort.o src/rum_ts_utils.o src/rumtsquery.o \
 	src/rumbtree.o src/rumbulk.o src/rumdatapage.o \
 	src/rumentrypage.o src/rumget.o src/ruminsert.o \
 	src/rumscan.o src/rumutil.o src/rumvacuum.o src/rumvalidate.o \
-	src/rum_timestamp.o $(WIN32RES)
+	src/btree_rum.o $(WIN32RES)
 
 EXTENSION = rum
-DATA = rum--1.0.sql
+DATA = rum--1.0.sql rum--1.0--1.1.sql rum--1.1.sql
 PGFILEDESC = "RUM index access method"
 INCLUDES = src/rum.h src/rumsort.h
 
 REGRESS = rum rum_hash ruminv timestamp orderby orderby_hash altorder \
-	altorder_hash limits
+	altorder_hash limits \
+	int2 int4 int8 float4 float8 money oid \
+    time timetz date interval \
+    macaddr inet cidr text varchar char bytea bit varbit \
+    numeric
+
+EXTRA_CLEAN += rum--1.1.sql rum--1.0--1.1.sql
 
 LDFLAGS_SL += $(filter -lm, $(LIBS))
 
@@ -31,6 +37,15 @@ endif
 wal-check: temp-install
 	$(prove_check)
 
+all: rum--1.1.sql
+
+#9.6 requires 1.1 file but 10.0 could live with 1.0 + 1.0-1.1 files
+rum--1.1.sql:  rum--1.0.sql rum--1.0--1.1.sql
+	cat rum--1.0.sql rum--1.0--1.1.sql > rum--1.1.sql
+
+rum--1.0--1.1.sql: Makefile gen_rum_sql--1.0--1.1.pl
+	perl gen_rum_sql--1.0--1.1.pl > rum--1.0--1.1.sql
+
 install: installincludes
 
 installincludes:

README.md

@@ -59,6 +59,9 @@ Typical installation procedure may look like this:
 | timestamp <=| timestamp | float8 | Returns distance only for left timestamps.
 | timestamp |=> timestamp | float8 | Returns distance only for right timestamps.
 
+Last three operations also works for types int2, int4, int8, float4, float8,
+money and oid.
+
 ## Operator classes
 
 **rum** provides next operator classes.
@@ -128,35 +131,33 @@ For type: `tsvector`
 This operator class stores hash of `tsvector` lexemes with positional information.
 Supports ordering by `<=>` operator. But **doesn't** support prefix search.
 
-### rum_timestamp_ops
-
-For type: `timestamp`
-
-Operator class provides fast search and ordering by timestamp fields. Supports
-ordering by `<=>`, `<=|` and `|=>` operators. Can be used with
-`rum_tsvector_timestamp_ops` operator class.
+### rum_TYPE_ops
 
-### rum_timestamptz_ops
+For types: int2, int4, int8, float4, float8, money, oid, time, timetz, date,
+interval, macaddr, inet, cidr, text, varchar, char, bytea, bit, varbit,
+numeric, timestamp, timestamptz
 
-For type: `timestamptz`
+Supported operations: `<`, `<=`, `=`, `>=`, `>` for all types and
+`<=>`, `<=|` and `|=>` for int2, int4, int8, float4, float8, money, oid,
+timestamp and timestamptz types. 
 
-Operator class provides fast search and ordering by timestamptz fields. Supports
-ordering by `<=>`, `<=|` and `|=>` operators. Can be used with
-`rum_tsvector_timestamptz_ops` operator class.
+Supports ordering by `<=>`, `<=|` and `|=>` operators. Can be used with
+`rum_tsvector_addon_ops` operator class.
 
-### rum_tsvector_timestamp_ops
+### rum_tsvector_addon_ops
 
 For type: `tsvector`
 
-This operator class stores `tsvector` lexems with timestamp field. There is the example.
+This operator class stores `tsvector` lexems with any supported by module
+field. There is the example.
 
 Let us assume we have the table:
 ```sql
 CREATE TABLE tsts (id int, t tsvector, d timestamp);
 
 \copy tsts from 'rum/data/tsts.data'
 
-CREATE INDEX tsts_idx ON tsts USING rum (t rum_tsvector_timestamp_ops, d)
+CREATE INDEX tsts_idx ON tsts USING rum (t rum_tsvector_addon_ops, d)
     WITH (attach = 'd', to = 't');
 ```
 
@@ -183,24 +184,13 @@ SELECT id, d, d <=> '2016-05-16 14:21:25' FROM tsts WHERE t @@ 'wr&qh' ORDER BY
 (5 rows)
 ```
 
-### rum_tsvector_timestamptz_ops
+### rum_tsvector_hash_addon_ops
 
 For type: `tsvector`
 
-See comments for `rum_tsvector_timestamp_ops` operator class.
-
-### rum_tsvector_hash_timestamp_ops
-
-For type: `tsvector`
-
-This operator class stores hash of `tsvector` lexems with timestamp field.
-**Doesn't** support prefix search.
-
-### rum_tsvector_hash_timestamptz_ops
-
-For type: `tsvector`
+This operator class stores hash of `tsvector` lexems with any supported by module
+field.
 
-This operator class stores hash of `tsvector` lexems with timestamptz field.
 **Doesn't** support prefix search.
 
 ### rum_tsquery_ops

TODO

@@ -1,6 +1,10 @@
-1. with naturalOrder=true make scan the rest to be consistent with seqscan
-2. add leftlink to data page to privide backward scan on index (<=| op)
+1. with naturalOrder=true make scan the rest to be consistent with seqscan [done]
+2. add leftlink to data page to privide backward scan on index (<=| op) [done]
 3. Compression of ItemPointer for use_alternative_order
 4. Compression addInfo
-5. Remove FROM_STRATEGY ugly magick 
+5. Remove FROM_STRATEGY ugly magick [done] 
 
+
+BTREE:
+1 fix changes in rum--1.0.sql [done]
+2 adding using as addinfo

expected/altorder.out

@@ -1,6 +1,6 @@
 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)
+CREATE INDEX atsts_idx ON atsts USING rum (t rum_tsvector_addon_ops, d)
 	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'); 
@@ -323,4 +323,3 @@ SELECT id, d FROM atsts WHERE  t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER
  496 | Sun May 22 11:21:22.326724 2016
 (8 rows)
 
-DROP TABLE atsts CASCADE;

expected/altorder_1.out

@@ -322,4 +322,3 @@ SELECT id, d FROM atsts WHERE  t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER
  496 | Sun May 22 11:21:22.326724 2016
 (8 rows)
 
-DROP TABLE atsts CASCADE;