🌐 AI搜索 & 代理 主页
Skip to content

Commit 43d5734

Browse files
df7cbmsdemlei
df7cb
authored and
msdemlei
committed
Rename smoc_round to smoc_degrade
1 parent 686e018 commit 43d5734

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

‎expected/moc.out‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -589,27 +589,27 @@ SELECT intersection(moc) FROM (VALUES ('0/1-4'::smoc), ('0/2-5'), (NULL)) sub(mo
589589
0/2-4
590590
(1 row)
591591

592-
SELECT smoc_round(6, '7/1,3,5,9');
593-
smoc_round
594-
------------
592+
SELECT smoc_degrade(6, '7/1,3,5,9');
593+
smoc_degrade
594+
--------------
595595
6/0-2
596596
(1 row)
597597

598-
SELECT smoc_round(5, '7/1,3,5,9');
599-
smoc_round
600-
------------
598+
SELECT smoc_degrade(5, '7/1,3,5,9');
599+
smoc_degrade
600+
--------------
601601
5/0
602602
(1 row)
603603

604-
SELECT smoc_round(0, '1/0');
605-
smoc_round
606-
------------
604+
SELECT smoc_degrade(0, '1/0');
605+
smoc_degrade
606+
--------------
607607
0/0
608608
(1 row)
609609

610-
SELECT smoc_round(0, '1/47');
611-
smoc_round
612-
------------
610+
SELECT smoc_degrade(0, '1/47');
611+
smoc_degrade
612+
--------------
613613
0/11
614614
(1 row)
615615

‎expected/moc1.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
112112
Buffers: shared hit=3
113113
(3 rows)
114114

115-
SELECT smoc_round(4, coverage) FROM moc1;
116-
smoc_round
115+
SELECT smoc_degrade(4, coverage) FROM moc1;
116+
smoc_degrade
117117
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
118118
0/3 8-9 1/2-3 5 7 9 11 20 29 31 40 42 44-45 2/5-7 25-27 32-33 35 41-43 64-66 68-69 74-75 77-79 84-86 89-92 96-97 101 103-104 106 109-111 115 121-123 164-166 172 184-186 188 3/0-1 10-11 13-15 17-19 64 66 69 71 77-79 97-99 136-137 139 161-163 268-270 280 295 306-307 348-350 353-355 372 376 383 393-396 398 409 411 420 422 433 435 448 455 459 481-483 668-670 696 701 703 748-750 756-757 766-767 4/8-10 12 16-18 30-31 38-39 49-51 67 260 262 268 281 283 288 290 301 303 305-307 387 552-553 555 640 642-643 1084-1085 1124-1126 1136-1137 1150-1153 1166-1167 1177-1179 1218-1219 1221-1223 1404-1406 1408-1409 1411 1492 1496 1508 1512 1525-1527 1529-1531 1568 1570-1571 1588 1590 1596 1598 1600 1602 1613 1615 1712 1714 1725 1727 1729 1731 1737-1739 1796-1798 1800-1802 1815 1819 1824 1831 1835 1921-1923 2768-2770 2781-2783 2788 2792 2794-2795 2803 2809 2811 3004 3032 3040-3042 3054-3055 3059 3062-3063
119119
(1 row)

‎moc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ PG_FUNCTION_INFO_V1(smoc_superset_spoint);
3434
PG_FUNCTION_INFO_V1(smoc_not_superset_spoint);
3535
PG_FUNCTION_INFO_V1(smoc_union);
3636
PG_FUNCTION_INFO_V1(smoc_intersection);
37-
PG_FUNCTION_INFO_V1(smoc_round);
37+
PG_FUNCTION_INFO_V1(smoc_degrade);
3838
PG_FUNCTION_INFO_V1(smoc_disc);
3939
PG_FUNCTION_INFO_V1(smoc_scircle);
4040
PG_FUNCTION_INFO_V1(smoc_spoly);
@@ -930,7 +930,7 @@ smoc_intersection(PG_FUNCTION_ARGS)
930930
}
931931

932932
Datum
933-
smoc_round(PG_FUNCTION_ARGS)
933+
smoc_degrade(PG_FUNCTION_ARGS)
934934
{
935935
int order = PG_GETARG_INT32(0);
936936
Smoc* moc_a = (Smoc *) PG_DETOAST_DATUM(PG_GETARG_DATUM(1));

‎pgs_moc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Datum spoint_not_subset_smoc_c(SPoint*, Datum);
8585

8686
Datum smoc_union(PG_FUNCTION_ARGS);
8787
Datum smoc_intersection(PG_FUNCTION_ARGS);
88-
Datum smoc_round(PG_FUNCTION_ARGS);
88+
Datum smoc_degrade(PG_FUNCTION_ARGS);
8989
Datum smoc_disc(PG_FUNCTION_ARGS);
9090
Datum smoc_scircle(PG_FUNCTION_ARGS);
9191
Datum smoc_spoly(PG_FUNCTION_ARGS);

‎pgs_moc_ops.sql.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,15 +248,15 @@ COMMENT ON AGGREGATE intersection (smoc) IS 'smoc intersection aggregate';
248248

249249
-- smoc constructors
250250

251-
CREATE FUNCTION smoc_round ("order" int, smoc)
251+
CREATE FUNCTION smoc_degrade ("order" int, smoc)
252252
RETURNS smoc
253253
AS 'MODULE_PATHNAME'
254254
LANGUAGE C
255255
PARALLEL SAFE
256256
IMMUTABLE
257257
STRICT;
258258

259-
COMMENT ON FUNCTION smoc_round ("order" int, smoc) IS 'reduce order of smoc';
259+
COMMENT ON FUNCTION smoc_degrade ("order" int, smoc) IS 'reduce order of smoc';
260260

261261
CREATE FUNCTION smoc_disc ("order" int, lng double precision, lat double precision, radius double precision)
262262
RETURNS smoc

‎sql/moc.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ SELECT '0/1'::smoc & '1/3,5,7,9' AS intersection;
133133
SELECT '1/9,11,13,15'::smoc & '0/1,2' AS intersection;
134134
SELECT intersection(moc) FROM (VALUES ('0/1-4'::smoc), ('0/2-5'), (NULL)) sub(moc);
135135

136-
SELECT smoc_round(6, '7/1,3,5,9');
137-
SELECT smoc_round(5, '7/1,3,5,9');
138-
SELECT smoc_round(0, '1/0');
139-
SELECT smoc_round(0, '1/47');
136+
SELECT smoc_degrade(6, '7/1,3,5,9');
137+
SELECT smoc_degrade(5, '7/1,3,5,9');
138+
SELECT smoc_degrade(0, '1/0');
139+
SELECT smoc_degrade(0, '1/47');
140140

141141
WITH mocs(x) AS (VALUES ('0/'::smoc), ('0/1'), ('0/2'), ('0/4'), ('0/1,3'), ('0/1-3'), ('0/2-4'))
142142
SELECT a.x AS a, b.x AS b,

‎sql/moc1.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
3737
EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
3838
SELECT coverage FROM moc1 WHERE coverage <@ '0/0-11';
3939

40-
SELECT smoc_round(4, coverage) FROM moc1;
40+
SELECT smoc_degrade(4, coverage) FROM moc1;

0 commit comments

Comments
 (0)