refactoring, more tests, disable anyarray_ops for <= PG 9.6

funbringer · funbringer · commit 463dbfdc17cb · 2017-10-17T17:51:24.000+03:00
diff --git a/expected/array.out b/expected/array.out
@@ -8,6 +8,50 @@ CREATE TABLE test_array (
 );
 INSERT INTO test_array VALUES ('{}'), ('{0}'), ('{1,2,3,4}'), ('{1,2,3}'), ('{1,2}'), ('{1}');
 CREATE INDEX idx_array ON test_array USING rum (i rum_anyarray_ops);
+SELECT NULL::int[] = '{1}';
+ ?column? 
+----------
+ 
+(1 row)
+
+SELECT NULL::int[] && '{1}';
+ ?column? 
+----------
+ 
+(1 row)
+
+SELECT NULL::int[] @> '{1}';
+ ?column? 
+----------
+ 
+(1 row)
+
+SELECT NULL::int[] <@ '{1}';
+ ?column? 
+----------
+ 
+(1 row)
+
+SELECT NULL::int[] % '{1}';
+ ?column? 
+----------
+ 
+(1 row)
+
+SELECT NULL::int[] <=> '{1}';
+ ?column? 
+----------
+         
+(1 row)
+
+INSERT INTO test_array VALUES (NULL);
+SELECT * FROM test_array WHERE i = '{1}';
+  i  
+-----
+ {1}
+(1 row)
+
+DELETE FROM test_array WHERE i IS NULL;
 SELECT * FROM test_array WHERE i = '{NULL}';
 ERROR:  array must not contain nulls
 SELECT * FROM test_array WHERE i = '{1,2,3,NULL}';
diff --git a/sql/array.sql b/sql/array.sql
@@ -13,6 +13,18 @@ INSERT INTO test_array VALUES ('{}'), ('{0}'), ('{1,2,3,4}'), ('{1,2,3}'), ('{1,
 
 CREATE INDEX idx_array ON test_array USING rum (i rum_anyarray_ops);
 
+
+SELECT NULL::int[] = '{1}';
+SELECT NULL::int[] && '{1}';
+SELECT NULL::int[] @> '{1}';
+SELECT NULL::int[] <@ '{1}';
+SELECT NULL::int[] % '{1}';
+SELECT NULL::int[] <=> '{1}';
+
+INSERT INTO test_array VALUES (NULL);
+SELECT * FROM test_array WHERE i = '{1}';
+DELETE FROM test_array WHERE i IS NULL;
+
 SELECT * FROM test_array WHERE i = '{NULL}';
 SELECT * FROM test_array WHERE i = '{1,2,3,NULL}';
 SELECT * FROM test_array WHERE i = '{{1,2},{3,4}}';
diff --git a/src/rum_arr_utils.c b/src/rum_arr_utils.c
@@ -60,7 +60,7 @@
 		} \
 	} while (0)
 
-#define InitDummySimpleArray(s, len) \
+#define INIT_DUMMY_SIMPLE_ARRAY(s, len) \
 	do { \
 		(s)->elems = NULL; \
 		(s)->hashedElems = NULL; \
@@ -388,8 +388,8 @@ rum_anyarray_consistent(PG_FUNCTION_ARGS)
 					/* there must be addInfo */
 					Assert(nentries >= 0);
 
-					InitDummySimpleArray(&sa, nentries);
-					InitDummySimpleArray(&sb, nkeys);
+					INIT_DUMMY_SIMPLE_ARRAY(&sa, nentries);
+					INIT_DUMMY_SIMPLE_ARRAY(&sb, nkeys);
 					res = getSimilarity(&sa, &sb, intersection) >= SmlLimit;
 				}
 				else
@@ -444,8 +444,8 @@ rum_anyarray_ordering(PG_FUNCTION_ARGS)
 		/* there must be addInfo */
 		Assert(nentries >= 0);
 
-		InitDummySimpleArray(&sa, nentries);
-		InitDummySimpleArray(&sb, nkeys);
+		INIT_DUMMY_SIMPLE_ARRAY(&sa, nentries);
+		INIT_DUMMY_SIMPLE_ARRAY(&sb, nkeys);
 		sml = getSimilarity(&sa, &sb, intersection);
 
 		PG_RETURN_FLOAT8(DIST_FROM_SML(sml));
diff --git a/src/rumutil.c b/src/rumutil.c
@@ -253,6 +253,11 @@ initRumState(RumState * state, Relation index)
 		 */
 		if (index_getprocid(index, i + 1, GIN_COMPARE_PROC) != InvalidOid)
 		{
+#if PG_VERSION_NUM < 100000
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("array indexing is only available on PostgreSQL 10+")));
+#endif
 			fmgr_info_copy(&(state->compareFn[i]),
 						   index_getprocinfo(index, i + 1, GIN_COMPARE_PROC),
 						   CurrentMemoryContext);
