Re: inet regression test

OK, I have applied an patch to ORDER BY on those queries. I don't see
the ordering you have here, but this should fix it for you.  I also
uppercased the keywords while I was in there.

---------------------------------------------------------------------------

Rod Taylor wrote:
-- Start of PGP signed section.
> Looks like some ORDER BY statements would be useful.
>
> *** ./expected/inet.out    Sat Jun 16 22:05:20 2001
> --- ./results/inet.out    Wed Jan 15 10:18:40 2003
> ***************
> *** 193,212 ****
>   select * from inet_tbl where i<<'192.168.1.0/24'::cidr;
>          c        |        i
>   ----------------+------------------
>    192.168.1.0/24 | 192.168.1.0/25
>    192.168.1.0/24 | 192.168.1.255/25
> -  192.168.1.0/24 | 192.168.1.226
>   (3 rows)
>
>   select * from inet_tbl where i<<='192.168.1.0/24'::cidr;
>          c        |        i
>   ----------------+------------------
> -  192.168.1.0/24 | 192.168.1.0/24
>    192.168.1.0/24 | 192.168.1.226/24
> !  192.168.1.0/24 | 192.168.1.255/24
>    192.168.1.0/24 | 192.168.1.0/25
>    192.168.1.0/24 | 192.168.1.255/25
> -  192.168.1.0/24 | 192.168.1.226
>   (6 rows)
>
>   set enable_seqscan to on;
> --- 193,212 ----
>   select * from inet_tbl where i<<'192.168.1.0/24'::cidr;
>          c        |        i
>   ----------------+------------------
> +  192.168.1.0/24 | 192.168.1.226
>    192.168.1.0/24 | 192.168.1.0/25
>    192.168.1.0/24 | 192.168.1.255/25
>   (3 rows)
>
>   select * from inet_tbl where i<<='192.168.1.0/24'::cidr;
>          c        |        i
>   ----------------+------------------
>    192.168.1.0/24 | 192.168.1.226/24
> !  192.168.1.0/24 | 192.168.1.226
> !  192.168.1.0/24 | 192.168.1.0/24
>    192.168.1.0/24 | 192.168.1.0/25
> +  192.168.1.0/24 | 192.168.1.255/24
>    192.168.1.0/24 | 192.168.1.255/25
>   (6 rows)
>
>   set enable_seqscan to on;
>
> --
> Rod Taylor <rbt@rbt.ca>
>
> PGP Key: http://www.rbt.ca/rbtpub.asc
-- End of PGP section, PGP failed!

--
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073
Index: src/test/regress/expected/inet.out
===================================================================
RCS file: /cvsroot/pgsql-server/src/test/regress/expected/inet.out,v
retrieving revision 1.13
diff -c -c -r1.13 inet.out
*** src/test/regress/expected/inet.out    17 Jun 2001 02:05:20 -0000    1.13
--- src/test/regress/expected/inet.out    15 Jan 2003 16:34:09 -0000
***************
*** 168,174 ****
  (14 rows)

  -- check the conversion to/from text and set_netmask
! select '' AS ten, set_masklen(inet(text(i)), 24) FROM INET_TBL;
   ten |   set_masklen
  -----+------------------
       | 192.168.1.226/24
--- 168,174 ----
  (14 rows)

  -- check the conversion to/from text and set_netmask
! SELECT '' AS ten, set_masklen(inet(text(i)), 24) FROM INET_TBL;
   ten |   set_masklen
  -----+------------------
       | 192.168.1.226/24
***************
*** 188,196 ****
  (14 rows)

  -- check that index works correctly
! 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;
         c        |        i
  ----------------+------------------
   192.168.1.0/24 | 192.168.1.0/25
--- 188,196 ----
  (14 rows)

  -- check that index works correctly
! 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 ORDER BY c,i;
         c        |        i
  ----------------+------------------
   192.168.1.0/24 | 192.168.1.0/25
***************
*** 198,204 ****
   192.168.1.0/24 | 192.168.1.226
  (3 rows)

! select * from inet_tbl where i<<='192.168.1.0/24'::cidr;
         c        |        i
  ----------------+------------------
   192.168.1.0/24 | 192.168.1.0/24
--- 198,204 ----
   192.168.1.0/24 | 192.168.1.226
  (3 rows)

! SELECT * FROM inet_tbl WHERE i<<='192.168.1.0/24'::cidr ORDER BY c,i;
         c        |        i
  ----------------+------------------
   192.168.1.0/24 | 192.168.1.0/24
***************
*** 209,213 ****
   192.168.1.0/24 | 192.168.1.226
  (6 rows)

! set enable_seqscan to on;
! drop index inet_idx1;
--- 209,213 ----
   192.168.1.0/24 | 192.168.1.226
  (6 rows)

! SET enable_seqscan TO on;
! DROP INDEX inet_idx1;
Index: src/test/regress/sql/inet.sql
===================================================================
RCS file: /cvsroot/pgsql-server/src/test/regress/sql/inet.sql,v
retrieving revision 1.7
diff -c -c -r1.7 inet.sql
*** src/test/regress/sql/inet.sql    17 Jun 2001 02:05:20 -0000    1.7
--- src/test/regress/sql/inet.sql    15 Jan 2003 16:34:10 -0000
***************
*** 52,63 ****
    FROM INET_TBL;

  -- check the conversion to/from text and set_netmask
! select '' AS ten, set_masklen(inet(text(i)), 24) FROM INET_TBL;
  -- check that index works correctly
! 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;
! set enable_seqscan to on;
! drop index inet_idx1;

--- 52,63 ----
    FROM INET_TBL;

  -- check the conversion to/from text and set_netmask
! SELECT '' AS ten, set_masklen(inet(text(i)), 24) FROM INET_TBL;
  -- check that index works correctly
! 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 ORDER BY c,i;
! SELECT * FROM inet_tbl WHERE i<<='192.168.1.0/24'::cidr ORDER BY c,i;
! SET enable_seqscan TO on;
! DROP INDEX inet_idx1;