Skip to content

Commit 5361ee6

Browse files
author
Vladlen Popolitov
committed
PGPRO-9410 New GIN interface added to CREATE OPERATOR CLASS
1 parent 7bfb490 commit 5361ee6

File tree

2 files changed

+31
-34
lines changed

2 files changed

+31
-34
lines changed

‎anyarray--1.0.sql‎

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,7 @@ AS
590590
FUNCTION 2 ginanyarray_extract(anyarray, internal),
591591
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
592592
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
593+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
593594
STORAGE int2;
594595
CREATE OPERATOR CLASS _int4_aa_ops
595596
FOR TYPE _int4 USING gin
@@ -603,40 +604,11 @@ AS
603604
FUNCTION 2 ginanyarray_extract(anyarray, internal),
604605
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
605606
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
607+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
606608
STORAGE int4;
607609

608610
CREATE OPERATOR CLASS _int8_aa_ops
609611
FOR TYPE _int8 USING gin
610-
AS
611-
OPERATOR 3 && (anyarray, anyarray),
612-
OPERATOR 6 = (anyarray, anyarray),
613-
OPERATOR 7 @> (anyarray, anyarray),
614-
OPERATOR 8 <@ (anyarray, anyarray),
615-
OPERATOR 16 % (anyarray, anyarray),
616-
FUNCTION 1 btint8cmp(int8,int8),
617-
FUNCTION 2 ginanyarray_extract(anyarray, internal),
618-
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
619-
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
620-
--FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
621-
STORAGE int8;
622-
623-
CREATE OPERATOR CLASS _int8_aa_ops_beta
624-
FOR TYPE _int8 USING gin
625-
AS
626-
OPERATOR 3 && (anyarray, anyarray),
627-
OPERATOR 6 = (anyarray, anyarray),
628-
OPERATOR 7 @> (anyarray, anyarray),
629-
OPERATOR 8 <@ (anyarray, anyarray),
630-
OPERATOR 16 % (anyarray, anyarray),
631-
FUNCTION 1 btint8cmp(int8,int8),
632-
FUNCTION 2 ginanyarray_extract(anyarray, internal),
633-
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
634-
-- FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
635-
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
636-
STORAGE int8;
637-
638-
CREATE OPERATOR CLASS _int8_aa_ops_beta2
639-
FOR TYPE _int8 USING gin
640612
AS
641613
OPERATOR 3 && (anyarray, anyarray),
642614
OPERATOR 6 = (anyarray, anyarray),
@@ -662,6 +634,7 @@ AS
662634
FUNCTION 2 ginanyarray_extract(anyarray, internal),
663635
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
664636
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
637+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
665638
STORAGE float4;
666639

667640
CREATE OPERATOR CLASS _float8_aa_ops
@@ -676,6 +649,7 @@ AS
676649
FUNCTION 2 ginanyarray_extract(anyarray, internal),
677650
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
678651
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
652+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
679653
STORAGE float8;
680654

681655
CREATE OPERATOR CLASS _money_aa_ops
@@ -690,6 +664,7 @@ AS
690664
FUNCTION 2 ginanyarray_extract(anyarray, internal),
691665
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
692666
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
667+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
693668
STORAGE money;
694669

695670
CREATE OPERATOR CLASS _oid_aa_ops
@@ -704,6 +679,7 @@ AS
704679
FUNCTION 2 ginanyarray_extract(anyarray, internal),
705680
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
706681
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
682+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
707683
STORAGE oid;
708684

709685
CREATE OPERATOR CLASS _timestamp_aa_ops
@@ -718,6 +694,7 @@ AS
718694
FUNCTION 2 ginanyarray_extract(anyarray, internal),
719695
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
720696
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
697+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
721698
STORAGE timestamp;
722699

723700
CREATE OPERATOR CLASS _timestamptz_aa_ops
@@ -732,6 +709,7 @@ AS
732709
FUNCTION 2 ginanyarray_extract(anyarray, internal),
733710
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
734711
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
712+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
735713
STORAGE timestamptz;
736714

737715
CREATE OPERATOR CLASS _time_aa_ops
@@ -746,6 +724,7 @@ AS
746724
FUNCTION 2 ginanyarray_extract(anyarray, internal),
747725
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
748726
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
727+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
749728
STORAGE time;
750729

751730
CREATE OPERATOR CLASS _timetz_aa_ops
@@ -760,6 +739,7 @@ AS
760739
FUNCTION 2 ginanyarray_extract(anyarray, internal),
761740
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
762741
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
742+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
763743
STORAGE timetz;
764744

765745
CREATE OPERATOR CLASS _date_aa_ops
@@ -774,6 +754,7 @@ AS
774754
FUNCTION 2 ginanyarray_extract(anyarray, internal),
775755
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
776756
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
757+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
777758
STORAGE date;
778759

