Support amproperty method.

za-arthur · za-arthur · commit 0e01f5d1c59e · 2017-11-29T17:39:59.000+03:00
Query select pg_index_column_has_property('index_name'::regclass,1,'distance_orderable')
returns value 'true' instead of null now.
diff --git a/expected/rum.out b/expected/rum.out
@@ -47,6 +47,45 @@ CREATE TRIGGER tsvectorupdate
 BEFORE UPDATE OR INSERT ON test_rum
 FOR EACH ROW EXECUTE PROCEDURE tsvector_update_trigger('a', 'pg_catalog.english', 't');
 CREATE INDEX rumidx ON test_rum USING rum (a rum_tsvector_ops);
+-- Access method properties
+SELECT a.amname, p.name, pg_indexam_has_property(a.oid,p.name)
+FROM pg_am a, unnest(array['can_order','can_unique','can_multi_col','can_exclude']) p(name)
+WHERE a.amname = 'rum' ORDER BY a.amname;
+ amname |     name      | pg_indexam_has_property 
+--------+---------------+-------------------------
+ rum    | can_order     | f
+ rum    | can_unique    | f
+ rum    | can_multi_col | t
+ rum    | can_exclude   | t
+(4 rows)
+
+-- Index properties
+SELECT p.name, pg_index_has_property('rumidx'::regclass,p.name)
+FROM unnest(array['clusterable','index_scan','bitmap_scan','backward_scan']) p(name);
+     name      | pg_index_has_property 
+---------------+-----------------------
+ clusterable   | f
+ index_scan    | t
+ bitmap_scan   | t
+ backward_scan | f
+(4 rows)
+
+-- Index column properties
+SELECT p.name, pg_index_column_has_property('rumidx'::regclass,1,p.name)
+FROM unnest(array['asc','desc','nulls_first','nulls_last','orderable','distance_orderable','returnable','search_array','search_nulls']) p(name);
+        name        | pg_index_column_has_property 
+--------------------+------------------------------
+ asc                | f
+ desc               | f
+ nulls_first        | f
+ nulls_last         | f
+ orderable          | f
+ distance_orderable | t
+ returnable         | f
+ search_array       | f
+ search_nulls       | f
+(9 rows)
+
 \copy test_rum(t) from 'data/rum.data';
 CREATE INDEX failed_rumidx ON test_rum USING rum (a rum_tsvector_addon_ops);
 ERROR:  additional information attribute "a" is not found in index
diff --git a/sql/rum.sql b/sql/rum.sql
@@ -13,6 +13,19 @@ BEFORE UPDATE OR INSERT ON test_rum
 FOR EACH ROW EXECUTE PROCEDURE tsvector_update_trigger('a', 'pg_catalog.english', 't');
 CREATE INDEX rumidx ON test_rum USING rum (a rum_tsvector_ops);
 
+-- Access method properties
+SELECT a.amname, p.name, pg_indexam_has_property(a.oid,p.name)
+FROM pg_am a, unnest(array['can_order','can_unique','can_multi_col','can_exclude']) p(name)
+WHERE a.amname = 'rum' ORDER BY a.amname;
+
+-- Index properties
+SELECT p.name, pg_index_has_property('rumidx'::regclass,p.name)
+FROM unnest(array['clusterable','index_scan','bitmap_scan','backward_scan']) p(name);
+
+-- Index column properties
+SELECT p.name, pg_index_column_has_property('rumidx'::regclass,1,p.name)
+FROM unnest(array['asc','desc','nulls_first','nulls_last','orderable','distance_orderable','returnable','search_array','search_nulls']) p(name);
+
 \copy test_rum(t) from 'data/rum.data';
 
 CREATE INDEX failed_rumidx ON test_rum USING rum (a rum_tsvector_addon_ops);
diff --git a/src/rum.h b/src/rum.h
@@ -400,6 +400,9 @@ typedef struct RumState
 
 /* rumutil.c */
 extern bytea *rumoptions(Datum reloptions, bool validate);
+extern bool rumproperty(Oid index_oid, int attno,
+			 IndexAMProperty prop, const char *propname,
+			 bool *res, bool *isnull);
 extern Datum rumhandler(PG_FUNCTION_ARGS);
 extern void initRumState(RumState * state, Relation index);
 extern Buffer RumNewBuffer(Relation index);
diff --git a/src/rumutil.c b/src/rumutil.c
@@ -13,8 +13,10 @@
 
 #include "postgres.h"
 
+#include "access/htup_details.h"
 #include "access/reloptions.h"
 #include "catalog/pg_collation.h"
