Changeset: f7afd1883a8f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7afd1883a8f
Modified Files:
clients/Tests/SQL-dump_all.stable.out
clients/Tests/SQL-dump_all.stable.out.oid32
clients/Tests/SQL-dump_geom.stable.out
clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
clients/Tests/SQL-dump_none.stable.out
gdk/gdk_aggr.c
monetdb5/modules/atoms/json.c
monetdb5/modules/kernel/aggr.mal
sql/backends/monet5/generator/90_generator.sql
sql/backends/monet5/generator/generator.c
sql/backends/monet5/generator/generator.h
sql/backends/monet5/sql.c
sql/backends/monet5/sql_gencode.c
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions_bam.stable.out
sql/test/Tests/systemfunctions_gsl.stable.out
sql/test/Tests/systemfunctions_nogeom.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1_bam.stable.out
sql/test/leaks/Tests/check1_gsl.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2_bam.stable.out
sql/test/leaks/Tests/check2_gsl.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3_bam.stable.out
sql/test/leaks/Tests/check3_gsl.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4_bam.stable.out
sql/test/leaks/Tests/check4_gsl.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5_bam.stable.out
sql/test/leaks/Tests/check5_gsl.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out
Branch: default
Log Message:
Merged with Oct2014 branch.
diffs (truncated from 3124 to 300 lines):
diff --git a/clients/Tests/SQL-dump_all.stable.out
b/clients/Tests/SQL-dump_all.stable.out
--- a/clients/Tests/SQL-dump_all.stable.out
+++ b/clients/Tests/SQL-dump_all.stable.out
@@ -738,6 +738,12 @@ external name generator.series;
create function sys.generate_series(first tinyint, last tinyint, stepsize
tinyint)
returns table (value tinyint)
external name generator.series;
+create function sys.generate_series(first smallint, last smallint)
+returns table (value smallint)
+external name generator.series;
+create function sys.generate_series(first smallint, last smallint, stepsize
smallint)
+returns table (value smallint)
+external name generator.series;
create function sys.generate_series(first int, last int)
returns table (value int)
external name generator.series;
@@ -1884,7 +1890,7 @@ 6614 "pnext" "int" 32 0 6618 NULL
false
6615 "tlen" "int" 32 0 6618 NULL false 8 NULL
6616 "seq" "clob" 0 0 6618 NULL false 9 NULL
6617 "qual" "clob" 0 0 6618 NULL false 10 NULL
-6677 "function_id" "int" 32 0 6678 NULL true 0
NULL
+6688 "function_id" "int" 32 0 6689 NULL true 0
NULL
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."_tables" (
@@ -1942,7 +1948,7 @@ 6574 "sq" 6510 NULL 0 true 0
false
6593 "rg" 6510 NULL 0 true 0 false
6605 "pg" 6510 NULL 0 true 0 false
6618 "export" 6510 NULL 0 true 0 false
-6678 "systemfunctions" 2000 NULL 0 true 0 false
+6689 "systemfunctions" 2000 NULL 0 true 0 false
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."args" (
@@ -1955,7 +1961,7 @@ CREATE TABLE "sys"."args" (
"inout" TINYINT,
"number" INTEGER
);
-COPY 3717 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
+COPY 3724 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
2155 28 "res_0" "oid" 63 0 0 0
2156 28 "arg_1" "wrd" 64 0 1 1
2157 29 "res_0" "oid" 63 0 0 0
@@ -5643,36 +5649,43 @@ 6626 6625 "value" "tinyint" 8 0
0 0
6627 6625 "first" "tinyint" 8 0 1 1
6628 6625 "last" "tinyint" 8 0 1 2
6629 6625 "stepsize" "tinyint" 8 0 1 3
-6632 6631 "value" "int" 32 0 0 0
-6633 6631 "first" "int" 32 0 1 1
-6634 6631 "last" "int" 32 0 1 2
-6637 6636 "value" "int" 32 0 0 0
-6638 6636 "first" "int" 32 0 1 1
-6639 6636 "last" "int" 32 0 1 2
-6640 6636 "stepsize" "int" 32 0 1 3
-6643 6642 "value" "bigint" 64 0 0 0
-6644 6642 "first" "bigint" 64 0 1 1
-6645 6642 "last" "bigint" 64 0 1 2
-6648 6647 "value" "bigint" 64 0 0 0
-6649 6647 "first" "bigint" 64 0 1 1
-6650 6647 "last" "bigint" 64 0 1 2
-6651 6647 "stepsize" "bigint" 64 0 1 3
-6654 6653 "value" "real" 24 0 0 0
-6655 6653 "first" "real" 24 0 1 1
-6656 6653 "last" "real" 24 0 1 2
-6657 6653 "stepsize" "real" 24 0 1 3
-6660 6659 "value" "double" 53 0 0 0
-6661 6659 "first" "double" 53 0 1 1
-6662 6659 "last" "double" 53 0 1 2
-6663 6659 "stepsize" "double" 53 0 1 3
-6666 6665 "value" "decimal" 10 2 0 0
-6667 6665 "first" "decimal" 10 2 1 1
-6668 6665 "last" "decimal" 10 2 1 2
-6669 6665 "stepsize" "decimal" 10 2 1 3
-6672 6671 "value" "timestamp" 7 0 0 0
-6673 6671 "first" "timestamp" 7 0 1 1
-6674 6671 "last" "timestamp" 7 0 1 2
-6675 6671 "stepsize" "sec_interval" 13 0 1 3
+6632 6631 "value" "smallint" 16 0 0 0
+6633 6631 "first" "smallint" 16 0 1 1
+6634 6631 "last" "smallint" 16 0 1 2
+6637 6636 "value" "smallint" 16 0 0 0
+6638 6636 "first" "smallint" 16 0 1 1
+6639 6636 "last" "smallint" 16 0 1 2
+6640 6636 "stepsize" "smallint" 16 0 1 3
+6643 6642 "value" "int" 32 0 0 0
+6644 6642 "first" "int" 32 0 1 1
+6645 6642 "last" "int" 32 0 1 2
+6648 6647 "value" "int" 32 0 0 0
+6649 6647 "first" "int" 32 0 1 1
+6650 6647 "last" "int" 32 0 1 2
+6651 6647 "stepsize" "int" 32 0 1 3
+6654 6653 "value" "bigint" 64 0 0 0
+6655 6653 "first" "bigint" 64 0 1 1
+6656 6653 "last" "bigint" 64 0 1 2
+6659 6658 "value" "bigint" 64 0 0 0
+6660 6658 "first" "bigint" 64 0 1 1
+6661 6658 "last" "bigint" 64 0 1 2
+6662 6658 "stepsize" "bigint" 64 0 1 3
+6665 6664 "value" "real" 24 0 0 0
+6666 6664 "first" "real" 24 0 1 1
+6667 6664 "last" "real" 24 0 1 2
+6668 6664 "stepsize" "real" 24 0 1 3
+6671 6670 "value" "double" 53 0 0 0
+6672 6670 "first" "double" 53 0 1 1
+6673 6670 "last" "double" 53 0 1 2
+6674 6670 "stepsize" "double" 53 0 1 3
+6677 6676 "value" "decimal" 10 2 0 0
+6678 6676 "first" "decimal" 10 2 1 1
+6679 6676 "last" "decimal" 10 2 1 2
+6680 6676 "stepsize" "decimal" 10 2 1 3
+6683 6682 "value" "timestamp" 7 0 0 0
+6684 6682 "first" "timestamp" 7 0 1 1
+6685 6682 "last" "timestamp" 7 0 1 2
+6686 6682 "stepsize" "sec_interval" 13 0 1 3
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."auths" (
@@ -5954,7 +5967,7 @@ CREATE TABLE "sys"."functions" (
"vararg" BOOLEAN,
"schema_id" INTEGER
);
-COPY 1329 RECORDS INTO "sys"."functions" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 1331 RECORDS INTO "sys"."functions" FROM stdin USING DELIMITERS
'\t','\n','"';
28 "not_uniques" "not_uniques" "sql" 0 1 false false
false 0
29 "not_uniques" "not_uniques" "sql" 0 1 false false
false 0
30 "hash" "hash" "mkey" 0 1 false false false 0
@@ -7276,14 +7289,16 @@ 6547 "sam_export" "create procedure bam.
6550 "bam_export" "create procedure bam.bam_export(output_path
string)\nexternal name bam.bam_export;" "bam" 1 2 true
false false 6510
6620 "generate_series" "-- The contents of this file are subject to
the MonetDB Public License\n-- Version 1.1 (the ""License""); you may not use
this file except in\n-- compliance with the License. You may obtain a copy of
the License at\n-- http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software
distributed under the License is distributed on an ""AS IS""\n-- basis, WITHOUT
WARRANTY OF ANY KIND, either express or implied. See the\n-- License for the
specific language governing rights and limitations\n-- under the
License.\n--\n-- The Original Code is the MonetDB Database System.\n--\n-- The
Initial Developer of the Original Code is CWI.\n-- Portions created by CWI are
Copyright (C) 1997-July 2008 CWI.\n-- Copyright August 2008-2014 MonetDB
B.V.\n-- All Rights Reserved.\n\n-- (c) Author M.Kersten\n\ncreate function
sys.generate_series(first tinyint, last tinyint)\nreturns table (value
tinyint)\nexternal name generator.series;" "generator" 1 5
false false false 2000
6625 "generate_series" "create function sys.generate_series(first
tinyint, last tinyint, stepsize tinyint)\nreturns table (value
tinyint)\nexternal name generator.series;" "generator" 1 5
false false false 2000
-6631 "generate_series" "create function sys.generate_series(first int,
last int)\nreturns table (value int)\nexternal name generator.series;"
"generator" 1 5 false false false 2000
-6636 "generate_series" "create function sys.generate_series(first int,
last int, stepsize int)\nreturns table (value int)\nexternal name
generator.series;" "generator" 1 5 false false false
2000
-6642 "generate_series" "create function sys.generate_series(first
bigint, last bigint)\nreturns table (value bigint)\nexternal name
generator.series;" "generator" 1 5 false false false 2000
-6647 "generate_series" "create function sys.generate_series(first
bigint, last bigint, stepsize bigint)\nreturns table (value bigint)\nexternal
name generator.series;" "generator" 1 5 false false
false 2000
-6653 "generate_series" "create function sys.generate_series(first
real, last real, stepsize real)\nreturns table (value real)\nexternal name
generator.series;" "generator" 1 5 false false false
2000
-6659 "generate_series" "create function sys.generate_series(first
double, last double, stepsize double)\nreturns table (value double)\nexternal
name generator.series;" "generator" 1 5 false false
false 2000
-6665 "generate_series" "create function sys.generate_series(first
decimal(10,2), last decimal(10,2), stepsize decimal(10,2))\nreturns table
(value decimal(10,2))\nexternal name generator.series;" "generator" 1
5 false false false 2000
-6671 "generate_series" "create function sys.generate_series(first
timestamp, last timestamp, stepsize interval second)\nreturns table (value
timestamp)\nexternal name generator.series;" "generator" 1 5
false false false 2000
+6631 "generate_series" "create function sys.generate_series(first
smallint, last smallint)\nreturns table (value smallint)\nexternal name
generator.series;" "generator" 1 5 false false false
2000
+6636 "generate_series" "create function sys.generate_series(first
smallint, last smallint, stepsize smallint)\nreturns table (value
smallint)\nexternal name generator.series;" "generator" 1 5
false false false 2000
+6642 "generate_series" "create function sys.generate_series(first int,
last int)\nreturns table (value int)\nexternal name generator.series;"
"generator" 1 5 false false false 2000
+6647 "generate_series" "create function sys.generate_series(first int,
last int, stepsize int)\nreturns table (value int)\nexternal name
generator.series;" "generator" 1 5 false false false
2000
+6653 "generate_series" "create function sys.generate_series(first
bigint, last bigint)\nreturns table (value bigint)\nexternal name
generator.series;" "generator" 1 5 false false false 2000
+6658 "generate_series" "create function sys.generate_series(first
bigint, last bigint, stepsize bigint)\nreturns table (value bigint)\nexternal
name generator.series;" "generator" 1 5 false false
false 2000
+6664 "generate_series" "create function sys.generate_series(first
real, last real, stepsize real)\nreturns table (value real)\nexternal name
generator.series;" "generator" 1 5 false false false
2000
+6670 "generate_series" "create function sys.generate_series(first
double, last double, stepsize double)\nreturns table (value double)\nexternal
name generator.series;" "generator" 1 5 false false
false 2000
+6676 "generate_series" "create function sys.generate_series(first
decimal(10,2), last decimal(10,2), stepsize decimal(10,2))\nreturns table
(value decimal(10,2))\nexternal name generator.series;" "generator" 1
5 false false false 2000
+6682 "generate_series" "create function sys.generate_series(first
timestamp, last timestamp, stepsize interval second)\nreturns table (value
timestamp)\nexternal name generator.series;" "generator" 1 5
false false false 2000
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."idxs" (
@@ -7374,7 +7389,7 @@ 5193 1 1 0 0
5219 1 1 0 0
5222 1 1 0 0
5226 1 1 0 0
-6678 1 1 3 0
+6689 1 1 3 0
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."schemas" (
@@ -7438,7 +7453,7 @@ START TRANSACTION;
CREATE TABLE "sys"."systemfunctions" (
"function_id" INTEGER
);
-COPY 1329 RECORDS INTO "sys"."systemfunctions" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 1331 RECORDS INTO "sys"."systemfunctions" FROM stdin USING DELIMITERS
'\t','\n','"';
28
29
30
@@ -8765,9 +8780,11 @@ 6636
6642
6647
6653
-6659
-6665
-6671
+6658
+6664
+6670
+6676
+6682
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."triggers" (
diff --git a/clients/Tests/SQL-dump_all.stable.out.oid32
b/clients/Tests/SQL-dump_all.stable.out.oid32
--- a/clients/Tests/SQL-dump_all.stable.out.oid32
+++ b/clients/Tests/SQL-dump_all.stable.out.oid32
@@ -738,6 +738,12 @@ external name generator.series;
create function sys.generate_series(first tinyint, last tinyint, stepsize
tinyint)
returns table (value tinyint)
external name generator.series;
+create function sys.generate_series(first smallint, last smallint)
+returns table (value smallint)
+external name generator.series;
+create function sys.generate_series(first smallint, last smallint, stepsize
smallint)
+returns table (value smallint)
+external name generator.series;
create function sys.generate_series(first int, last int)
returns table (value int)
external name generator.series;
@@ -1884,7 +1890,7 @@ 6614 "pnext" "int" 32 0 6618 NULL
false
6615 "tlen" "int" 32 0 6618 NULL false 8 NULL
6616 "seq" "clob" 0 0 6618 NULL false 9 NULL
6617 "qual" "clob" 0 0 6618 NULL false 10 NULL
-6677 "function_id" "int" 32 0 6678 NULL true 0
NULL
+6688 "function_id" "int" 32 0 6689 NULL true 0
NULL
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."_tables" (
@@ -1942,7 +1948,7 @@ 6574 "sq" 6510 NULL 0 true 0
false
6593 "rg" 6510 NULL 0 true 0 false
6605 "pg" 6510 NULL 0 true 0 false
6618 "export" 6510 NULL 0 true 0 false
-6678 "systemfunctions" 2000 NULL 0 true 0 false
+6689 "systemfunctions" 2000 NULL 0 true 0 false
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."args" (
@@ -1955,7 +1961,7 @@ CREATE TABLE "sys"."args" (
"inout" TINYINT,
"number" INTEGER
);
-COPY 3717 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
+COPY 3724 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
2155 28 "res_0" "oid" 31 0 0 0
2156 28 "arg_1" "wrd" 64 0 1 1
2157 29 "res_0" "oid" 31 0 0 0
@@ -5643,36 +5649,43 @@ 6626 6625 "value" "tinyint" 8 0
0 0
6627 6625 "first" "tinyint" 8 0 1 1
6628 6625 "last" "tinyint" 8 0 1 2
6629 6625 "stepsize" "tinyint" 8 0 1 3
-6632 6631 "value" "int" 32 0 0 0
-6633 6631 "first" "int" 32 0 1 1
-6634 6631 "last" "int" 32 0 1 2
-6637 6636 "value" "int" 32 0 0 0
-6638 6636 "first" "int" 32 0 1 1
-6639 6636 "last" "int" 32 0 1 2
-6640 6636 "stepsize" "int" 32 0 1 3
-6643 6642 "value" "bigint" 64 0 0 0
-6644 6642 "first" "bigint" 64 0 1 1
-6645 6642 "last" "bigint" 64 0 1 2
-6648 6647 "value" "bigint" 64 0 0 0
-6649 6647 "first" "bigint" 64 0 1 1
-6650 6647 "last" "bigint" 64 0 1 2
-6651 6647 "stepsize" "bigint" 64 0 1 3
-6654 6653 "value" "real" 24 0 0 0
-6655 6653 "first" "real" 24 0 1 1
-6656 6653 "last" "real" 24 0 1 2
-6657 6653 "stepsize" "real" 24 0 1 3
-6660 6659 "value" "double" 53 0 0 0
-6661 6659 "first" "double" 53 0 1 1
-6662 6659 "last" "double" 53 0 1 2
-6663 6659 "stepsize" "double" 53 0 1 3
-6666 6665 "value" "decimal" 10 2 0 0
-6667 6665 "first" "decimal" 10 2 1 1
-6668 6665 "last" "decimal" 10 2 1 2
-6669 6665 "stepsize" "decimal" 10 2 1 3
-6672 6671 "value" "timestamp" 7 0 0 0
-6673 6671 "first" "timestamp" 7 0 1 1
-6674 6671 "last" "timestamp" 7 0 1 2
-6675 6671 "stepsize" "sec_interval" 13 0 1 3
+6632 6631 "value" "smallint" 16 0 0 0
+6633 6631 "first" "smallint" 16 0 1 1
+6634 6631 "last" "smallint" 16 0 1 2
+6637 6636 "value" "smallint" 16 0 0 0
+6638 6636 "first" "smallint" 16 0 1 1
+6639 6636 "last" "smallint" 16 0 1 2
+6640 6636 "stepsize" "smallint" 16 0 1 3
+6643 6642 "value" "int" 32 0 0 0
+6644 6642 "first" "int" 32 0 1 1
+6645 6642 "last" "int" 32 0 1 2
+6648 6647 "value" "int" 32 0 0 0
+6649 6647 "first" "int" 32 0 1 1
+6650 6647 "last" "int" 32 0 1 2
+6651 6647 "stepsize" "int" 32 0 1 3
+6654 6653 "value" "bigint" 64 0 0 0
+6655 6653 "first" "bigint" 64 0 1 1
+6656 6653 "last" "bigint" 64 0 1 2
+6659 6658 "value" "bigint" 64 0 0 0
+6660 6658 "first" "bigint" 64 0 1 1
+6661 6658 "last" "bigint" 64 0 1 2
+6662 6658 "stepsize" "bigint" 64 0 1 3
+6665 6664 "value" "real" 24 0 0 0
+6666 6664 "first" "real" 24 0 1 1
+6667 6664 "last" "real" 24 0 1 2
+6668 6664 "stepsize" "real" 24 0 1 3
+6671 6670 "value" "double" 53 0 0 0
+6672 6670 "first" "double" 53 0 1 1
+6673 6670 "last" "double" 53 0 1 2
+6674 6670 "stepsize" "double" 53 0 1 3
+6677 6676 "value" "decimal" 10 2 0 0
+6678 6676 "first" "decimal" 10 2 1 1
+6679 6676 "last" "decimal" 10 2 1 2
+6680 6676 "stepsize" "decimal" 10 2 1 3
+6683 6682 "value" "timestamp" 7 0 0 0
+6684 6682 "first" "timestamp" 7 0 1 1
+6685 6682 "last" "timestamp" 7 0 1 2
+6686 6682 "stepsize" "sec_interval" 13 0 1 3
COMMIT;
START TRANSACTION;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
