Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit25dd07e

Browse files
committed
Fix uuid-ossp regression tests based on buildfarm feedback.
The previous version of these tests expected uuid_generate_v1() to alwaysemit MAC addresses with the local-admin and multicast address bits zero.However, several of the buildfarm critters are reporting values with thelocal-admin bit set. (Perhaps they're running inside VMs or jails.)And a couple are reporting values with the multicast bit set, probablymeaning that the UUID library couldn't read the system MAC address.Also, it emerges that if OSSP UUID can't read the system MAC address, itfalls back to V1MC behavior wherein the whole node field gets randomizedeach time, breaking the test that expected the node field to remain stablein V1 output. (It looks like e2fs doesn't behave that way, though.)It's not entirely clear why we can't get a system MAC address, since thebuildfarm scripts would not work without internet access. Nonetheless,the regression tests had better cope with the case, so adjust the teststo expect these behaviors.
1 parent71ed8b3 commit25dd07e

File tree

2 files changed

+56
-22
lines changed

2 files changed

+56
-22
lines changed

‎contrib/uuid-ossp/expected/uuid_ossp.out

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,35 @@ LANGUAGE SQL STRICT IMMUTABLE;
4242
CREATE FUNCTION uuid_reserved_bits(uuid) RETURNS varbit AS
4343
$$ SELECT ('x' || substr($1::text, 20, 2))::bit(8) & '11000000' $$
4444
LANGUAGE SQL STRICT IMMUTABLE;
45-
CREATE FUNCTION uuid_multicast_bits(uuid) RETURNS varbit AS
46-
$$ SELECT ('x' || substr($1::text, 25, 2))::bit(8) & '00000011' $$
45+
CREATE FUNCTION uuid_multicast_bit(uuid) RETURNS bool AS
46+
$$ SELECT (('x' || substr($1::text, 25, 2))::bit(8) & '00000001') != '00000000' $$
47+
LANGUAGE SQL STRICT IMMUTABLE;
48+
CREATE FUNCTION uuid_local_admin_bit(uuid) RETURNS bool AS
49+
$$ SELECT (('x' || substr($1::text, 25, 2))::bit(8) & '00000010') != '00000000' $$
4750
LANGUAGE SQL STRICT IMMUTABLE;
4851
CREATE FUNCTION uuid_node(uuid) RETURNS text AS
4952
$$ SELECT substr($1::text, 25) $$
5053
LANGUAGE SQL STRICT IMMUTABLE;
54+
-- Ideally, the multicast bit would never be set in V1 output, but the
55+
-- UUID library may fall back to MC if it can't get the system MAC address.
56+
-- Also, the local-admin bit might be set (if so, we're probably inside a VM).
57+
-- So we can't test either bit here.
5158
SELECT uuid_version_bits(uuid_generate_v1()),
52-
uuid_reserved_bits(uuid_generate_v1()),
53-
uuid_multicast_bits(uuid_generate_v1());
54-
uuid_version_bits | uuid_reserved_bits | uuid_multicast_bits
55-
-------------------+--------------------+---------------------
56-
00010000 | 10000000 | 00000000
59+
uuid_reserved_bits(uuid_generate_v1());
60+
uuid_version_bits | uuid_reserved_bits
61+
-------------------+--------------------
62+
00010000 | 10000000
5763
(1 row)
5864

65+
-- Although RFC 4122 only requires the multicast bit to be set in V1MC style
66+
-- UUIDs, our implementation always sets the local-admin bit as well.
5967
SELECT uuid_version_bits(uuid_generate_v1mc()),
6068
uuid_reserved_bits(uuid_generate_v1mc()),
61-
uuid_multicast_bits(uuid_generate_v1mc());
62-
uuid_version_bits | uuid_reserved_bits | uuid_multicast_bits
63-
-------------------+--------------------+---------------------
64-
00010000 | 10000000 | 00000011
69+
uuid_multicast_bit(uuid_generate_v1mc()),
70+
uuid_local_admin_bit(uuid_generate_v1mc());
71+
uuid_version_bits | uuid_reserved_bits | uuid_multicast_bit | uuid_local_admin_bit
72+
-------------------+--------------------+--------------------+----------------------
73+
00010000 | 10000000 | t | t
6574
(1 row)
6675

6776
-- timestamp+clock sequence should be monotonic increasing in v1
@@ -77,13 +86,20 @@ SELECT uuid_timestamp_bits(uuid_generate_v1mc()) < uuid_timestamp_bits(uuid_gene
7786
t
7887
(1 row)
7988

80-
-- node should be stable in v1, but not v1mc
81-
SELECT uuid_node(uuid_generate_v1()) = uuid_node(uuid_generate_v1());
82-
?column?
83-
----------
89+
-- Ideally, the node value is stable in V1 addresses, but OSSP UUID
90+
-- falls back to V1MC behavior if it can't get the system MAC address.
91+
SELECT CASE WHEN uuid_multicast_bit(uuid_generate_v1()) AND
92+
uuid_local_admin_bit(uuid_generate_v1()) THEN
93+
true -- punt, no test
94+
ELSE
95+
uuid_node(uuid_generate_v1()) = uuid_node(uuid_generate_v1())
96+
END;
97+
case
98+
------
8499
t
85100
(1 row)
86101

102+
-- In any case, V1MC node addresses should be random.
87103
SELECT uuid_node(uuid_generate_v1()) <> uuid_node(uuid_generate_v1mc());
88104
?column?
89105
----------

‎contrib/uuid-ossp/sql/uuid_ossp.sql

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,46 @@ CREATE FUNCTION uuid_reserved_bits(uuid) RETURNS varbit AS
2323
$$SELECT ('x'|| substr($1::text,20,2))::bit(8) &'11000000' $$
2424
LANGUAGE SQL STRICT IMMUTABLE;
2525

26-
CREATEFUNCTIONuuid_multicast_bits(uuid) RETURNS varbitAS
27-
$$SELECT ('x'|| substr($1::text,25,2))::bit(8) &'00000011' $$
26+
CREATEFUNCTIONuuid_multicast_bit(uuid) RETURNS boolAS
27+
$$SELECT (('x'|| substr($1::text,25,2))::bit(8) &'00000001')!='00000000' $$
28+
LANGUAGE SQL STRICT IMMUTABLE;
29+
30+
CREATEFUNCTIONuuid_local_admin_bit(uuid) RETURNS boolAS
31+
$$SELECT (('x'|| substr($1::text,25,2))::bit(8) &'00000010')!='00000000' $$
2832
LANGUAGE SQL STRICT IMMUTABLE;
2933

3034
CREATEFUNCTIONuuid_node(uuid) RETURNStextAS
3135
$$SELECT substr($1::text,25) $$
3236
LANGUAGE SQL STRICT IMMUTABLE;
3337

38+
-- Ideally, the multicast bit would never be set in V1 output, but the
39+
-- UUID library may fall back to MC if it can't get the system MAC address.
40+
-- Also, the local-admin bit might be set (if so, we're probably inside a VM).
41+
-- So we can't test either bit here.
3442
SELECT uuid_version_bits(uuid_generate_v1()),
35-
uuid_reserved_bits(uuid_generate_v1()),
36-
uuid_multicast_bits(uuid_generate_v1());
43+
uuid_reserved_bits(uuid_generate_v1());
3744

45+
-- Although RFC 4122 only requires the multicast bit to be set in V1MC style
46+
-- UUIDs, our implementation always sets the local-admin bit as well.
3847
SELECT uuid_version_bits(uuid_generate_v1mc()),
3948
uuid_reserved_bits(uuid_generate_v1mc()),
40-
uuid_multicast_bits(uuid_generate_v1mc());
49+
uuid_multicast_bit(uuid_generate_v1mc()),
50+
uuid_local_admin_bit(uuid_generate_v1mc());
4151

4252
-- timestamp+clock sequence should be monotonic increasing in v1
4353
SELECT uuid_timestamp_bits(uuid_generate_v1())< uuid_timestamp_bits(uuid_generate_v1());
4454
SELECT uuid_timestamp_bits(uuid_generate_v1mc())< uuid_timestamp_bits(uuid_generate_v1mc());
4555

46-
-- node should be stable in v1, but not v1mc
47-
SELECT uuid_node(uuid_generate_v1())= uuid_node(uuid_generate_v1());
56+
-- Ideally, the node value is stable in V1 addresses, but OSSP UUID
57+
-- falls back to V1MC behavior if it can't get the system MAC address.
58+
SELECT CASE WHEN uuid_multicast_bit(uuid_generate_v1())AND
59+
uuid_local_admin_bit(uuid_generate_v1()) THEN
60+
true-- punt, no test
61+
ELSE
62+
uuid_node(uuid_generate_v1())= uuid_node(uuid_generate_v1())
63+
END;
64+
65+
-- In any case, V1MC node addresses should be random.
4866
SELECT uuid_node(uuid_generate_v1())<> uuid_node(uuid_generate_v1mc());
4967
SELECT uuid_node(uuid_generate_v1mc())<> uuid_node(uuid_generate_v1mc());
5068

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp