Add INET/CIDR operators: and, or, not, plus int8, minus int8, and inet

minus inet.

Stephen R. van den Berg

2 files changed, 140 insertions, 0 deletions

diff --git a/src/test/regress/expected/inet.out b/src/test/regress/expected/inet.out
index ddcdbba4566..6c96f7d71b3 100644
--- a/src/test/regress/expected/inet.out
+++ b/src/test/regress/expected/inet.out
@@ -240,5 +240,137 @@ SELECT * FROM inet_tbl WHERE i<<='192.168.1.0/24'::cidr;
  192.168.1.0/26 | 192.168.1.226
 (6 rows)
 
+SELECT ~i FROM inet_tbl;
+                  ?column?                  
+--------------------------------------------
+ 63.87.254.29/24
+ 63.87.254.29
+ 63.87.254.255/24
+ 63.87.254.255/25
+ 63.87.254.0/24
+ 63.87.254.0/25
+ 245.254.253.252/8
+ 245.254.253.252/8
+ 245.254.253.252
+ 245.254.253.252/24
+ 245.254.253.252/16
+ 245.254.253.252/8
+ 244.254.253.252/8
+ 246.254.253.252/8
+ ffef:ffdc:ffff:ffff:ffff:ffff:ffff:ff0e/64
+ ffef:ffdc:ffff:ffff:ffff:ffff:ffff:0
+ ffff:ffff:ffff:ffff:ffff:ffff:fbfc:fdfe/24
+(17 rows)
+
+SELECT i & c FROM inet_tbl;
+    ?column?    
+----------------
+ 192.168.1.0/24
+ 192.168.1.0
+ 192.168.1.0/24
+ 192.168.1.0/25
+ 192.168.1.0/24
+ 192.168.1.0/25
+ 10.0.0.0/8
+ 10.0.0.0
+ 10.1.2.3
+ 10.1.2.0/24
+ 10.1.0.0/16
+ 10.0.0.0/8
+ 10.0.0.0/8
+ 8.0.0.0/8
+ 10:23::f1
+ 10:23::8000
+ ::0.2.2.0
+(17 rows)
+
+SELECT i | c FROM inet_tbl;
+     ?column?     
+------------------
+ 192.168.1.226/24
+ 192.168.1.226
+ 192.168.1.0/24
+ 192.168.1.0/25
+ 192.168.1.255/24
+ 192.168.1.255/25
+ 10.1.2.3/8
+ 10.1.2.3
+ 10.1.2.3
+ 10.1.2.3/24
+ 10.1.2.3/16
+ 10.1.2.3/8
+ 11.1.2.3/8
+ 11.1.2.3/8
+ 10:23::f1
+ 10:23::ffff
+ ::ffff:5.3.3.5
+(17 rows)
+
+SELECT i + 500 FROM inet_tbl;
+     ?column?      
+------------------
+ 192.168.4.214/24
+ 192.168.4.214   
+ 192.168.3.244/24
+ 192.168.3.244/25
+ 192.168.4.243/24
+ 192.168.4.243/25
+ 10.1.4.247/8    
+ 10.1.4.247/8    
+ 10.1.4.247      
+ 10.1.4.247/24   
+ 10.1.4.247/16   
+ 10.1.4.247/8    
+ 11.1.4.247/8    
+ 9.1.4.247/8     
+ 10:23::3e5/64   
+ 10:23::1:2f3    
+ ::4.3.4.245/24  
+(17 rows)
+
+SELECT i - 500 FROM inet_tbl;
+                ?column?                
+--------------------
+ 192.168.255.238/24
+ 192.168.255.238   
+ 192.168.255.12/24 
+ 192.168.255.12/25 
+ 192.168.0.11/24   
+ 192.168.0.11/25   
+ 10.1.0.15/8       
+ 10.1.0.15/8       
+ 10.1.0.15         
+ 10.1.0.15/24      
+ 10.1.0.15/16      
+ 10.1.0.15/8       
+ 11.1.0.15/8       
+ 9.1.0.15/8        
+ 10:23::fefd/64    
+ 10:23::fe0b       
+ ::4.3.0.13/24     
+(17 rows)
+
+SELECT i - c FROM inet_tbl;
+ ?column?  
+------------------
+       226
+       226
+         0
+         0
+       255
+       255
+     66051
+     66051
+         0
+         3
+       515
+     66051
+  16843267
+ -16711165
+                0
+            32767
+ -281470631346435
+(17 rows)
+
 SET enable_seqscan TO on;
 DROP INDEX inet_idx1;
diff --git a/src/test/regress/sql/inet.sql b/src/test/regress/sql/inet.sql
index 46a49006cf5..f44caf5006b 100644
--- a/src/test/regress/sql/inet.sql
+++ b/src/test/regress/sql/inet.sql
@@ -62,6 +62,14 @@ CREATE INDEX inet_idx1 ON inet_tbl(i);
 SET enable_seqscan TO off;
 SELECT * FROM inet_tbl WHERE i<<'192.168.1.0/24'::cidr;
 SELECT * FROM inet_tbl WHERE i<<='192.168.1.0/24'::cidr;
+
+SELECT ~i FROM inet_tbl;
+SELECT i & c FROM inet_tbl;
+SELECT i | c FROM inet_tbl;
+SELECT i + 500 FROM inet_tbl;
+SELECT i - 500 FROM inet_tbl;
+SELECT i - c FROM inet_tbl;
+
 SET enable_seqscan TO on;
 DROP INDEX inet_idx1;