MonetDB: data-vaults - Merge with default
Changeset: f671f5bf7181 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f671f5bf7181 Added Files: ChangeLog.Mar2018 README-Debian README-Fedora buildtools/ChangeLog.Mar2018 clients/ChangeLog.Mar2018 clients/mapilib/ChangeLog.Mar2018 common/stream/ChangeLog.Mar2018 gdk/ChangeLog.Mar2018 geom/ChangeLog.Mar2018 monetdb5/ChangeLog.Mar2018 sql/ChangeLog.Mar2018 sql/scripts/21_dependency_views.sql sql/scripts/97_comments.sql sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64 sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64 sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out.single sql/test/BugTracker-2018/Tests/All sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.sql sql/test/BugTracker-2018/Tests/case_with_orderby_limit.Bug-6512.sql sql/test/BugTracker-2018/Tests/case_with_orderby_limit.Bug-6512.stable.err sql/test/BugTracker-2018/Tests/case_with_orderby_limit.Bug-6512.stable.out sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.sql sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.stable.err sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.stable.out sql/test/BugTracker-2018/Tests/crash-orderby-alias.Bug-6527.sql sql/test/BugTracker-2018/Tests/crash-orderby-alias.Bug-6527.stable.err sql/test/BugTracker-2018/Tests/crash-orderby-alias.Bug-6527.stable.out sql/test/BugTracker-2018/Tests/insert-null-second-interval-0.Bug-6515.sql sql/test/BugTracker-2018/Tests/insert-null-second-interval-0.Bug-6515.stable.err sql/test/BugTracker-2018/Tests/insert-null-second-interval-0.Bug-6515.stable.out sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.sql sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.stable.err sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-join-not-in.Bug-6519.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-join-not-in.Bug-6519.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-algebra-join-not-in.Bug-6519.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-bat-undefined.Bug-6516.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-bat-undefined.Bug-6516.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-bat-undefined.Bug-6516.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-count-not-in.Bug-6518.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-count-not-in.Bug-6518.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-count-not-in.Bug-6518.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-group-by-having-in-count.Bug-6524.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-group-by-having-in-count.Bug-6524.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-group-by-having-in-count.Bug-6524.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-in-cast-null.Bug-6529.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-overflow-in-conversion.Bug-6517.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-overflow-in-conversion.Bug-6517.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-overflow-in-conversion.Bug-6517.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-select-range-null.Bug-6514.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-select-range-null.Bug-6514.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-select-range-null.Bug-6514.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-aggregation-count.Bug-6510.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-aggregation-count.Bug-6510.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-aggregation-count.Bug-6510.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-mal-function-generation.Bug-6513.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-mal-function-generation.Bug-6513.stable.err sql/test/
MonetDB: Mar2018 - Corrected BNF syntax
Changeset: 12765f2438ba for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=12765f2438ba
Modified Files:
clients/mapiclient/mhelp.c
sql/ChangeLog.Mar2018
Branch: Mar2018
Log Message:
Corrected BNF syntax
diffs (32 lines):
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -95,9 +95,9 @@ SQLhelp sqlhelp[] = {
"See also
https://www.monetdb.org/Documentation/SQLreference/Flowofcontrol"},
{"COMMENT",
"Add, update or remove a comment or description for a database object",
-"COMMENT ON [ SCHEMA | TABLE | VIEW | COLUMN | INDEX | SEQUENCE |\n"
-" FUNCTION | PROCEDURE | AGGREGATE | FILTER FUNCTION |
LOADER ]\n"
-" qname IS [ 'my description text' | NULL | '' ]",
+"COMMENT ON { SCHEMA | TABLE | VIEW | COLUMN | INDEX | SEQUENCE |\n"
+" FUNCTION | PROCEDURE | AGGREGATE | FILTER FUNCTION |
LOADER }\n"
+" qname IS { 'my description text' | NULL | '' }",
NULL,
NULL},
{"COMMIT",
diff --git a/sql/ChangeLog.Mar2018 b/sql/ChangeLog.Mar2018
--- a/sql/ChangeLog.Mar2018
+++ b/sql/ChangeLog.Mar2018
@@ -17,9 +17,9 @@
* Fri Jan 12 2018 Joeri van Ruth
- Added support for COMMENT ON statements using SQL syntax:
- COMMENT ON [ SCHEMA | TABLE | VIEW | COLUMN | INDEX | SEQUENCE |
- FUNCTION | PROCEDURE | AGGREGATE | FILTER FUNCTION | LOADER ]
-qname IS [ 'my description text' | NULL | '' ] ;
+ COMMENT ON { SCHEMA | TABLE | VIEW | COLUMN | INDEX | SEQUENCE |
+ FUNCTION | PROCEDURE | AGGREGATE | FILTER FUNCTION | LOADER }
+qname IS { 'my description text' | NULL | '' } ;
For COLUMN the qname can be "table_name"."column_name" or fully qualified
as in: "schema_name"."table_name"."column_name".
For FUNCTION, PROCEDURE, AGGREGATE, FILTER FUNCTION and LOADER the qname
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
monetdb-java: default - Reduce memory consumption in TupleLinePa...
Changeset: c6abd650aeb4 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java?cmd=changeset;node=c6abd650aeb4
Modified Files:
src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
src/main/java/nl/cwi/monetdb/mcl/parser/MCLParser.java
Branch: default
Log Message:
Reduce memory consumption in TupleLineParser which is a subclass of MCLParser.
The intValues[] is only used and needed in the HeaderLineParser, hence moved it
from superclass MCLParser to subclass HeaderLineParser.
diffs (109 lines):
diff --git a/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
b/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
--- a/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
+++ b/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
@@ -17,12 +17,14 @@ package nl.cwi.monetdb.mcl.parser;
* @author Fabian Groffen
*/
public class HeaderLineParser extends MCLParser {
- private int type;
+ /* types of meta data supported by MCL protocol */
+ public final static int NAME = 1; // name of column
+ public final static int LENGTH = 2;
+ public final static int TABLE = 3; // may include the schema name
+ public final static int TYPE = 4;
- public final static int NAME = 1;
- public final static int LENGTH = 2;
- public final static int TABLE = 3;
- public final static int TYPE = 4;
+/** The int values found while parsing. Public, you may touch it. */
+ public final int intValues[];
/**
* Constructs a HeaderLineParser which expects columncount columns.
@@ -31,6 +33,7 @@ public class HeaderLineParser extends MC
*/
public HeaderLineParser(int columncount) {
super(columncount);
+ intValues = new int[columncount];
}
/**
@@ -53,6 +56,7 @@ public class HeaderLineParser extends MC
int pos = 0;
boolean foundChar = false;
boolean nameFound = false;
+
// find header name searching from the end of the line
for (int i = len - 1; i >= 0; i--) {
switch (chrLine[i]) {
@@ -83,6 +87,7 @@ public class HeaderLineParser extends MC
throw new MCLParseException("invalid header, no header
name found", pos);
// depending on the name of the header, we continue
+ int type = 0;
switch (chrLine[pos]) {
case 'n':
if (len - pos == 4 && source.regionMatches(pos
+ 1, "name", 1, 3)) {
diff --git a/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParser.java
b/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParser.java
--- a/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParser.java
+++ b/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParser.java
@@ -26,9 +26,7 @@ package nl.cwi.monetdb.mcl.parser;
public abstract class MCLParser {
/** The String values found while parsing. Public, you may touch it. */
public final String values[];
- /** The int values found while parsing. Public, you may touch it. */
- public final int intValues[];
- private int colnr;
+ protected int colnr;
/**
* Creates an MCLParser targetted at a given number of field values.
@@ -39,7 +37,6 @@ public abstract class MCLParser {
*/
protected MCLParser(int capacity) {
values = new String[capacity];
- intValues = new int[capacity];
}
/**
@@ -51,7 +48,6 @@ public abstract class MCLParser {
* @throws MCLParseException if source cannot be (fully) parsed by
* this parser
* @see #next()
-* @see #nextInt()
* @see #hasNext()
*/
abstract public int parse(String source) throws MCLParseException;
@@ -70,7 +66,6 @@ public abstract class MCLParser {
* @return true if the next call to next() or nextInt() is bound to
* succeed
* @see #next()
-* @see #nextInt()
*/
final public boolean hasNext() {
return colnr < values.length;
@@ -83,23 +78,9 @@ public abstract class MCLParser {
* determine if the call to next() will succeed.
*
* @return the current field value
-* @see #nextInt()
* @see #hasNext()
*/
final public String next() {
return values[colnr++];
}
-
- /**
-* Returns the current field value as integer, and advances the
-* field counter to the next value. This method has the same
-* characteristics as the next() method, apart from returning the
-* field value as an integer.
-*
-* @return the current field value as integer
-* @see #next()
-*/
- final public int nextInt() {
- return intValues[colnr++];
- }
}
MonetDB: merge-partitions - First steps into merge tables partit...
Changeset: 353bbbcccaf4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=353bbbcccaf4
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cat.c
sql/include/sql_catalog.h
sql/server/rel_psm.c
sql/server/rel_schema.c
sql/server/rel_schema.h
sql/server/sql_parser.h
sql/server/sql_parser.y
sql/storage/store.c
Branch: merge-partitions
Log Message:
First steps into merge tables partitions by column using list or range of values
diffs (truncated from 421 to 300 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -331,10 +331,12 @@ create_table_or_view(mvc *sql, char *sna
nt = sql_trans_create_table(sql->session->tr, s, t->base.name,
t->query, t->type, t->system, temp, t->commit_action, t->sz);
for (n = t->columns.set->h; n; n = n->next) {
- sql_column *c = n->data;
- if (mvc_copy_column(sql, nt, c) == NULL)
+ sql_column *c = n->data, *copied = mvc_copy_column(sql, nt, c);
+
+ if (copied == NULL)
throw(SQL, "sql.catalog", SQLSTATE(42000) "CREATE
TABLE: %s_%s_%s conflicts", s->base.name, t->base.name, c->base.name);
-
+ if(c == t->part)
+ nt->part = copied;
}
if (t->idxs.set) {
for (n = t->idxs.set->h; n; n = n->next) {
diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c
--- a/sql/backends/monet5/sql_cat.c
+++ b/sql/backends/monet5/sql_cat.c
@@ -163,7 +163,7 @@ alter_table_set_access(mvc *sql, char *s
if (s)
t = mvc_bind_table(sql, s, tname);
if (t) {
- if (t->type == tt_merge_table)
+ if (isMergeTable(t))
throw(SQL,"sql.alter_table_set_access",SQLSTATE(42S02)
"ALTER TABLE: read only MERGE TABLES are not supported");
if (t->access != access) {
if (access && table_has_updates(sql->session->tr, t))
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -103,6 +103,10 @@
#define EXCLUDE_TIES 3
#define EXCLUDE_NO_OTHERS 4
+#define PARTITION_NONE 0
+#define PARTITION_RANGE 1
+#define PARTITION_LIST 2
+
#define cur_user 1
#define cur_role 2
@@ -122,7 +126,9 @@ typedef enum temp_t {
SQL_MERGE_TABLE = 4,
SQL_STREAM = 5,
SQL_REMOTE = 6,
- SQL_REPLICA_TABLE = 7
+ SQL_REPLICA_TABLE = 7,
+ SQL_MERGE_LIST_PARTITION = 8,
+ SQL_MERGE_RANGE_PARTITION = 9
} temp_t;
typedef enum comp_type {
@@ -478,12 +484,14 @@ typedef enum table_types {
tt_merge_table = 3, /* multiple tables form one table */
tt_stream = 4, /* stream */
tt_remote = 5, /* stored on a remote server */
- tt_replica_table = 6/* multiple replica of the same table */
+ tt_replica_table = 6, /* multiple replica of the same table */
+ tt_list_partition = 7,
+ tt_range_partition = 8
} table_types;
#define isTable(x) (x->type==tt_table)
#define isView(x)(x->type==tt_view)
-#define isMergeTable(x) (x->type==tt_merge_table)
+#define isMergeTable(x) (x->type==tt_merge_table ||
x->type==tt_list_partition || x->type==tt_range_partition)
#define isStream(x) (x->type==tt_stream)
#define isRemote(x) (x->type==tt_remote)
#define isReplicaTable(x) (x->type==tt_replica_table)
@@ -497,6 +505,13 @@ typedef enum table_types {
typedef struct sql_part {
sql_base base;
struct sql_table *t; /* cached value */
+ union {
+ bat values;
+ struct sql_range {
+ ptr *minvalue;
+ ptr *maxvalue;
+ } range;
+ };
} sql_part;
typedef struct sql_table {
@@ -522,6 +537,7 @@ typedef struct sql_table {
struct sql_schema *s;
struct sql_table *p;/* The table is part of this merge table */
struct sql_table *po; /* the outer transactions table */
+ struct sql_column *part; /* if it is partitioned on a column */
} sql_table;
typedef struct res_col {
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -214,7 +214,7 @@ rel_psm_declare_table(mvc *sql, dnode *n
assert(n->next->next->next->type == type_int);
- rel = rel_create_table(sql, cur_schema(sql), SQL_DECLARED_TABLE, NULL,
name, n->next->next->data.sym, n->next->next->next->data.i_val, NULL, 0);
+ rel = rel_create_table(sql, cur_schema(sql), SQL_DECLARED_TABLE, NULL,
name, n->next->next->data.sym, n->next->next->next->data.i_val, NULL, 0, NULL);
if (!rel || rel->op != op_ddl || rel->flag != DDL_CREATE_TABLE)
return NULL;
MonetDB: Mar2018 - Adding tests for bug 6543
Changeset: a590d416b444 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a590d416b444 Added Files: sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.sql sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.stable.err sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.stable.out sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.sql sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.stable.err sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.stable.out sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.sql sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.stable.err sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.stable.out Modified Files: sql/test/BugTracker-2018/Tests/All Branch: Mar2018 Log Message: Adding tests for bug 6543 diffs (truncated from 1176 to 300 lines): diff --git a/sql/test/BugTracker-2018/Tests/All b/sql/test/BugTracker-2018/Tests/All --- a/sql/test/BugTracker-2018/Tests/All +++ b/sql/test/BugTracker-2018/Tests/All @@ -18,3 +18,7 @@ crash-orderby-alias.Bug-6527 sqlitelogictest-in-cast-null.Bug-6529 sqlitelogictest-not-in-wrong-results.Bug-6530 copy-into-ignore-column-1.Bug-6532 +HAVE_NETCDF?truncate_sys_netcdf_tables.Bug-6543 +HAVE_SAMTOOLS?truncate_bam_tables.Bug-6543 +truncate_sys_tables.Bug-6543 + diff --git a/sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.sql b/sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.sql @@ -0,0 +1,20 @@ +SELECT (COUNT(*) > 0) AS has_rows FROM bam.sq; +TRUNCATE TABLE bam.sq; +SELECT (COUNT(*) > 0) AS has_rows FROM bam.sq; + +SELECT (COUNT(*) > 0) AS has_rows FROM bam.rg; +TRUNCATE TABLE bam.rg; +SELECT (COUNT(*) > 0) AS has_rows FROM bam.rg; + +SELECT (COUNT(*) > 0) AS has_rows FROM bam.pg; +TRUNCATE TABLE bam.pg; +SELECT (COUNT(*) > 0) AS has_rows FROM bam.pg; + +SELECT (COUNT(*) > 0) AS has_rows FROM bam.export; +TRUNCATE TABLE bam.export; +SELECT (COUNT(*) > 0) AS has_rows FROM bam.export; + +SELECT (COUNT(*) > 0) AS has_rows FROM bam.files; +TRUNCATE TABLE bam.files; +SELECT (COUNT(*) > 0) AS has_rows FROM bam.files; + diff --git a/sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.stable.err b/sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.stable.err @@ -0,0 +1,36 @@ +stderr of test 'truncate_bam_tables.Bug-6543` in directory 'sql/test/BugTracker-2018` itself: + + +# 17:33:22 > +# 17:33:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34912" "--set" "mapi_usock=/var/tmp/mtest-9315/.s.monetdb.34912" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2018" "--set" "embedded_r=yes" "--set" "embedded_py=true" +# 17:33:22 > + +# builtin opt gdk_dbpath = /export/scratch1/dinther/INSTALL/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 5 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 34912 +# cmdline opt mapi_usock = /var/tmp/mtest-9315/.s.monetdb.34912 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /export/scratch1/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2018 +# cmdline opt embedded_r = yes +# cmdline opt embedded_py = true +# cmdline opt gdk_debug = 553648138 + +# 17:33:23 > +# 17:33:23 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-9315" "--port=34912" +# 17:33:23 > + + +# 17:33:23 > +# 17:33:23 > "Done." +# 17:33:23 > + diff --git a/sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.stable.out b/sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.stable.out @@ -0,0 +1,145 @@ +stdout of test 'truncate_bam_tables.Bug-6543` in directory 'sql/test/BugTracker-2018` itself: + + +# 17:33:22 > +# 17:33:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34912" "--set" "mapi_usock=/var/tmp/mtest-9315/.s.monetdb.34912" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2018" "--set" "embedded_r=yes" "--set" "embedded_py=true" +# 17:33:22 > + +# MonetDB 5 server v11.29.0 +# This is an unreleased version
MonetDB: Mar2018 - Add test for bug 6542
Changeset: d3b3b1e73871 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d3b3b1e73871 Added Files: sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.sql sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.err sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out Modified Files: sql/test/BugTracker-2018/Tests/All Branch: Mar2018 Log Message: Add test for bug 6542 diffs (195 lines): diff --git a/sql/test/BugTracker-2018/Tests/All b/sql/test/BugTracker-2018/Tests/All --- a/sql/test/BugTracker-2018/Tests/All +++ b/sql/test/BugTracker-2018/Tests/All @@ -18,6 +18,7 @@ crash-orderby-alias.Bug-6527 sqlitelogictest-in-cast-null.Bug-6529 sqlitelogictest-not-in-wrong-results.Bug-6530 copy-into-ignore-column-1.Bug-6532 +count_from_commented_function_signatures.Bug-6542 HAVE_NETCDF?truncate_sys_netcdf_tables.Bug-6543 HAVE_SAMTOOLS?truncate_bam_tables.Bug-6543 truncate_sys_tables.Bug-6543 diff --git a/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.sql b/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.sql @@ -0,0 +1,5 @@ +select * from sys.commented_function_signatures; +plan select count (*) from sys.commented_function_signatures; +explain select count (*) from sys.commented_function_signatures; +select count (*) from sys.commented_function_signatures; + diff --git a/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.err b/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.err @@ -0,0 +1,36 @@ +stderr of test 'count_from_commented_function_signatures.Bug-6542` in directory 'sql/test/BugTracker-2018` itself: + + +# 18:36:35 > +# 18:36:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31049" "--set" "mapi_usock=/var/tmp/mtest-14549/.s.monetdb.31049" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2018" "--set" "embedded_r=yes" "--set" "embedded_py=true" +# 18:36:35 > + +# builtin opt gdk_dbpath = /export/scratch1/dinther/INSTALL/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 5 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 31049 +# cmdline opt mapi_usock = /var/tmp/mtest-14549/.s.monetdb.31049 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /export/scratch1/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2018 +# cmdline opt embedded_r = yes +# cmdline opt embedded_py = true +# cmdline opt gdk_debug = 553648138 + +# 18:36:35 > +# 18:36:35 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-14549" "--port=31049" +# 18:36:35 > + + +# 18:36:36 > +# 18:36:36 > "Done." +# 18:36:36 > + diff --git a/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out b/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out @@ -0,0 +1,128 @@ +stdout of test 'count_from_commented_function_signatures.Bug-6542` in directory 'sql/test/BugTracker-2018` itself: + + +# 18:36:35 > +# 18:36:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31049" "--set" "mapi_usock=/var/tmp/mtest-14549/.s.monetdb.31049" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2018" "--set" "embedded_r=yes" "--set" "embedded_py=true" +# 18:36:35 > + +# MonetDB 5 server v11.29.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2018', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 31.307 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://catskill.da.cwi.nl:31049/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-14549/.s.monetdb.31049 +# MonetDB
MonetDB: Mar2018 - Add test for bug 6544
Changeset: 5ac9ac5e4878 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5ac9ac5e4878
Added Files:
sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.sql
sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.stable.err
sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.stable.out
Modified Files:
sql/test/BugTracker-2018/Tests/All
Branch: Mar2018
Log Message:
Add test for bug 6544
diffs (273 lines):
diff --git a/sql/test/BugTracker-2018/Tests/All
b/sql/test/BugTracker-2018/Tests/All
--- a/sql/test/BugTracker-2018/Tests/All
+++ b/sql/test/BugTracker-2018/Tests/All
@@ -22,4 +22,5 @@ count_from_commented_function_signatures
HAVE_NETCDF?truncate_sys_netcdf_tables.Bug-6543
HAVE_SAMTOOLS?truncate_bam_tables.Bug-6543
truncate_sys_tables.Bug-6543
+truncate_empty_table.Bug-6544
diff --git a/sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.sql
b/sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.sql
@@ -0,0 +1,56 @@
+CREATE TABLE bam_files (
+ "file_id"BIGINTNOT NULL,
+ "file_location" CLOB NOT NULL,
+ "dbschema" SMALLINT NOT NULL,
+ "format_version" VARCHAR(7),
+ "sorting_order" VARCHAR(10),
+ "comments" CLOB,
+ CONSTRAINT "files_pkey_file_id" PRIMARY KEY ("file_id")
+);
+
+CREATE TABLE bam_sq (
+ "sn" CLOB NOT NULL,
+ "file_id" BIGINTNOT NULL,
+ "ln" INTEGER,
+ "as" INTEGER,
+ "m5" CLOB,
+ "sp" CLOB,
+ "ur" CLOB,
+ CONSTRAINT "sq_pkey_sn_file_id" PRIMARY KEY ("sn", "file_id"),
+ CONSTRAINT "sq_fkey_file_id" FOREIGN KEY ("file_id") REFERENCES
bam_files ("file_id")
+);
+
+CREATE TABLE bam_rg (
+ "id" CLOB NOT NULL,
+ "file_id" BIGINTNOT NULL,
+ "cn" CLOB,
+ "ds" CLOB,
+ "dt" TIMESTAMP(6),
+ "fo" CLOB,
+ "ks" CLOB,
+ "lb" CLOB,
+ "pg" CLOB,
+ "pi" INTEGER,
+ "pl" CLOB,
+ "pu" CLOB,
+ "sm" CLOB,
+ CONSTRAINT "rg_pkey_id_file_id" PRIMARY KEY ("id", "file_id"),
+ CONSTRAINT "rg_fkey_file_id" FOREIGN KEY ("file_id") REFERENCES
bam_files ("file_id")
+);
+
+SELECT COUNT(*) FROM bam_files;
+SELECT COUNT(*) FROM bam_sq;
+SELECT COUNT(*) FROM bam_rg;
+
+TRUNCATE TABLE bam_sq;
+TRUNCATE TABLE bam_rg;
+TRUNCATE TABLE bam_files;
+
+SELECT COUNT(*) FROM bam_files;
+SELECT COUNT(*) FROM bam_sq;
+SELECT COUNT(*) FROM bam_rg;
+
+DROP TABLE bam_sq;
+DROP TABLE bam_rg;
+DROP TABLE bam_files;
+
diff --git
a/sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.stable.err
b/sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'truncate_empty_table.Bug-6544` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 18:55:50 >
+# 18:55:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31296" "--set"
"mapi_usock=/var/tmp/mtest-15743/.s.monetdb.31296" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 18:55:50 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/dinther/INSTALL/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 5
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 31296
+# cmdline opt mapi_usock = /var/tmp/mtest-15743/.s.monetdb.31296
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/export/scratch1/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt embedded_r = yes
+# cmdline opt embedded_py = true
+# cmdline opt gdk_debug = 553648138
+
+# 18:55:50 >
+# 18:55:50 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-15743" "--port=31296"
+# 18:55:50 >
+
+
+# 18:55:50 >
+# 18:55:50 > "Done."
+# 18:55:50 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.stable.out
b/sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.stable.out
@@ -0,0 +1,157 @@
+stdout of test 'truncate_empty_table.Bug-6544` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 18:57:59 >
+