+#include "catalog/pg_opclass.h"
 #include "catalog/pg_type.h"
 #include "miscadmin.h"
 #include "storage/indexfsm.h"
@@ -23,6 +25,7 @@
 #include "utils/guc.h"
 #include "utils/index_selfuncs.h"
 #include "utils/lsyscache.h"
+#include "utils/syscache.h"
 #include "utils/typcache.h"
 
 #include "rum.h"
@@ -111,6 +114,9 @@ rumhandler(PG_FUNCTION_ARGS)
 	amroutine->amstorage = true;
 	amroutine->amclusterable = false;
 	amroutine->ampredlocks = true;
+#if PG_VERSION_NUM >= 100000
+	amroutine->amcanparallel = false;
+#endif
 	amroutine->amkeytype = InvalidOid;
 
 	amroutine->ambuild = rumbuild;
@@ -121,6 +127,7 @@ rumhandler(PG_FUNCTION_ARGS)
 	amroutine->amcanreturn = NULL;
 	amroutine->amcostestimate = gincostestimate;
 	amroutine->amoptions = rumoptions;
+	amroutine->amproperty = rumproperty;
 	amroutine->amvalidate = rumvalidate;
 	amroutine->ambeginscan = rumbeginscan;
 	amroutine->amrescan = rumrescan;
@@ -129,6 +136,11 @@ rumhandler(PG_FUNCTION_ARGS)
 	amroutine->amendscan = rumendscan;
 	amroutine->ammarkpos = NULL;
 	amroutine->amrestrpos = NULL;
+#if PG_VERSION_NUM >= 100000
+	amroutine->amestimateparallelscan = NULL;
+	amroutine->aminitparallelscan = NULL;
+	amroutine->amparallelrescan = NULL;
+#endif
 
 	PG_RETURN_POINTER(amroutine);
 }
@@ -877,6 +889,82 @@ rumoptions(Datum reloptions, bool validate)
 	return (bytea *) rdopts;
 }
 
+bool
+rumproperty(Oid index_oid, int attno,
+			IndexAMProperty prop, const char *propname,
+			bool *res, bool *isnull)
+{
+	HeapTuple	tuple;
+	Form_pg_index rd_index PG_USED_FOR_ASSERTS_ONLY;
+	Form_pg_opclass rd_opclass;
+	Datum		datum;
+	bool		disnull;
+	oidvector  *indclass;
+	Oid			opclass,
+				opfamily,
+				opcintype;
+	int16		procno;
+
+	/* Only answer column-level inquiries */
+	if (attno == 0)
+		return false;
+
+	switch (prop)
+	{
+		case AMPROP_DISTANCE_ORDERABLE:
+			procno = RUM_ORDERING_PROC;
+			break;
+		default:
+			return false;
+	}
+
+	/* First we need to know the column's opclass. */
+
+	tuple = SearchSysCache1(INDEXRELID, ObjectIdGetDatum(index_oid));
+	if (!HeapTupleIsValid(tuple))
+	{
+		*isnull = true;
+		return true;
+	}
+	rd_index = (Form_pg_index) GETSTRUCT(tuple);
+
+	/* caller is supposed to guarantee this */
+	Assert(attno > 0 && attno <= rd_index->indnatts);
+
+	datum = SysCacheGetAttr(INDEXRELID, tuple,
+							Anum_pg_index_indclass, &disnull);
+	Assert(!disnull);
+
+	indclass = ((oidvector *) DatumGetPointer(datum));
+	opclass = indclass->values[attno - 1];
+
+	ReleaseSysCache(tuple);
+
+	/* Now look up the opclass family and input datatype. */
+
+	tuple = SearchSysCache1(CLAOID, ObjectIdGetDatum(opclass));
+	if (!HeapTupleIsValid(tuple))
+	{
+		*isnull = true;
+		return true;
+	}
+	rd_opclass = (Form_pg_opclass) GETSTRUCT(tuple);
+
+	opfamily = rd_opclass->opcfamily;
+	opcintype = rd_opclass->opcintype;
+
+	ReleaseSysCache(tuple);
+
+	/* And now we can check whether the function is provided. */
+
+	*res = SearchSysCacheExists4(AMPROCNUM,
+								 ObjectIdGetDatum(opfamily),
+								 ObjectIdGetDatum(opcintype),
+								 ObjectIdGetDatum(opcintype),
+								 Int16GetDatum(procno));
+	return true;
+}
+
 /*
  * Fetch index's statistical data into *stats
  *
