sum() and intersection() aggregates

df7cb · msdemlei · commit 62e9cb89f455 · 2021-04-22T14:01:36.000+02:00
diff --git a/expected/moc.out b/expected/moc.out
@@ -505,6 +505,12 @@ SELECT '1/1'::smoc || '1/2' AS union;
  1/1-2
 (1 row)
 
+SELECT sum(moc) FROM (VALUES ('0/1'::smoc), ('0/2'), ('0/4')) sub(moc);
+   sum   
+---------
+ 0/1-2,4
+(1 row)
+
 SELECT smoc_intersection('1/1,4-6', '1/3-5 2/8');
  smoc_intersection 
 -------------------
@@ -523,3 +529,9 @@ SELECT '1/9,11,13,15'::smoc * '0/1,2' AS intersection;
  1/9,11
 (1 row)
 
+SELECT intersection(moc) FROM (VALUES ('0/1-4'::smoc), ('0/2-5'), (NULL)) sub(moc);
+ intersection 
+--------------
+ 0/2-4
+(1 row)
+
diff --git a/pgs_moc_ops.sql.in b/pgs_moc_ops.sql.in
@@ -4,20 +4,30 @@ CREATE FUNCTION smoc_union (smoc, smoc)
 	LANGUAGE C
 	STRICT;
 
-CREATE FUNCTION smoc_intersection (smoc, smoc)
-	RETURNS smoc
-	AS 'MODULE_PATHNAME'
-	LANGUAGE C
-	STRICT;
-
 CREATE OPERATOR || (
 	LEFTARG   = smoc,
 	RIGHTARG  = smoc,
 	PROCEDURE = smoc_union
 );
 
+CREATE AGGREGATE sum (smoc) (
+	SFUNC = smoc_union,
+	STYPE = smoc
+);
+
+CREATE FUNCTION smoc_intersection (smoc, smoc)
+	RETURNS smoc
+	AS 'MODULE_PATHNAME'
+	LANGUAGE C
+	STRICT;
+
 CREATE OPERATOR * (
 	LEFTARG   = smoc,
 	RIGHTARG  = smoc,
 	PROCEDURE = smoc_intersection
 );
+
+CREATE AGGREGATE intersection (smoc) (
+	SFUNC = smoc_intersection,
+	STYPE = smoc
+);
diff --git a/sql/moc.sql b/sql/moc.sql
@@ -113,7 +113,9 @@ SELECT smoc('28/1101-1103');
 
 SELECT smoc_union('1/1,4-6', '1/3-5 2/8');
 SELECT '1/1'::smoc || '1/2' AS union;
+SELECT sum(moc) FROM (VALUES ('0/1'::smoc), ('0/2'), ('0/4')) sub(moc);
 
 SELECT smoc_intersection('1/1,4-6', '1/3-5 2/8');
 SELECT '0/1'::smoc * '1/3,5,7,9' AS intersection;
 SELECT '1/9,11,13,15'::smoc * '0/1,2' AS intersection;
+SELECT intersection(moc) FROM (VALUES ('0/1-4'::smoc), ('0/2-5'), (NULL)) sub(moc);
