From: Tomas Vondra <tomas@2ndquadrant.com>
Date: Fri, 7 Jul 2017 17:27:42 +0000 (+0200)
Subject: Stabilize order of results in macaddr8 regression test
X-Git-Tag: XL_10_R1BETA1~249
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=30fdab504c1842f0eda2763326d388d5dbac8a8d;p=postgres-xl.git

Stabilize order of results in macaddr8 regression test

Same issue as in c2392efc83, but in different regression test. Fixed the
same way, i.e. by adding ORDER BY clauses to stabilize the order.
---

diff --git a/src/test/regress/expected/macaddr8.out b/src/test/regress/expected/macaddr8.out
index 74f53a121f..9344000007 100644
--- a/src/test/regress/expected/macaddr8.out
+++ b/src/test/regress/expected/macaddr8.out
@@ -276,9 +276,11 @@ SELECT b <> '08:00:2b:01:02:03:04:05' FROM macaddr8_data WHERE a = 15; -- false
  f
 (1 row)
 
-SELECT ~b                       FROM macaddr8_data;
+SELECT ~b                       FROM macaddr8_data ORDER BY 1;
         ?column?         
 -------------------------
+ f7:ff:d3:00:01:fe:fd:fc
+ f7:ff:d4:00:01:fe:fd:fb
  f7:ff:d4:00:01:fe:fd:fc
  f7:ff:d4:00:01:fe:fd:fc
  f7:ff:d4:00:01:fe:fd:fc
@@ -287,11 +289,7 @@ SELECT ~b                       FROM macaddr8_data;
  f7:ff:d4:00:01:fe:fd:fc
  f7:ff:d4:00:01:fe:fd:fc
  f7:ff:d4:00:01:fe:fd:fc
- f7:ff:d4:00:01:fe:fd:fb
  f7:ff:d4:00:01:fe:fd:fd
- f7:ff:d5:00:01:fe:fd:fc
- f7:ff:d3:00:01:fe:fd:fc
- f7:ff:d5:00:01:fe:fd:fb
  f7:ff:d4:fe:fd:fc:fb:fa
  f7:ff:d4:fe:fd:fc:fb:fa
  f7:ff:d4:fe:fd:fc:fb:fa
@@ -299,11 +297,21 @@ SELECT ~b                       FROM macaddr8_data;
  f7:ff:d4:fe:fd:fc:fb:fa
  f7:ff:d4:fe:fd:fc:fb:fa
  f7:ff:d4:fe:fd:fc:fb:fa
+ f7:ff:d5:00:01:fe:fd:fb
+ f7:ff:d5:00:01:fe:fd:fc
 (20 rows)
 
-SELECT  b & '00:00:00:ff:ff:ff' FROM macaddr8_data;
+SELECT  b & '00:00:00:ff:ff:ff' FROM macaddr8_data ORDER BY 1;
         ?column?         
 -------------------------
+ 00:00:00:01:02:03:04:05
+ 00:00:00:01:02:03:04:05
+ 00:00:00:01:02:03:04:05
+ 00:00:00:01:02:03:04:05
+ 00:00:00:01:02:03:04:05
+ 00:00:00:01:02:03:04:05
+ 00:00:00:01:02:03:04:05
+ 00:00:00:ff:fe:01:02:02
  00:00:00:ff:fe:01:02:03
  00:00:00:ff:fe:01:02:03
  00:00:00:ff:fe:01:02:03
@@ -312,23 +320,18 @@ SELECT  b & '00:00:00:ff:ff:ff' FROM macaddr8_data;
  00:00:00:ff:fe:01:02:03
  00:00:00:ff:fe:01:02:03
  00:00:00:ff:fe:01:02:03
- 00:00:00:ff:fe:01:02:04
- 00:00:00:ff:fe:01:02:02
  00:00:00:ff:fe:01:02:03
  00:00:00:ff:fe:01:02:03
  00:00:00:ff:fe:01:02:04
- 00:00:00:01:02:03:04:05
- 00:00:00:01:02:03:04:05
- 00:00:00:01:02:03:04:05
- 00:00:00:01:02:03:04:05
- 00:00:00:01:02:03:04:05
- 00:00:00:01:02:03:04:05
- 00:00:00:01:02:03:04:05
+ 00:00:00:ff:fe:01:02:04
 (20 rows)
 
-SELECT  b | '01:02:03:04:05:06' FROM macaddr8_data;
+SELECT  b | '01:02:03:04:05:06' FROM macaddr8_data ORDER BY 1;
         ?column?         
 -------------------------
+ 09:02:2b:ff:fe:05:07:06
+ 09:02:2b:ff:fe:05:07:06
+ 09:02:2b:ff:fe:05:07:06
  09:02:2b:ff:fe:05:07:07
  09:02:2b:ff:fe:05:07:07
  09:02:2b:ff:fe:05:07:07
@@ -337,11 +340,7 @@ SELECT  b | '01:02:03:04:05:06' FROM macaddr8_data;
  09:02:2b:ff:fe:05:07:07
  09:02:2b:ff:fe:05:07:07
  09:02:2b:ff:fe:05:07:07
- 09:02:2b:ff:fe:05:07:06
- 09:02:2b:ff:fe:05:07:06
  09:02:2b:ff:fe:05:07:07
- 09:02:2f:ff:fe:05:07:07
- 09:02:2b:ff:fe:05:07:06
  09:02:2b:ff:fe:07:05:07
  09:02:2b:ff:fe:07:05:07
  09:02:2b:ff:fe:07:05:07
@@ -349,6 +348,7 @@ SELECT  b | '01:02:03:04:05:06' FROM macaddr8_data;
  09:02:2b:ff:fe:07:05:07
  09:02:2b:ff:fe:07:05:07
  09:02:2b:ff:fe:07:05:07
+ 09:02:2f:ff:fe:05:07:07
 (20 rows)
 
 DROP TABLE macaddr8_data;
diff --git a/src/test/regress/sql/macaddr8.sql b/src/test/regress/sql/macaddr8.sql
index 57a227c5ab..6cc4a02574 100644
--- a/src/test/regress/sql/macaddr8.sql
+++ b/src/test/regress/sql/macaddr8.sql
@@ -82,8 +82,8 @@ SELECT b =  '08:00:2b:01:02:03:04:05' FROM macaddr8_data WHERE a = 15; -- true
 SELECT b <> '08:00:2b:01:02:03:04:06' FROM macaddr8_data WHERE a = 15; -- true
 SELECT b <> '08:00:2b:01:02:03:04:05' FROM macaddr8_data WHERE a = 15; -- false
 
-SELECT ~b                       FROM macaddr8_data;
-SELECT  b & '00:00:00:ff:ff:ff' FROM macaddr8_data;
-SELECT  b | '01:02:03:04:05:06' FROM macaddr8_data;
+SELECT ~b                       FROM macaddr8_data ORDER BY 1;
+SELECT  b & '00:00:00:ff:ff:ff' FROM macaddr8_data ORDER BY 1;
+SELECT  b | '01:02:03:04:05:06' FROM macaddr8_data ORDER BY 1;
 
 DROP TABLE macaddr8_data;