779760
CREATE OPERATOR CLASS _interval_aa_ops
@@ -788,6 +769,7 @@ AS
788769
FUNCTION 2 ginanyarray_extract(anyarray, internal),
789770
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
790771
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
772+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
791773
STORAGE interval;
792774

793775
CREATE OPERATOR CLASS _macaddr_aa_ops
@@ -802,6 +784,7 @@ AS
802784
FUNCTION 2 ginanyarray_extract(anyarray, internal),
803785
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
804786
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
787+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
805788
STORAGE macaddr;
806789

807790
CREATE OPERATOR CLASS _inet_aa_ops
@@ -816,6 +799,7 @@ AS
816799
FUNCTION 2 ginanyarray_extract(anyarray, internal),
817800
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
818801
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
802+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
819803
STORAGE inet;
820804

821805
CREATE OPERATOR CLASS _cidr_aa_ops
@@ -830,6 +814,7 @@ AS
830814
FUNCTION 2 ginanyarray_extract(anyarray, internal),
831815
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
832816
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
817+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
833818
STORAGE cidr;
834819

835820
CREATE OPERATOR CLASS _text_aa_ops
@@ -844,6 +829,7 @@ AS
844829
FUNCTION 2 ginanyarray_extract(anyarray, internal),
845830
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
846831
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
832+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
847833
STORAGE text;
848834

849835
CREATE OPERATOR CLASS _varchar_aa_ops
@@ -858,6 +844,7 @@ AS
858844
FUNCTION 2 ginanyarray_extract(anyarray, internal),
859845
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
860846
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
847+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
861848
STORAGE varchar;
862849

863850
CREATE OPERATOR CLASS _char_aa_ops
@@ -872,6 +859,7 @@ AS
872859
FUNCTION 2 ginanyarray_extract(anyarray, internal),
873860
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
874861
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
862+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
875863
STORAGE "char";
876864

877865
CREATE OPERATOR CLASS _bytea_aa_ops
@@ -886,6 +874,7 @@ AS
886874
FUNCTION 2 ginanyarray_extract(anyarray, internal),
887875
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
888876
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
877+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
889878
STORAGE bytea;
890879

891880
CREATE OPERATOR CLASS _bit_aa_ops
@@ -900,6 +889,7 @@ AS
900889
FUNCTION 2 ginanyarray_extract(anyarray, internal),
901890
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
902891
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
892+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
903893
STORAGE bit;
904894

905895
CREATE OPERATOR CLASS _varbit_aa_ops
@@ -914,6 +904,7 @@ AS
914904
FUNCTION 2 ginanyarray_extract(anyarray, internal),
915905
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
916906
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
907+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
917908
STORAGE varbit;
918909

919910
CREATE OPERATOR CLASS _numeric_aa_ops
@@ -928,5 +919,5 @@ AS
928919
FUNCTION 2 ginanyarray_extract(anyarray, internal),
929920
FUNCTION 3 ginanyarray_queryextract(anyarray, internal, internal),
930921
FUNCTION 4 ginanyarray_consistent(internal, internal, anyarray),
922+
FUNCTION 6 ginanyarray_triconsistent(internal, internal, anyarray,internal,internal,internal,internal,internal),
931923
STORAGE numeric;
932-

‎anyarray_gin.c‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,22 +299,28 @@ ginanyarray_triconsistent(PG_FUNCTION_ARGS)
299299
}
300300
break;
301301
case AA_Overlap:
302-
/* if nIntersection >= SmlLimit, so result = GIN_TRUE
302+
/* nIntersectionMin - quantity of GIN_TRUE in check array
303+
* nIntersectionMax - quantity of GIN_TRUE and GIN_MAYBE in check array
304+
* if nIntersectionMin >= SmlLimit, so result = GIN_TRUE
305+
* if nIntersectionMax < SmlLimit, so result = GIN_FALSE
303306
* otherwise if at least one element in check[] is GIN_MAYBE, so result = GIN_MAYBE
304307
* otherwise result = GIN_FALSE
305308
*/
306309
if(((double)nIntersectionMin) >= SmlLimit)
307310
{
308311
res = GIN_TRUE;
309-
}
312+
} else if(((double)nIntersectionMax) < SmlLimit)
313+
{
314+
res = GIN_FALSE;
315+
}
310316
break;
311317
default:
312318
elog(ERROR, "unknown similarity type");
313319
}
314320
}
315321
break;
316322
default:
317-
elog(ERROR, "ginanyarray_consistent: unknown strategy number: %d",
323+
elog(ERROR, "ginanyarray_triconsistent: unknown strategy number: %d",
318324
strategy);
319325
}
320326
PG_RETURN_GIN_TERNARY_VALUE(res);

0 commit comments

Comments
 (0)