Reorder tests and move aggregate table data to data/.

2 files changed, 8 insertions, 101 deletions

diff --git a/src/test/regress/sql/aggregates.sql b/src/test/regress/sql/aggregates.sql
index eb4909f8ba8..1fc09968072 100644
--- a/src/test/regress/sql/aggregates.sql
+++ b/src/test/regress/sql/aggregates.sql
@@ -1,102 +1,9 @@
 --
--- replace
---
---
--- BTREE
---
-UPDATE onek
-   SET unique1 = onek.unique1 + 1;
-
-UPDATE onek
-   SET unique1 = onek.unique1 - 1;
-
---
--- BTREE partial
---
--- UPDATE onek2
---   SET unique1 = onek2.unique1 + 1;
-
---UPDATE onek2 
---   SET unique1 = onek2.unique1 - 1;
-
---
--- BTREE shutting out non-functional updates
---
--- the following two tests seem to take a long time on some 
--- systems.    This non-func update stuff needs to be examined
--- more closely.  			- jolly (2/22/96)
--- 
-UPDATE temp
-   SET stringu1 = reverse_c16(onek.stringu1)
-   WHERE onek.stringu1 = 'JBAAAA' and
-	  onek.stringu1 = temp.stringu1;
-
-UPDATE temp
-   SET stringu1 = reverse_c16(onek2.stringu1)
-   WHERE onek2.stringu1 = 'JCAAAA' and
-	  onek2.stringu1 = temp.stringu1;
-
-DROP TABLE temp;
-
---UPDATE person*
---   SET age = age + 1;
-
---UPDATE person*
---   SET age = age + 3
---   WHERE name = 'linda';
-
---
--- copy
---
-COPY onek TO '_OBJWD_/results/onek.data';
-
-DELETE FROM onek;
-
-COPY onek FROM '_OBJWD_/results/onek.data';
-
-SELECT unique1 FROM onek WHERE unique1 < 2;
-
-DELETE FROM onek2;
-
-COPY onek2 FROM '_OBJWD_/results/onek.data';
-
-SELECT unique1 FROM onek2 WHERE unique1 < 2;
-
-COPY BINARY stud_emp TO '_OBJWD_/results/stud_emp.data';
-
-DELETE FROM stud_emp;
-
-COPY BINARY stud_emp FROM '_OBJWD_/results/stud_emp.data';
-
-SELECT * FROM stud_emp;
-
--- COPY aggtest FROM stdin;
--- 56	7.8
--- 100	99.097
--- 0	0.09561
--- 42	324.78
--- .
--- COPY aggtest TO stdout;
-
-
---
--- test the random function
---
--- count the number of tuples originally
-SELECT count(*) FROM onek;
-
--- select roughly 1/10 of the tuples
-SELECT count(*) FROM onek where oidrand(onek.oid, 10);
-
--- select again, the count should be different
-SELECT count(*) FROM onek where oidrand(onek.oid, 10);
-
---
 -- AGGREGATES
 --
 SELECT avg(four) AS avg_1 FROM onek;
 
-SELECT avg(a) AS avg_49 FROM aggtest WHERE a < 100;
+SELECT avg(a) AS avg_32 FROM aggtest WHERE a < 100;
 
 SELECT avg(b) AS avg_107_943 FROM aggtest;
 
diff --git a/src/test/regress/sql/tests b/src/test/regress/sql/tests
index 3086689d80e..3d7aecbe34a 100644
--- a/src/test/regress/sql/tests
+++ b/src/test/regress/sql/tests
@@ -1,21 +1,21 @@
 boolean
-box
 char
 char16
 char2
 char4
 char8
-float4
-float8
+text
 int2
 int4
 oid
 oidint2
 oidint4
 oidname
+float4
+float8
 point
+box
 polygon
-text
 timespan
 datetime
 reltime
@@ -32,19 +32,19 @@ create_operator
 create_view
 create_index
 sanity_check
+errors
 select
 select_into
 select_distinct
 select_distinct_on
+aggregates
 transactions
+random
 portals
-errors
 misc
-random
 arrays
 btree_index
 hash_index
-aggregates
 select_views
 alter_table
 purge