Changeset: d65ed44ed58b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d65ed44ed58b
Modified Files:
sql/test/emptydb/Tests/check.stable.out.32bit
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Aug2024 branch.
diffs (truncated from 5432 to 300 lines):
diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -574,7 +574,7 @@ CLTgetProfile(Client cntxt, MalBlkPtr mb
/* Long running queries are traced in the logger
* with a message from the interpreter.
- * This value should be set to minutes to avoid a lengthly log */
+ * This value should be set to minutes to avoid a lengthy log */
static str
CLTsetPrintTimeout(void *ret, const int *secs)
{
diff --git a/sql/backends/monet5/sql_rank.c b/sql/backends/monet5/sql_rank.c
--- a/sql/backends/monet5/sql_rank.c
+++ b/sql/backends/monet5/sql_rank.c
@@ -1682,8 +1682,6 @@ do_stddev_and_variance(Client cntxt, Mal
msg = createException(SQL, op, GDK_EXCEPTION);
} else {
dbl *res = getArgReference_dbl(stk, pci, 0);
- ValRecord *input1 = &(stk)->stk[(pci)->argv[1]];
-
switch (tpe) {
case TYPE_bte:
case TYPE_sht:
@@ -1694,7 +1692,7 @@ do_stddev_and_variance(Client cntxt, Mal
#endif
case TYPE_flt:
case TYPE_dbl:
- *res = VALisnil(input1) ? dbl_nil : 0;
+ *res = dbl_nil;
break;
default:
msg = createException(SQL, op, SQLSTATE(42000)
"%s not available for %s", op, ATOMname(tpe));
diff --git a/sql/benchmarks/ATIS/Tests/one.test.in
b/sql/benchmarks/ATIS/Tests/one.test
rename from sql/benchmarks/ATIS/Tests/one.test.in
rename to sql/benchmarks/ATIS/Tests/one.test
--- a/sql/benchmarks/ATIS/Tests/one.test.in
+++ b/sql/benchmarks/ATIS/Tests/one.test
@@ -86,88 +86,88 @@ statement ok
create table transport (transport_code char(1) NOT NULL,transport_desc
char(32) NOT NULL,PRIMARY KEY (transport_code))
statement ok
-COPY 135 RECORDS INTO "sys"."aircraft" FROM E'$QTSTSRCDIR/aircraft.dat' USING
DELIMITERS E'\t',E'\n','"'
+COPY 135 RECORDS INTO "sys"."aircraft" FROM 'aircraft.dat' ON CLIENT USING
DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 314 RECORDS INTO "sys"."airline" FROM E'$QTSTSRCDIR/airline.dat' USING
DELIMITERS E'\t',E'\n','"'
+COPY 314 RECORDS INTO "sys"."airline" FROM 'airline.dat' ON CLIENT USING
DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 9 RECORDS INTO "sys"."airport" FROM E'$QTSTSRCDIR/airport.dat' USING
DELIMITERS E'\t',E'\n','"'
+COPY 9 RECORDS INTO "sys"."airport" FROM 'airport.dat' ON CLIENT USING
DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 14 RECORDS INTO "sys"."airport_service" FROM
E'$QTSTSRCDIR/airport_service.dat' USING DELIMITERS E'\t',E'\n','"'
+COPY 14 RECORDS INTO "sys"."airport_service" FROM 'airport_service.dat' ON
CLIENT USING DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 11 RECORDS INTO "sys"."city" FROM E'$QTSTSRCDIR/city.dat' USING
DELIMITERS E'\t',E'\n','"'
+COPY 11 RECORDS INTO "sys"."city" FROM 'city.dat' ON CLIENT USING DELIMITERS
E'\t',E'\n','"'
statement ok
-COPY 27 RECORDS INTO "sys"."class_of_service" FROM
E'$QTSTSRCDIR/class_of_service.dat' USING DELIMITERS E'\t',E'\n','"'
+COPY 27 RECORDS INTO "sys"."class_of_service" FROM 'class_of_service.dat' ON
CLIENT USING DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 15 RECORDS INTO "sys"."code_description" FROM
E'$QTSTSRCDIR/code_description.dat' USING DELIMITERS E'\t',E'\n','"'
+COPY 15 RECORDS INTO "sys"."code_description" FROM 'code_description.dat' ON
CLIENT USING DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 149 RECORDS INTO "sys"."compound_class" FROM
E'$QTSTSRCDIR/compound_class.dat' USING DELIMITERS E'\t',E'\n','"'
+COPY 149 RECORDS INTO "sys"."compound_class" FROM 'compound_class.dat' ON
CLIENT USING DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 351 RECORDS INTO "sys"."connect_leg" FROM E'$QTSTSRCDIR/connect_leg.dat'
USING DELIMITERS E'\t',E'\n','"'
+COPY 351 RECORDS INTO "sys"."connect_leg" FROM 'connect_leg.dat' ON CLIENT
USING DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 164 RECORDS INTO "sys"."fconnection" FROM E'$QTSTSRCDIR/fconnection.dat'
USING DELIMITERS E'\t',E'\n','"'
+COPY 164 RECORDS INTO "sys"."fconnection" FROM 'fconnection.dat' ON CLIENT
USING DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 7 RECORDS INTO "sys"."day_name" FROM E'$QTSTSRCDIR/day_name.dat' USING
DELIMITERS E'\t',E'\n','"'
+COPY 7 RECORDS INTO "sys"."day_name" FROM 'day_name.dat' ON CLIENT USING
DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 114 RECORDS INTO "sys"."dual_carrier" FROM
E'$QTSTSRCDIR/dual_carrier.dat' USING DELIMITERS E'\t',E'\n','"'
+COPY 114 RECORDS INTO "sys"."dual_carrier" FROM 'dual_carrier.dat' ON CLIENT
USING DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 534 RECORDS INTO "sys"."fare" FROM E'$QTSTSRCDIR/fare.dat' USING
DELIMITERS E'\t',E'\n','"'
+COPY 534 RECORDS INTO "sys"."fare" FROM 'fare.dat' ON CLIENT USING DELIMITERS
E'\t',E'\n','"'
statement ok
-COPY 579 RECORDS INTO "sys"."flight" FROM E'$QTSTSRCDIR/flight.dat' USING
DELIMITERS E'\t',E'\n','"'
+COPY 579 RECORDS INTO "sys"."flight" FROM 'flight.dat' ON CLIENT USING
DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 2895 RECORDS INTO "sys"."flight_class" FROM
E'$QTSTSRCDIR/flight_class.dat' USING DELIMITERS E'\t',E'\n','"'
+COPY 2895 RECORDS INTO "sys"."flight_class" FROM 'flight_class.dat' ON CLIENT
USING DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 448 RECORDS INTO "sys"."flight_day" FROM E'$QTSTSRCDIR/flight_day.dat'
USING DELIMITERS E'\t',E'\n','"'
+COPY 448 RECORDS INTO "sys"."flight_day" FROM 'flight_day.dat' ON CLIENT USING
DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 2998 RECORDS INTO "sys"."flight_fare" FROM E'$QTSTSRCDIR/flight_fare.dat'
USING DELIMITERS E'\t',E'\n','"'
+COPY 2998 RECORDS INTO "sys"."flight_fare" FROM 'flight_fare.dat' ON CLIENT
USING DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 121 RECORDS INTO "sys"."food_service" FROM
E'$QTSTSRCDIR/food_service.dat' USING DELIMITERS E'\t',E'\n','"'
+COPY 121 RECORDS INTO "sys"."food_service" FROM 'food_service.dat' ON CLIENT
USING DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 33 RECORDS INTO "sys"."ground_service" FROM
E'$QTSTSRCDIR/ground_service.dat' USING DELIMITERS E'\t',E'\n','"'
+COPY 33 RECORDS INTO "sys"."ground_service" FROM 'ground_service.dat' ON
CLIENT USING DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 12 RECORDS INTO "sys"."time_interval" FROM
E'$QTSTSRCDIR/time_interval.dat' USING DELIMITERS E'\t',E'\n','"'
+COPY 12 RECORDS INTO "sys"."time_interval" FROM 'time_interval.dat' ON CLIENT
USING DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 12 RECORDS INTO "sys"."month_name" FROM E'$QTSTSRCDIR/month_name.dat'
USING DELIMITERS E'\t',E'\n','"'
+COPY 12 RECORDS INTO "sys"."month_name" FROM 'month_name.dat' ON CLIENT USING
DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 612 RECORDS INTO "sys"."restrict_carrier" FROM
E'$QTSTSRCDIR/restrict_carrier.dat' USING DELIMITERS E'\t',E'\n','"'
+COPY 612 RECORDS INTO "sys"."restrict_carrier" FROM 'restrict_carrier.dat' ON
CLIENT USING DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 4 RECORDS INTO "sys"."restrict_class" FROM
E'$QTSTSRCDIR/restrict_class.dat' USING DELIMITERS E'\t',E'\n','"'
+COPY 4 RECORDS INTO "sys"."restrict_class" FROM 'restrict_class.dat' ON CLIENT
USING DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 65 RECORDS INTO "sys"."restriction" FROM E'$QTSTSRCDIR/restriction.dat'
USING DELIMITERS E'\t',E'\n','"'
+COPY 65 RECORDS INTO "sys"."restriction" FROM 'restriction.dat' ON CLIENT
USING DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 63 RECORDS INTO "sys"."state" FROM E'$QTSTSRCDIR/state.dat' USING
DELIMITERS E'\t',E'\n','"'
+COPY 63 RECORDS INTO "sys"."state" FROM 'state.dat' ON CLIENT USING DELIMITERS
E'\t',E'\n','"'
statement ok
-COPY 69 RECORDS INTO "sys"."stop1" FROM E'$QTSTSRCDIR/stop1.dat' USING
DELIMITERS E'\t',E'\n','"'
+COPY 69 RECORDS INTO "sys"."stop1" FROM 'stop1.dat' ON CLIENT USING DELIMITERS
E'\t',E'\n','"'
statement ok
-COPY 9 RECORDS INTO "sys"."time_zone" FROM E'$QTSTSRCDIR/time_zone.dat' USING
DELIMITERS E'\t',E'\n','"'
+COPY 9 RECORDS INTO "sys"."time_zone" FROM 'time_zone.dat' ON CLIENT USING
DELIMITERS E'\t',E'\n','"'
statement ok
-COPY 4 RECORDS INTO "sys"."transport" FROM E'$QTSTSRCDIR/transport.dat' USING
DELIMITERS E'\t',E'\n','"'
+COPY 4 RECORDS INTO "sys"."transport" FROM 'transport.dat' ON CLIENT USING
DELIMITERS E'\t',E'\n','"'
statement ok
commit
diff --git a/sql/benchmarks/ssbm/Tests/one.test.in
b/sql/benchmarks/ssbm/Tests/one.test
rename from sql/benchmarks/ssbm/Tests/one.test.in
rename to sql/benchmarks/ssbm/Tests/one.test
--- a/sql/benchmarks/ssbm/Tests/one.test.in
+++ b/sql/benchmarks/ssbm/Tests/one.test
@@ -110,19 +110,19 @@ statement ok
START TRANSACTION
statement ok
-COPY 2556 RECORDS INTO DWDATE FROM E'$QTSTSRCDIR/SF-0.01/date.tbl'
USING DELIMITERS '|', E'|\n'
+COPY 2556 RECORDS INTO DWDATE FROM 'SF-0.01/date.tbl' ON CLIENT
USING DELIMITERS '|', E'|\n'
statement ok
-COPY 100 RECORDS INTO SUPPLIER FROM E'$QTSTSRCDIR/SF-0.01/supplier.tbl'
USING DELIMITERS '|', E'|\n'
+COPY 100 RECORDS INTO SUPPLIER FROM 'SF-0.01/supplier.tbl' ON CLIENT
USING DELIMITERS '|', E'|\n'
statement ok
-COPY 300 RECORDS INTO CUSTOMER FROM E'$QTSTSRCDIR/SF-0.01/customer.tbl'
USING DELIMITERS '|', E'|\n'
+COPY 300 RECORDS INTO CUSTOMER FROM 'SF-0.01/customer.tbl' ON CLIENT
USING DELIMITERS '|', E'|\n'
statement ok
-COPY 2000 RECORDS INTO PART FROM E'$QTSTSRCDIR/SF-0.01/part.tbl'
USING DELIMITERS '|', E'|\n'
+COPY 2000 RECORDS INTO PART FROM 'SF-0.01/part.tbl' ON CLIENT
USING DELIMITERS '|', E'|\n'
statement ok
-COPY 60175 RECORDS INTO LINEORDER FROM E'$QTSTSRCDIR/SF-0.01/lineorder.tbl'
USING DELIMITERS '|', E'|\n'
+COPY 60175 RECORDS INTO LINEORDER FROM 'SF-0.01/lineorder.tbl' ON CLIENT
USING DELIMITERS '|', E'|\n'
statement ok
COMMIT
diff --git a/sql/benchmarks/tpch/Tests/All b/sql/benchmarks/tpch/Tests/All
--- a/sql/benchmarks/tpch/Tests/All
+++ b/sql/benchmarks/tpch/Tests/All
@@ -1,1 +1,26 @@
-one
+create
+load
+compress
+q1
+q2
+q3
+q4
+q5
+q6
+q7
+q8
+q9
+q10
+q11
+q12
+q13
+q14
+q15
+q16
+q17
+q18
+q19
+q20
+q21
+q22
+rest
diff --git a/sql/benchmarks/tpch/Tests/SingleServer
b/sql/benchmarks/tpch/Tests/SingleServer
--- a/sql/benchmarks/tpch/Tests/SingleServer
+++ b/sql/benchmarks/tpch/Tests/SingleServer
@@ -0,0 +1,1 @@
+nodrop
diff --git a/sql/benchmarks/tpch/Tests/compress.test
b/sql/benchmarks/tpch/Tests/compress.test
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/tpch/Tests/compress.test
@@ -0,0 +1,522 @@
+statement ok
+create procedure sys.dict_compress( sname string, tname string, cname string,
ordered_values bool) external name dict.compress
+
+statement ok
+create procedure sys.for_compress( sname string, tname string, cname string)
external name "for".compress
+
+statement ok
+call dict_compress('sys', 'region', 'r_regionkey', true)
+
+statement ok
+call dict_compress('sys', 'nation', 'n_nationkey', true)
+
+statement ok
+call dict_compress('sys', 'nation', 'n_regionkey', true)
+
+statement ok
+call dict_compress('sys', 'supplier', 's_nationkey', true)
+
+statement ok
+call dict_compress('sys', 'customer', 'c_nationkey', true)
+
+statement ok
+call dict_compress('sys', 'customer', 'c_mktsegment', true)
+
+statement ok
+call dict_compress('sys', 'part', 'p_mfgr', true)
+
+statement ok
+call dict_compress('sys', 'part', 'p_brand', true)
+
+statement ok
+call dict_compress('sys', 'part', 'p_type', true)
+
+statement ok
+call dict_compress('sys', 'part', 'p_size', true)
+
+statement ok
+call dict_compress('sys', 'part', 'p_container', true)
+
+statement ok
+call dict_compress('sys', 'part', 'p_retailprice', true)
+
+statement ok
+call dict_compress('sys', 'partsupp', 'ps_availqty', true)
+
+statement ok
+call dict_compress('sys', 'orders', 'o_orderstatus', true)
+
+statement ok
+call dict_compress('sys', 'orders', 'o_orderdate', true)
+
+statement ok
+call dict_compress('sys', 'orders', 'o_orderpriority', true)
+
+statement ok
+call dict_compress('sys', 'orders', 'o_clerk', true)
+
+statement ok
+call dict_compress('sys', 'orders', 'o_shippriority', true)
+
+statement ok
+call dict_compress('sys', 'lineitem', 'l_linenumber', true)
+
+statement ok
+call dict_compress('sys', 'lineitem', 'l_quantity', true)
+
+statement ok
+call dict_compress('sys', 'lineitem', 'l_discount', true)
+
+# testing l_tax now with for compression.
+# not dict call dict_compress('sys', 'lineitem', 'l_tax', true);
+#
+statement ok
+call for_compress('sys', 'lineitem', 'l_tax')
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
