Changeset: 750c51b86faf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=750c51b86faf
Added Files:
sql/benchmarks/tpch/15a.sql
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/c.sql-primary
sql/benchmarks/tpch/c.sql-primary-foreign
sql/test/BugTracker-2015/Tests/float-space-parse.Bug-3691.sql
sql/test/BugTracker-2015/Tests/float-space-parse.Bug-3691.stable.err
sql/test/BugTracker-2015/Tests/float-space-parse.Bug-3691.stable.out
Removed Files:
sql/benchmarks/tpch/05a.sql
sql/benchmarks/tpch/06a.sql
sql/benchmarks/tpch/07a.sql
sql/benchmarks/tpch/08a.sql
sql/benchmarks/tpch/09a.sql
sql/benchmarks/tpch/09b.sql
sql/benchmarks/tpch/09c.sql
sql/benchmarks/tpch/1.sql
sql/benchmarks/tpch/13a.sql
sql/benchmarks/tpch/c.sql-dec
sql/benchmarks/tpch/c.sql-dec-primary
sql/benchmarks/tpch/c.sql-dec-primary-foreign
sql/benchmarks/tpch/h.sql
Modified Files:
gdk/gdk_atoms.c
sql/benchmarks/tpch/01.sql
sql/benchmarks/tpch/02.sql
sql/benchmarks/tpch/03.sql
sql/benchmarks/tpch/04.sql
sql/benchmarks/tpch/05.sql
sql/benchmarks/tpch/06.sql
sql/benchmarks/tpch/07.sql
sql/benchmarks/tpch/08.sql
sql/benchmarks/tpch/09.sql
sql/benchmarks/tpch/10.sql
sql/benchmarks/tpch/11.sql
sql/benchmarks/tpch/12.sql
sql/benchmarks/tpch/13.sql
sql/benchmarks/tpch/14.sql
sql/benchmarks/tpch/15.sql
sql/benchmarks/tpch/16.sql
sql/benchmarks/tpch/17.sql
sql/benchmarks/tpch/18.sql
sql/benchmarks/tpch/19.sql
sql/benchmarks/tpch/20.sql
sql/benchmarks/tpch/21.sql
sql/benchmarks/tpch/22.sql
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.err
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/01.stable.out
sql/benchmarks/tpch/LOCKED/Tests/01.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/02.stable.out
sql/benchmarks/tpch/LOCKED/Tests/04.stable.out
sql/benchmarks/tpch/LOCKED/Tests/05.stable.out
sql/benchmarks/tpch/LOCKED/Tests/05.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/07.stable.out
sql/benchmarks/tpch/LOCKED/Tests/07.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/08.stable.out
sql/benchmarks/tpch/LOCKED/Tests/08.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/09.stable.out
sql/benchmarks/tpch/LOCKED/Tests/09.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/10.stable.out
sql/benchmarks/tpch/LOCKED/Tests/10.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/12.stable.out
sql/benchmarks/tpch/LOCKED/Tests/12.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/13.stable.out
sql/benchmarks/tpch/LOCKED/Tests/14.stable.out
sql/benchmarks/tpch/LOCKED/Tests/14.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/15.stable.out
sql/benchmarks/tpch/LOCKED/Tests/15.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/16.stable.out
sql/benchmarks/tpch/LOCKED/Tests/17.stable.out
sql/benchmarks/tpch/LOCKED/Tests/18.stable.out
sql/benchmarks/tpch/LOCKED/Tests/18.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/19.stable.out
sql/benchmarks/tpch/LOCKED/Tests/19.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/20.stable.err
sql/benchmarks/tpch/LOCKED/Tests/20.stable.out
sql/benchmarks/tpch/LOCKED/Tests/21.stable.out
sql/benchmarks/tpch/LOCKED/Tests/21.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/22.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/check0.stable.out
sql/benchmarks/tpch/LOCKED/Tests/check1.stable.out
sql/benchmarks/tpch/LOCKED/Tests/check2.stable.out
sql/benchmarks/tpch/LOCKED/Tests/create.sql.src
sql/benchmarks/tpch/LOCKED/Tests/load.stable.out
sql/benchmarks/tpch/SF-0.01/customer.tbl
sql/benchmarks/tpch/SF-0.01/lineitem.tbl
sql/benchmarks/tpch/SF-0.01/nation.tbl
sql/benchmarks/tpch/SF-0.01/orders.tbl
sql/benchmarks/tpch/SF-0.01/part.tbl
sql/benchmarks/tpch/SF-0.01/partsupp.tbl
sql/benchmarks/tpch/SF-0.01/region.tbl
sql/benchmarks/tpch/SF-0.01/supplier.tbl
sql/benchmarks/tpch/Tests/01-22.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01.stable.out
sql/benchmarks/tpch/Tests/01.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/02-plan.stable.out
sql/benchmarks/tpch/Tests/02.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-plan.stable.out
sql/benchmarks/tpch/Tests/03-plan.stable.out.int128
sql/benchmarks/tpch/Tests/04-explain.stable.out
sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/04.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/05-plan.stable.out
sql/benchmarks/tpch/Tests/05-plan.stable.out.int128
sql/benchmarks/tpch/Tests/05.stable.out
sql/benchmarks/tpch/Tests/05.stable.out.int128
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06-plan.stable.out
sql/benchmarks/tpch/Tests/06-plan.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-plan.stable.out
sql/benchmarks/tpch/Tests/07-plan.stable.out.int128
sql/benchmarks/tpch/Tests/07.stable.out
sql/benchmarks/tpch/Tests/07.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-plan.stable.out
sql/benchmarks/tpch/Tests/08-plan.stable.out.int128
sql/benchmarks/tpch/Tests/08.stable.out
sql/benchmarks/tpch/Tests/08.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-plan.stable.out
sql/benchmarks/tpch/Tests/09-plan.stable.out.int128
sql/benchmarks/tpch/Tests/09.stable.out
sql/benchmarks/tpch/Tests/09.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-plan.stable.out
sql/benchmarks/tpch/Tests/10-plan.stable.out.int128
sql/benchmarks/tpch/Tests/10.stable.out
sql/benchmarks/tpch/Tests/10.stable.out.int128
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/11-plan.stable.out
sql/benchmarks/tpch/Tests/11-plan.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-plan.stable.out
sql/benchmarks/tpch/Tests/12.stable.out
sql/benchmarks/tpch/Tests/12.stable.out.int128
sql/benchmarks/tpch/Tests/13.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-plan.stable.out
sql/benchmarks/tpch/Tests/14-plan.stable.out.int128
sql/benchmarks/tpch/Tests/14.stable.out
sql/benchmarks/tpch/Tests/14.stable.out.int128
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/15.stable.out
sql/benchmarks/tpch/Tests/15.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/16-plan.stable.out
sql/benchmarks/tpch/Tests/16.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-plan.stable.out
sql/benchmarks/tpch/Tests/17-plan.stable.out.int128
sql/benchmarks/tpch/Tests/17.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-plan.stable.out
sql/benchmarks/tpch/Tests/18-plan.stable.out.int128
sql/benchmarks/tpch/Tests/18.stable.out
sql/benchmarks/tpch/Tests/18.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-plan.stable.out
sql/benchmarks/tpch/Tests/19-plan.stable.out.int128
sql/benchmarks/tpch/Tests/19.stable.out
sql/benchmarks/tpch/Tests/19.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-plan.stable.out
sql/benchmarks/tpch/Tests/20.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/21-plan.stable.out
sql/benchmarks/tpch/Tests/21.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/benchmarks/tpch/Tests/22-plan.stable.out
sql/benchmarks/tpch/Tests/22.stable.out
sql/benchmarks/tpch/Tests/check0.stable.out
sql/benchmarks/tpch/Tests/check1.stable.out
sql/benchmarks/tpch/Tests/create.sql.src
sql/benchmarks/tpch/Tests/load.stable.out
sql/benchmarks/tpch/all.sql
sql/benchmarks/tpch/alter.sql
sql/benchmarks/tpch/c.sql
sql/benchmarks/tpch/fileleak/Tests/check0.stable.out
sql/benchmarks/tpch/fileleak/Tests/check1.stable.out
sql/benchmarks/tpch/fileleak/Tests/create.sql.src
sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out
sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
sql/benchmarks/tpch/fileleak/Tests/load.stable.out
sql/benchmarks/tpch/load.sh
sql/benchmarks/tpch/queries.sql
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (truncated from 189547 to 300 lines):
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -820,6 +820,7 @@ int
dblFromStr(const char *src, int *len, dbl **dst)
{
const char *p = src;
+ int n = 0;
double d;
/* alloc memory */
@@ -830,6 +831,7 @@ dblFromStr(const char *src, int *len, db
if (p[0] == 'n' && p[1] == 'i' && p[2] == 'l') {
**dst = dbl_nil;
p += 3;
+ n = (int) (p - src);
} else {
/* on overflow, strtod returns HUGE_VAL and sets
* errno to ERANGE; on underflow, it returns a value
@@ -840,16 +842,17 @@ dblFromStr(const char *src, int *len, db
errno = 0;
d = strtod(src, &pe);
p = pe;
- if (p == src || (errno == ERANGE && (d < -1 || d > 1))) {
+ n = (int) (p - src);
+ if (n == 0 || (errno == ERANGE && (d < -1 || d > 1))) {
**dst = dbl_nil; /* default return value is nil */
- p = src;
+ n = 0;
} else {
+ while (src[n] && GDKisspace(src[n]))
+ n++;
**dst = (dbl) d;
}
}
- while (GDKisspace(*p))
- p++;
- return (int) (p - src);
+ return n;
}
int
diff --git a/sql/benchmarks/tpch/01.sql b/sql/benchmarks/tpch/01.sql
--- a/sql/benchmarks/tpch/01.sql
+++ b/sql/benchmarks/tpch/01.sql
@@ -1,3 +1,6 @@
+-- using default substitutions
+
+
select
l_returnflag,
l_linestatus,
diff --git a/sql/benchmarks/tpch/02.sql b/sql/benchmarks/tpch/02.sql
--- a/sql/benchmarks/tpch/02.sql
+++ b/sql/benchmarks/tpch/02.sql
@@ -1,3 +1,6 @@
+-- using default substitutions
+
+
select
s_acctbal,
s_name,
diff --git a/sql/benchmarks/tpch/03.sql b/sql/benchmarks/tpch/03.sql
--- a/sql/benchmarks/tpch/03.sql
+++ b/sql/benchmarks/tpch/03.sql
@@ -1,3 +1,6 @@
+-- using default substitutions
+
+
select
l_orderkey,
sum(l_extendedprice * (1 - l_discount)) as revenue,
diff --git a/sql/benchmarks/tpch/04.sql b/sql/benchmarks/tpch/04.sql
--- a/sql/benchmarks/tpch/04.sql
+++ b/sql/benchmarks/tpch/04.sql
@@ -1,3 +1,6 @@
+-- using default substitutions
+
+
select
o_orderpriority,
count(*) as order_count
diff --git a/sql/benchmarks/tpch/05.sql b/sql/benchmarks/tpch/05.sql
--- a/sql/benchmarks/tpch/05.sql
+++ b/sql/benchmarks/tpch/05.sql
@@ -1,3 +1,6 @@
+-- using default substitutions
+
+
select
n_name,
sum(l_extendedprice * (1 - l_discount)) as revenue
diff --git a/sql/benchmarks/tpch/05a.sql b/sql/benchmarks/tpch/05a.sql
deleted file mode 100644
--- a/sql/benchmarks/tpch/05a.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-
-select
- n_name,
- sum(l_extendedprice * (1 - l_discount)) as revenue
-from
- customer,
- orders,
- lineitem,
- supplier,
- nation,
- region
-where
- r_name = 'ASIA'
- and n_regionkey = r_regionkey
- and s_nationkey = n_nationkey
- and c_nationkey = s_nationkey
- and c_custkey = o_custkey
- and o_orderdate < date '1994-01-01' + interval '1' year
- and o_orderdate >= date '1994-01-01'
- and l_orderkey = o_orderkey
- and l_suppkey = s_suppkey
-group by
- n_name
-order by
- revenue desc;
diff --git a/sql/benchmarks/tpch/06.sql b/sql/benchmarks/tpch/06.sql
--- a/sql/benchmarks/tpch/06.sql
+++ b/sql/benchmarks/tpch/06.sql
@@ -1,3 +1,6 @@
+-- using default substitutions
+
+
select
sum(l_extendedprice * l_discount) as revenue
from
@@ -5,7 +8,7 @@ from
where
l_shipdate >= date '1994-01-01'
and l_shipdate < date '1994-01-01' + interval '1' year
- and l_discount between 0.06 - 0.01 and 0.06 + 0.01
+ and l_discount between .06 - 0.01 and .06 + 0.01
and l_quantity < 24;
select * from optimizer_stats() stats;
diff --git a/sql/benchmarks/tpch/06a.sql b/sql/benchmarks/tpch/06a.sql
deleted file mode 100644
--- a/sql/benchmarks/tpch/06a.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-
-select
- sum(l_extendedprice * l_discount) as revenue
-from
- lineitem
-where
- l_shipdate >= date '1994-01-01'
- and l_shipdate < date '1994-01-01' + interval '1' year
--- and l_discount between 0.06 - 0.01 and 0.06 + 0.01
- and l_discount between 0.05 and 0.07
- and l_quantity < 24;
diff --git a/sql/benchmarks/tpch/07.sql b/sql/benchmarks/tpch/07.sql
--- a/sql/benchmarks/tpch/07.sql
+++ b/sql/benchmarks/tpch/07.sql
@@ -1,3 +1,6 @@
+-- using default substitutions
+
+
select
supp_nation,
cust_nation,
diff --git a/sql/benchmarks/tpch/07a.sql b/sql/benchmarks/tpch/07a.sql
deleted file mode 100644
--- a/sql/benchmarks/tpch/07a.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-
-select
- supp_nation,
- cust_nation,
- l_year,
- sum(volume) as revenue
-from
- (
- select
- n1.n_name as supp_nation,
- n2.n_name as cust_nation,
- extract(year from l_shipdate) as l_year,
- l_extendedprice * (1 - l_discount) as volume
- from
- supplier,
- lineitem,
- orders,
- customer,
- nation n1,
- nation n2
- where
- s_suppkey = l_suppkey
- and o_orderkey = l_orderkey
- and c_custkey = o_custkey
- and s_nationkey = n1.n_nationkey
- and c_nationkey = n2.n_nationkey
- and (
- (n1.n_name = 'FRANCE' and n2.n_name = 'GERMANY')
- or (n1.n_name = 'GERMANY' and n2.n_name =
'FRANCE')
- )
- and l_shipdate between date '1995-01-01' and date
'1996-12-31'
- ) as shipping
-group by
- supp_nation,
- cust_nation,
- l_year
--- order by
--- supp_nation,
--- cust_nation,
--- l_year
- ;
diff --git a/sql/benchmarks/tpch/08.sql b/sql/benchmarks/tpch/08.sql
--- a/sql/benchmarks/tpch/08.sql
+++ b/sql/benchmarks/tpch/08.sql
@@ -1,3 +1,6 @@
+-- using default substitutions
+
+
select
o_year,
sum(case
diff --git a/sql/benchmarks/tpch/08a.sql b/sql/benchmarks/tpch/08a.sql
deleted file mode 100644
--- a/sql/benchmarks/tpch/08a.sql
+++ /dev/null
@@ -1,39 +0,0 @@
-
-select
- o_year,
- sum(case
- when nation = 'BRAZIL' then volume
- else 0
- end) / sum(volume) as mkt_share
-from
- (
- select
- extract(year from o_orderdate) as o_year,
- l_extendedprice * (1 - l_discount) as volume,
- n2.n_name as nation
- from
- part,
- supplier,
- lineitem,
- orders,
- customer,
- nation n1,
- nation n2,
- region
- where
- p_partkey = l_partkey
- and s_suppkey = l_suppkey
- and l_orderkey = o_orderkey
- and o_custkey = c_custkey
- and c_nationkey = n1.n_nationkey
- and n1.n_regionkey = r_regionkey
- and r_name = 'AMERICA'
- and s_nationkey = n2.n_nationkey
- and o_orderdate between date '1995-01-01' and date
'1996-12-31'
- and p_type = 'ECONOMY ANODIZED STEEL'
- ) as all_nations
-group by
- o_year
--- order by
--- o_year
- ;
diff --git a/sql/benchmarks/tpch/09.sql b/sql/benchmarks/tpch/09.sql
--- a/sql/benchmarks/tpch/09.sql
+++ b/sql/benchmarks/tpch/09.sql
@@ -1,3 +1,6 @@
+-- using default substitutions
+
+
select
nation,
o_year,
diff --git a/sql/benchmarks/tpch/09a.sql b/sql/benchmarks/tpch/09a.sql
deleted file mode 100644
--- a/sql/benchmarks/tpch/09a.sql
+++ /dev/null
@@ -1,33 +0,0 @@
-
-select
- nation,
- o_year,
- sum(amount) as sum_profit
-from
- (
- select
- n_name as nation,
- extract(year from o_orderdate) as o_year,
- l_extendedprice * (1 - l_discount) - ps_supplycost *
l_quantity as amount
- from
- part,
- supplier,
- lineitem,
- partsupp,
- orders,
- nation
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
