mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
Add support for EUI-64 MAC addresses as macaddr8
This adds in support for EUI-64 MAC addresses by adding a new data type called 'macaddr8' (using our usual convention of indicating the number of bytes stored). This was largely a copy-and-paste from the macaddr data type, with appropriate adjustments for having 8 bytes instead of 6 and adding support for converting a provided EUI-48 (6 byte format) to the EUI-64 format. Conversion from EUI-48 to EUI-64 inserts FFFE as the 4th and 5th bytes but does not perform the IPv6 modified EUI-64 action of flipping the 7th bit, but we add a function to perform that specific action for the user as it may be commonly done by users who wish to calculate their IPv6 address based on their network prefix and 48-bit MAC address. Author: Haribabu Kommi, with a good bit of rework of macaddr8_in by me. Reviewed by: Vitaly Burovoy, Kuntal Ghosh Discussion: https://postgr.es/m/CAJrrPGcUi8ZH+KkK+=TctNQ+EfkeCEHtMU_yo1mvX8hsk_ghNQ@mail.gmail.com
This commit is contained in:
@ -4,12 +4,12 @@ MODULE_big = btree_gin
|
||||
OBJS = btree_gin.o $(WIN32RES)
|
||||
|
||||
EXTENSION = btree_gin
|
||||
DATA = btree_gin--1.0.sql btree_gin--unpackaged--1.0.sql
|
||||
DATA = btree_gin--1.0.sql btree_gin--1.0--1.1.sql btree_gin--unpackaged--1.0.sql
|
||||
PGFILEDESC = "btree_gin - B-tree equivalent GIN operator classes"
|
||||
|
||||
REGRESS = install_btree_gin int2 int4 int8 float4 float8 money oid \
|
||||
timestamp timestamptz time timetz date interval \
|
||||
macaddr inet cidr text varchar char bytea bit varbit \
|
||||
macaddr macaddr8 inet cidr text varchar char bytea bit varbit \
|
||||
numeric
|
||||
|
||||
ifdef USE_PGXS
|
||||
|
35
contrib/btree_gin/btree_gin--1.0--1.1.sql
Normal file
35
contrib/btree_gin/btree_gin--1.0--1.1.sql
Normal file
@ -0,0 +1,35 @@
|
||||
/* contrib/btree_gin/btree_gin--1.0--1.1.sql */
|
||||
|
||||
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
|
||||
\echo Use "ALTER EXTENSION btree_gin UPDATE TO '1.1'" to load this file. \quit
|
||||
|
||||
-- macaddr8 datatype support new in 10.0.
|
||||
CREATE FUNCTION gin_extract_value_macaddr8(macaddr8, internal)
|
||||
RETURNS internal
|
||||
AS 'MODULE_PATHNAME'
|
||||
LANGUAGE C STRICT IMMUTABLE;
|
||||
|
||||
CREATE FUNCTION gin_compare_prefix_macaddr8(macaddr8, macaddr8, int2, internal)
|
||||
RETURNS int4
|
||||
AS 'MODULE_PATHNAME'
|
||||
LANGUAGE C STRICT IMMUTABLE;
|
||||
|
||||
CREATE FUNCTION gin_extract_query_macaddr8(macaddr8, internal, int2, internal, internal)
|
||||
RETURNS internal
|
||||
AS 'MODULE_PATHNAME'
|
||||
LANGUAGE C STRICT IMMUTABLE;
|
||||
|
||||
CREATE OPERATOR CLASS macaddr8_ops
|
||||
DEFAULT FOR TYPE macaddr8 USING gin
|
||||
AS
|
||||
OPERATOR 1 <,
|
||||
OPERATOR 2 <=,
|
||||
OPERATOR 3 =,
|
||||
OPERATOR 4 >=,
|
||||
OPERATOR 5 >,
|
||||
FUNCTION 1 macaddr8_cmp(macaddr8, macaddr8),
|
||||
FUNCTION 2 gin_extract_value_macaddr8(macaddr8, internal),
|
||||
FUNCTION 3 gin_extract_query_macaddr8(macaddr8, internal, int2, internal, internal),
|
||||
FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal),
|
||||
FUNCTION 5 gin_compare_prefix_macaddr8(macaddr8, macaddr8, int2, internal),
|
||||
STORAGE macaddr8;
|
@ -322,6 +322,16 @@ leftmostvalue_macaddr(void)
|
||||
|
||||
GIN_SUPPORT(macaddr, false, leftmostvalue_macaddr, macaddr_cmp)
|
||||
|
||||
static Datum
|
||||
leftmostvalue_macaddr8(void)
|
||||
{
|
||||
macaddr8 *v = palloc0(sizeof(macaddr8));
|
||||
|
||||
return Macaddr8PGetDatum(v);
|
||||
}
|
||||
|
||||
GIN_SUPPORT(macaddr8, false, leftmostvalue_macaddr8, macaddr8_cmp)
|
||||
|
||||
static Datum
|
||||
leftmostvalue_inet(void)
|
||||
{
|
||||
|
@ -1,5 +1,5 @@
|
||||
# btree_gin extension
|
||||
comment = 'support for indexing common datatypes in GIN'
|
||||
default_version = '1.0'
|
||||
default_version = '1.1'
|
||||
module_pathname = '$libdir/btree_gin'
|
||||
relocatable = true
|
||||
|
51
contrib/btree_gin/expected/macaddr8.out
Normal file
51
contrib/btree_gin/expected/macaddr8.out
Normal file
@ -0,0 +1,51 @@
|
||||
set enable_seqscan=off;
|
||||
CREATE TABLE test_macaddr8 (
|
||||
i macaddr8
|
||||
);
|
||||
INSERT INTO test_macaddr8 VALUES
|
||||
( '22:00:5c:03:55:08:01:02' ),
|
||||
( '22:00:5c:04:55:08:01:02' ),
|
||||
( '22:00:5c:05:55:08:01:02' ),
|
||||
( '22:00:5c:08:55:08:01:02' ),
|
||||
( '22:00:5c:09:55:08:01:02' ),
|
||||
( '22:00:5c:10:55:08:01:02' )
|
||||
;
|
||||
CREATE INDEX idx_macaddr8 ON test_macaddr8 USING gin (i);
|
||||
SELECT * FROM test_macaddr8 WHERE i<'22:00:5c:08:55:08:01:02'::macaddr8 ORDER BY i;
|
||||
i
|
||||
-------------------------
|
||||
22:00:5c:03:55:08:01:02
|
||||
22:00:5c:04:55:08:01:02
|
||||
22:00:5c:05:55:08:01:02
|
||||
(3 rows)
|
||||
|
||||
SELECT * FROM test_macaddr8 WHERE i<='22:00:5c:08:55:08:01:02'::macaddr8 ORDER BY i;
|
||||
i
|
||||
-------------------------
|
||||
22:00:5c:03:55:08:01:02
|
||||
22:00:5c:04:55:08:01:02
|
||||
22:00:5c:05:55:08:01:02
|
||||
22:00:5c:08:55:08:01:02
|
||||
(4 rows)
|
||||
|
||||
SELECT * FROM test_macaddr8 WHERE i='22:00:5c:08:55:08:01:02'::macaddr8 ORDER BY i;
|
||||
i
|
||||
-------------------------
|
||||
22:00:5c:08:55:08:01:02
|
||||
(1 row)
|
||||
|
||||
SELECT * FROM test_macaddr8 WHERE i>='22:00:5c:08:55:08:01:02'::macaddr8 ORDER BY i;
|
||||
i
|
||||
-------------------------
|
||||
22:00:5c:08:55:08:01:02
|
||||
22:00:5c:09:55:08:01:02
|
||||
22:00:5c:10:55:08:01:02
|
||||
(3 rows)
|
||||
|
||||
SELECT * FROM test_macaddr8 WHERE i>'22:00:5c:08:55:08:01:02'::macaddr8 ORDER BY i;
|
||||
i
|
||||
-------------------------
|
||||
22:00:5c:09:55:08:01:02
|
||||
22:00:5c:10:55:08:01:02
|
||||
(2 rows)
|
||||
|
22
contrib/btree_gin/sql/macaddr8.sql
Normal file
22
contrib/btree_gin/sql/macaddr8.sql
Normal file
@ -0,0 +1,22 @@
|
||||
set enable_seqscan=off;
|
||||
|
||||
CREATE TABLE test_macaddr8 (
|
||||
i macaddr8
|
||||
);
|
||||
|
||||
INSERT INTO test_macaddr8 VALUES
|
||||
( '22:00:5c:03:55:08:01:02' ),
|
||||
( '22:00:5c:04:55:08:01:02' ),
|
||||
( '22:00:5c:05:55:08:01:02' ),
|
||||
( '22:00:5c:08:55:08:01:02' ),
|
||||
( '22:00:5c:09:55:08:01:02' ),
|
||||
( '22:00:5c:10:55:08:01:02' )
|
||||
;
|
||||
|
||||
CREATE INDEX idx_macaddr8 ON test_macaddr8 USING gin (i);
|
||||
|
||||
SELECT * FROM test_macaddr8 WHERE i<'22:00:5c:08:55:08:01:02'::macaddr8 ORDER BY i;
|
||||
SELECT * FROM test_macaddr8 WHERE i<='22:00:5c:08:55:08:01:02'::macaddr8 ORDER BY i;
|
||||
SELECT * FROM test_macaddr8 WHERE i='22:00:5c:08:55:08:01:02'::macaddr8 ORDER BY i;
|
||||
SELECT * FROM test_macaddr8 WHERE i>='22:00:5c:08:55:08:01:02'::macaddr8 ORDER BY i;
|
||||
SELECT * FROM test_macaddr8 WHERE i>'22:00:5c:08:55:08:01:02'::macaddr8 ORDER BY i;
|
Reference in New Issue
Block a user