Changeset: ef693f72e037 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ef693f72e037
Modified Files:
sql/backends/monet5/sql.c
Branch: default
Log Message:
Merge with Jul2021 branch.
diffs (truncated from 316 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
@@ -2638,10 +2638,10 @@ mvc_export_table_wrap( Client cntxt, Mal
if ((sz = mnstr_readline(m->scanner.rs->s, buf, sizeof(buf))) >
1) {
/* non-empty line indicates failure on client */
msg = createException(IO, "streams.open", "%s", buf);
- /* deal with ridiculously long response from client */
- while (buf[sz - 1] != '\n' &&
- (sz = mnstr_readline(m->scanner.rs->s, buf,
sizeof(buf))) > 0)
- ;
+ /* discard until client flushes */
+ while (mnstr_read(m->scanner.rs->s, buf, 1,
sizeof(buf)) > 0) {
+ /* ignore remainder of error message */
+ }
goto wrapup_result_set1;
}
}
@@ -2869,10 +2869,10 @@ mvc_export_row_wrap( Client cntxt, MalBl
if ((sz = mnstr_readline(m->scanner.rs->s, buf, sizeof(buf))) >
1) {
/* non-empty line indicates failure on client */
msg = createException(IO, "streams.open", "%s", buf);
- /* deal with ridiculously long response from client */
- while (buf[sz - 1] != '\n' &&
- (sz = mnstr_readline(m->scanner.rs->s, buf,
sizeof(buf))) > 0)
- ;
+ /* discard until client flushes */
+ while (mnstr_read(m->scanner.rs->s, buf, 1,
sizeof(buf)) > 0) {
+ /* ignore remainder of error message */
+ }
goto wrapup_result_set;
}
}
@@ -4626,10 +4626,10 @@ SQLhot_snapshot_wrap(Client cntxt, MalBl
if ((sz = mnstr_readline(mvc->scanner.rs->s, buf, sizeof(buf))) > 1) {
/* non-empty line indicates failure on client */
msg = createException(IO, "streams.open", "%s", buf);
- /* deal with ridiculously long response from client */
- while (buf[sz - 1] != '\n' &&
- (sz = mnstr_readline(mvc->scanner.rs->s, buf,
sizeof(buf))) > 0)
- ;
+ /* discard until client flushes */
+ while (mnstr_read(mvc->scanner.rs->s, buf, 1,
sizeof(buf)) > 0) {
+ /* ignore remainder of error message */
+ }
goto end;
}
diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/All
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/All
--- a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/All
+++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/All
@@ -1,3 +1,2 @@
HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVHGECHAINRELEMPTY&!NOWAL?upgrade
-RELEASERUN?package
KNOWNFAIL?check
diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/package.py
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/package.py
deleted file mode 100644
--- a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/package.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import os, sys, zipfile
-
-dbfarm = os.environ['GDK_DBFARM']
-db = os.path.join(dbfarm, os.environ['TSTDB'])
-archive = os.path.join(dbfarm, 'prevhgechainrelempty.zip')
-rev = os.getenv('REVISION')
-
-if not os.path.exists(db):
- print('database directory %s does not exist' % db, file=sys.stderr)
- sys.exit(1)
-
-try:
- f = open(os.path.join(db, 'bat', 'BACKUP', 'SUBCOMMIT', 'BBP.dir'), 'r')
-except IOError:
- try:
- f = open(os.path.join(db, 'bat', 'BACKUP', 'BBP.dir'), 'r')
- except IOError:
- f = open(os.path.join(db, 'bat', 'BBP.dir'), 'r')
-hdr = f.readline()
-ptroid = f.readline()
-ptr, oid, hge = ptroid.split()
-f.close()
-
-z = zipfile.ZipFile(archive)
-comment = z.comment
-z.close()
-
-try:
- # try to create compressed zip file
- z = zipfile.ZipFile(os.path.join(dbfarm, 'newhgechainrelempty.zip'), 'w',
- zipfile.ZIP_DEFLATED)
-except RuntimeError:
- # if that fails, create uncompressed zip file
- z = zipfile.ZipFile(os.path.join(dbfarm, 'newhgechainrelempty.zip'), 'w')
-
-if rev:
- revcomment = ' (hg id %s)' % rev
-else:
- revcomment = ''
-if hge == '16' and b'largest integer size 16' not in comment:
- revcomment = ' with largest integer size 16' + revcomment
-z.comment = comment + ('Chained on host %s%s.\n' % (os.getenv('HOSTNAME',
'unknown'), revcomment)).encode('utf-8')
-
-for root, dirs, files in os.walk(db):
- for f in files:
- ff = os.path.join(root, f)
- z.write(ff, ff[len(db) + len(os.sep):].replace(os.sep, '/'))
-
-z.close()
diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/package.reqtests
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/package.reqtests
deleted file mode 100644
--- a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/package.reqtests
+++ /dev/null
@@ -1,1 +0,0 @@
-upgrade
diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/All
b/sql/test/emptydb-previous-upgrade-chain/Tests/All
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/All
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/All
@@ -1,3 +1,2 @@
HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVCHAINRELEMPTY&!NOWAL?upgrade
-RELEASERUN&!HAVE_HGE?package
KNOWNFAIL?check
diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/package.py
b/sql/test/emptydb-previous-upgrade-chain/Tests/package.py
deleted file mode 100644
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/package.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import os, sys, zipfile
-
-dbfarm = os.environ['GDK_DBFARM']
-db = os.path.join(dbfarm, os.environ['TSTDB'])
-archive = os.path.join(dbfarm, 'prevchainrelempty.zip')
-rev = os.getenv('REVISION')
-
-if not os.path.exists(db):
- print('database directory %s does not exist' % db, file=sys.stderr)
- sys.exit(1)
-
-try:
- f = open(os.path.join(db, 'bat', 'BACKUP', 'SUBCOMMIT', 'BBP.dir'), 'r')
-except IOError:
- try:
- f = open(os.path.join(db, 'bat', 'BACKUP', 'BBP.dir'), 'r')
- except IOError:
- f = open(os.path.join(db, 'bat', 'BBP.dir'), 'r')
-hdr = f.readline()
-ptroid = f.readline()
-ptr, oid, hge = ptroid.split()
-f.close()
-
-z = zipfile.ZipFile(archive)
-comment = z.comment
-z.close()
-
-try:
- # try to create compressed zip file
- z = zipfile.ZipFile(os.path.join(dbfarm, 'newchainrelempty.zip'), 'w',
- zipfile.ZIP_DEFLATED)
-except RuntimeError:
- # if that fails, create uncompressed zip file
- z = zipfile.ZipFile(os.path.join(dbfarm, 'newchainrelempty.zip'), 'w')
-
-if rev:
- revcomment = ' (hg id %s)' % rev
-else:
- revcomment = ''
-if hge == '16' and b'largest integer size 16' not in comment:
- revcomment = ' with largest integer size 16' + revcomment
-z.comment = comment + ('Chained on host %s%s.\n' % (os.getenv('HOSTNAME',
'unknown'), revcomment)).encode('utf-8')
-
-for root, dirs, files in os.walk(db):
- for f in files:
- ff = os.path.join(root, f)
- z.write(ff, ff[len(db) + len(os.sep):].replace(os.sep, '/'))
-
-z.close()
diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/package.reqtests
b/sql/test/emptydb-previous-upgrade-chain/Tests/package.reqtests
deleted file mode 100644
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/package.reqtests
+++ /dev/null
@@ -1,1 +0,0 @@
-upgrade
diff --git a/sql/test/testdb-previous-upgrade-chain-hge/Tests/All
b/sql/test/testdb-previous-upgrade-chain-hge/Tests/All
--- a/sql/test/testdb-previous-upgrade-chain-hge/Tests/All
+++ b/sql/test/testdb-previous-upgrade-chain-hge/Tests/All
@@ -1,3 +1,2 @@
HAVE_HGE&HAVE_GEOM&PREVHGECHAINREL&!NOWAL?upgrade
-RELEASERUN?package
dump
diff --git a/sql/test/testdb-previous-upgrade-chain-hge/Tests/package.py
b/sql/test/testdb-previous-upgrade-chain-hge/Tests/package.py
deleted file mode 100644
--- a/sql/test/testdb-previous-upgrade-chain-hge/Tests/package.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import os, sys, zipfile
-
-dbfarm = os.environ['GDK_DBFARM']
-db = os.path.join(dbfarm, os.environ['TSTDB'])
-archive = os.path.join(dbfarm, 'prevhgechainrel.zip')
-rev = os.getenv('REVISION')
-
-if not os.path.exists(db):
- print('database directory %s does not exist' % db, file=sys.stderr)
- sys.exit(1)
-
-try:
- f = open(os.path.join(db, 'bat', 'BACKUP', 'SUBCOMMIT', 'BBP.dir'), 'r')
-except IOError:
- try:
- f = open(os.path.join(db, 'bat', 'BACKUP', 'BBP.dir'), 'r')
- except IOError:
- f = open(os.path.join(db, 'bat', 'BBP.dir'), 'r')
-hdr = f.readline()
-ptroid = f.readline()
-ptr, oid, hge = ptroid.split()
-f.close()
-
-z = zipfile.ZipFile(archive)
-comment = z.comment
-z.close()
-
-try:
- # try to create compressed zip file
- z = zipfile.ZipFile(os.path.join(dbfarm, 'newhgechainrel.zip'), 'w',
- zipfile.ZIP_DEFLATED)
-except RuntimeError:
- # if that fails, create uncompressed zip file
- z = zipfile.ZipFile(os.path.join(dbfarm, 'newhgechainrel.zip'), 'w')
-
-if rev:
- revcomment = ' (hg id %s)' % rev
-else:
- revcomment = ''
-if hge == '16' and b'largest integer size 16' not in comment:
- revcomment = ' with largest integer size 16' + revcomment
-z.comment = comment + ('Chained on host %s%s.\n' % (os.getenv('HOSTNAME',
'unknown'), revcomment)).encode('utf-8')
-
-for root, dirs, files in os.walk(db):
- for f in files:
- ff = os.path.join(root, f)
- z.write(ff, ff[len(db) + len(os.sep):].replace(os.sep, '/'))
-
-z.close()
diff --git a/sql/test/testdb-previous-upgrade-chain-hge/Tests/package.reqtests
b/sql/test/testdb-previous-upgrade-chain-hge/Tests/package.reqtests
deleted file mode 100644
--- a/sql/test/testdb-previous-upgrade-chain-hge/Tests/package.reqtests
+++ /dev/null
@@ -1,1 +0,0 @@
-upgrade
diff --git a/sql/test/testdb-previous-upgrade-chain/Tests/All
b/sql/test/testdb-previous-upgrade-chain/Tests/All
--- a/sql/test/testdb-previous-upgrade-chain/Tests/All
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/All
@@ -1,3 +1,2 @@
HAVE_GEOM&PREVCHAINREL&!NOWAL?upgrade
-RELEASERUN&!HAVE_HGE?package
dump
diff --git a/sql/test/testdb-previous-upgrade-chain/Tests/package.py
b/sql/test/testdb-previous-upgrade-chain/Tests/package.py
deleted file mode 100644
--- a/sql/test/testdb-previous-upgrade-chain/Tests/package.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import os, sys, zipfile
-
-dbfarm = os.environ['GDK_DBFARM']
-db = os.path.join(dbfarm, os.environ['TSTDB'])
-archive = os.path.join(dbfarm, 'prevchainrel.zip')
-rev = os.getenv('REVISION')
-
-if not os.path.exists(db):
- print('database directory %s does not exist' % db, file=sys.stderr)
- sys.exit(1)
-
-try:
- f = open(os.path.join(db, 'bat', 'BACKUP', 'SUBCOMMIT', 'BBP.dir'), 'r')
-except IOError:
- try:
- f = open(os.path.join(db, 'bat', 'BACKUP', 'BBP.dir'), 'r')
- except IOError:
- f = open(os.path.join(db, 'bat', 'BBP.dir'), 'r')
-hdr = f.readline()
-ptroid = f.readline()
-ptr, oid, hge = ptroid.split()
-f.close()
-
-z = zipfile.ZipFile(archive)
-comment = z.comment
-z.close()
-
-try:
- # try to create compressed zip file
- z = zipfile.ZipFile(os.path.join(dbfarm, 'newchainrel.zip'), 'w',
- zipfile.ZIP_DEFLATED)
-except RuntimeError:
- # if that fails, create uncompressed zip file
- z = zipfile.ZipFile(os.path.join(dbfarm, 'newchainrel.zip'), 'w')
-
-if rev:
- revcomment = ' (hg id %s)' % rev
-else:
- revcomment = ''
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
