Changeset: 689992075618 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=689992075618
Modified Files:
common/stream/stream.c
sql/storage/bat/bat_logger.c
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: resultset
Log Message:
Merge with default branch.
diffs (124 lines):
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -762,10 +762,11 @@ open_stream(const char *filename, const
s->fgetpos = file_fgetpos;
s->fsetpos = file_fsetpos;
s->stream_data.p = (void *) fp;
- /* if file is opened for reading, and it starts with the UTF-8
- * encoding of the Unicode Byte Order Mark, skip the mark, and
- * mark the stream as being a UTF-8 stream */
+ /* if a text file is opened for reading, and it starts with
+ * the UTF-8 encoding of the Unicode Byte Order Mark, skip the
+ * mark, and mark the stream as being a UTF-8 stream */
if (flags[0] == 'r' &&
+ flags[1] != 'b' &&
file_fgetpos(s, &pos) == 0) {
if (file_read(s, buf, 1, UTF8BOMLENGTH) == UTF8BOMLENGTH &&
strncmp(buf, UTF8BOM, UTF8BOMLENGTH) == 0)
@@ -886,7 +887,7 @@ open_gzstream(const char *filename, cons
s->close = stream_gzclose;
s->flush = stream_gzflush;
s->stream_data.p = (void *) fp;
- if (flags[0] == 'r') {
+ if (flags[0] == 'r' && flags[1] != 'b') {
char buf[UTF8BOMLENGTH];
if (gzread(fp, buf, UTF8BOMLENGTH) == UTF8BOMLENGTH &&
strncmp(buf, UTF8BOM, UTF8BOMLENGTH) == 0) {
@@ -1090,7 +1091,7 @@ open_bzstream(const char *filename, cons
s->close = stream_bzclose;
s->flush = NULL;
s->stream_data.p = (void *) bzp;
- if (strchr(flags, 'r') != NULL) {
+ if (flags[0] == 'r' && flags[1] != 'b') {
s->access = ST_READ;
bzp->b = BZ2_bzReadOpen(&err, bzp->f, 0, 0, NULL, 0);
if (err == BZ_STREAM_END) {
diff --git a/sql/storage/bat/bat_logger.c b/sql/storage/bat/bat_logger.c
--- a/sql/storage/bat/bat_logger.c
+++ b/sql/storage/bat/bat_logger.c
@@ -46,7 +46,7 @@ static void
bl_postversion( void *lg)
{
(void)lg;
- if (catalog_version == CATALOG_OCT2014) {
+ if (catalog_version <= CATALOG_OCT2014) {
BAT *te, *tn, *tne;
BATiter tei, tni;
char *s = "sys", n[64];
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -174,6 +174,15 @@ create table sys.statistics(
minval string,
maxval string,
sorted boolean);
+drop all procedure sys.analyze;
+create procedure analyze(minmax int, "sample" bigint)
+external name sql.analyze;
+create procedure analyze(minmax int, "sample" bigint,sch string)
+external name sql.analyze;
+create procedure analyze(minmax int, "sample" bigint,sch string, tbl string)
+external name sql.analyze;
+create procedure analyze(minmax int, "sample" bigint,sch string, tbl string,
col string)
+external name sql.analyze;
drop view sys.querylog_history;
drop view sys.querylog_calls;
drop function sys.querylog_calls;
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -226,6 +226,15 @@ create table sys.statistics(
minval string,
maxval string,
sorted boolean);
+drop all procedure sys.analyze;
+create procedure analyze(minmax int, "sample" bigint)
+external name sql.analyze;
+create procedure analyze(minmax int, "sample" bigint,sch string)
+external name sql.analyze;
+create procedure analyze(minmax int, "sample" bigint,sch string, tbl string)
+external name sql.analyze;
+create procedure analyze(minmax int, "sample" bigint,sch string, tbl string,
col string)
+external name sql.analyze;
drop view sys.querylog_history;
drop view sys.querylog_calls;
drop function sys.querylog_calls;
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
@@ -171,6 +171,15 @@ create table sys.statistics(
minval string,
maxval string,
sorted boolean);
+drop all procedure sys.analyze;
+create procedure analyze(minmax int, "sample" bigint)
+external name sql.analyze;
+create procedure analyze(minmax int, "sample" bigint,sch string)
+external name sql.analyze;
+create procedure analyze(minmax int, "sample" bigint,sch string, tbl string)
+external name sql.analyze;
+create procedure analyze(minmax int, "sample" bigint,sch string, tbl string,
col string)
+external name sql.analyze;
drop view sys.querylog_history;
drop view sys.querylog_calls;
drop function sys.querylog_calls;
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
@@ -223,6 +223,15 @@ create table sys.statistics(
minval string,
maxval string,
sorted boolean);
+drop all procedure sys.analyze;
+create procedure analyze(minmax int, "sample" bigint)
+external name sql.analyze;
+create procedure analyze(minmax int, "sample" bigint,sch string)
+external name sql.analyze;
+create procedure analyze(minmax int, "sample" bigint,sch string, tbl string)
+external name sql.analyze;
+create procedure analyze(minmax int, "sample" bigint,sch string, tbl string,
col string)
+external name sql.analyze;
drop view sys.querylog_history;
drop view sys.querylog_calls;
drop function sys.querylog_calls;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
