cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not emit to regist the number of rows processed in copyto

Browse Source
This commit is contained in:
Daniel García Aubert 2018-06-13 20:06:35 +02:00
parent eb4ba60ba0
commit 5655f26fbd
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/copy_controller.js
View File

@ -74,12 +74,8 @@ function handleCopyTo (logger) {
res.header("Content-Disposition", `attachment; filename=${encodeURIComponent(filename)}`);
res.header("Content-Type", "application/octet-stream");
streamCopy.on('copy-to-end', rows => {
metrics.end(rows);
});
streamCopy.to(
function (err, pgstream, client, done) {
function (err, pgstream, copyToStream, client, done) {
if (err) {
return next(err);
}
@ -120,6 +116,8 @@ function handleCopyTo (logger) {
return next(err);
});
pgstream.on('end', () => metrics.end(copyToStream.rowCount));
pgstream
.on('data', data => metrics.addSize(data.length))
.pipe(res);

3
app/services/stream_copy.js
View File

@ -29,10 +29,9 @@ module.exports = class StreamCopy extends EventEmitter {
})
.on('end', () => {
done();
this.emit('copy-to-end', copyToStream.rowCount);
});
cb(null, pgstream, client, done);
cb(null, pgstream, copyToStream, client, done);
});
}