Add a second gin opclass smoc_gin_ops_fine using level 8

df7cb · msdemlei · commit 403da2c61d6c · 2021-04-22T14:01:36.000+02:00
diff --git a/moc.c b/moc.c
@@ -40,7 +40,9 @@ PG_FUNCTION_INFO_V1(smoc_scircle);
 PG_FUNCTION_INFO_V1(smoc_spoly);
 
 PG_FUNCTION_INFO_V1(smoc_gin_extract_value);
+PG_FUNCTION_INFO_V1(smoc_gin_extract_value_fine);
 PG_FUNCTION_INFO_V1(smoc_gin_extract_query);
+PG_FUNCTION_INFO_V1(smoc_gin_extract_query_fine);
 PG_FUNCTION_INFO_V1(smoc_gin_consistent);
 
 int32 smoc_output_type = 0;
@@ -1048,7 +1050,7 @@ smoc_gin_extract_internal(Smoc *moc_a, int32 *nkeys, int gin_order)
 			if (*nkeys >= nalloc)
 			{
 				nalloc *= 2;
-				Assert(nalloc < 1000000);
+				Assert(nalloc < 2000000);
 				keys = repalloc(keys, nalloc * sizeof(Datum));
 			}
 			keys[(*nkeys)++] = Int32GetDatum(p);
@@ -1067,6 +1069,15 @@ smoc_gin_extract_value(PG_FUNCTION_ARGS)
 	PG_RETURN_DATUM(smoc_gin_extract_internal(moc_a, nkeys, MOC_GIN_ORDER));
 }
 
+Datum
+smoc_gin_extract_value_fine(PG_FUNCTION_ARGS)
+{
+	Smoc*	moc_a = (Smoc *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
+	int32*	nkeys = (int32 *) PG_GETARG_POINTER(1);
+
+	PG_RETURN_DATUM(smoc_gin_extract_internal(moc_a, nkeys, MOC_GIN_ORDER_FINE));
+}
+
 Datum
 smoc_gin_extract_query(PG_FUNCTION_ARGS)
 {
@@ -1081,6 +1092,20 @@ smoc_gin_extract_query(PG_FUNCTION_ARGS)
 	PG_RETURN_DATUM(smoc_gin_extract_internal(moc_a, nkeys, MOC_GIN_ORDER));
 }
 
+Datum
+smoc_gin_extract_query_fine(PG_FUNCTION_ARGS)
+{
+	Smoc*	moc_a = (Smoc *) PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
+	int32*	nkeys = (int32 *) PG_GETARG_POINTER(1);
+	StrategyNumber st = PG_GETARG_UINT16(2);
+	int32*	searchmode = (int32 *) PG_GETARG_POINTER(6);
+
+	if (st == MOC_GIN_STRATEGY_SUBSET)
+		*searchmode = GIN_SEARCH_MODE_INCLUDE_EMPTY;
+
+	PG_RETURN_DATUM(smoc_gin_extract_internal(moc_a, nkeys, MOC_GIN_ORDER_FINE));
+}
+
 Datum
 smoc_gin_consistent(PG_FUNCTION_ARGS)
 {
diff --git a/pgs_moc.h b/pgs_moc.h
@@ -91,7 +91,9 @@ Datum smoc_scircle(PG_FUNCTION_ARGS);
 Datum smoc_spoly(PG_FUNCTION_ARGS);
 
 Datum smoc_gin_extract_value(PG_FUNCTION_ARGS);
+Datum smoc_gin_extract_value_fine(PG_FUNCTION_ARGS);
 Datum smoc_gin_extract_query(PG_FUNCTION_ARGS);
+Datum smoc_gin_extract_query_fine(PG_FUNCTION_ARGS);
 Datum smoc_gin_consistent(PG_FUNCTION_ARGS);
 
 /* parsing subroutines */
@@ -116,6 +118,7 @@ next_interval(int32 a)
 #define MOC_AREA_ALL_SKY 3458764513820540928
 
 #define MOC_GIN_ORDER 5 /* order 5 has 12 * 4^5 = 12288 pixels */
+#define MOC_GIN_ORDER_FINE 8 /* order 8 has 12 * 4^8 = 786432 pixels */
 #define MOC_GIN_STRATEGY_INTERSECTS	1
 #define MOC_GIN_STRATEGY_SUBSET		2
 #define MOC_GIN_STRATEGY_SUPERSET	3
diff --git a/pgs_moc_ops.sql.in b/pgs_moc_ops.sql.in
@@ -299,6 +299,14 @@ CREATE FUNCTION smoc_gin_extract_value (smoc, internal, internal)
 	IMMUTABLE
 	STRICT;
 
+CREATE FUNCTION smoc_gin_extract_value_fine (smoc, internal, internal)
+	RETURNS internal
+	AS 'MODULE_PATHNAME'
+	LANGUAGE C
+	PARALLEL SAFE
+	IMMUTABLE
+	STRICT;
+
 CREATE FUNCTION smoc_gin_extract_query (smoc, internal, int2, internal, internal, internal, internal)
 	RETURNS internal
 	AS 'MODULE_PATHNAME'
@@ -307,6 +315,14 @@ CREATE FUNCTION smoc_gin_extract_query (smoc, internal, int2, internal, internal
 	IMMUTABLE
 	STRICT;
 
+CREATE FUNCTION smoc_gin_extract_query_fine (smoc, internal, int2, internal, internal, internal, internal)
+	RETURNS internal
+	AS 'MODULE_PATHNAME'
+	LANGUAGE C
+	PARALLEL SAFE
+	IMMUTABLE
+	STRICT;
+
 CREATE FUNCTION smoc_gin_consistent (internal, int2, smoc, int4, internal, internal, internal, internal)
 	RETURNS boolean
 	AS 'MODULE_PATHNAME'
@@ -327,3 +343,16 @@ CREATE OPERATOR CLASS smoc_gin_ops
 		--FUNCTION 5 smoc_gin_compare_partial (),
 		--FUNCTION 6 smoc_gin_tri_consistent (),
 		STORAGE int4;
+
+CREATE OPERATOR CLASS smoc_gin_ops_fine
+	FOR TYPE smoc USING gin AS
+		OPERATOR 1 &&,
+		OPERATOR 2 <@,
+		OPERATOR 3 @>,
+		FUNCTION 1 btint4cmp (int4, int4),
+		FUNCTION 2 smoc_gin_extract_value_fine (smoc, internal, internal),
+		FUNCTION 3 smoc_gin_extract_query_fine (smoc, internal, int2, internal, internal, internal, internal),
+		FUNCTION 4 smoc_gin_consistent (internal, int2, smoc, int4, internal, internal, internal, internal),
+		--FUNCTION 5 smoc_gin_compare_partial (),
+		--FUNCTION 6 smoc_gin_tri_consistent (),
+		STORAGE int4;
