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

copy from: removing copyFromStream dependency

Browse Source
This commit is contained in:
Simon Martín 2018-06-21 14:38:22 +02:00
parent 01eff0a5a2
commit 9970052e1b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/copy_controller.js
View File

@ -109,7 +109,7 @@ function handleCopyFrom (logger) {
const metrics = new StreamCopyMetrics(logger, 'copyfrom', sql, user, isGzip); const metrics = new StreamCopyMetrics(logger, 'copyfrom', sql, user, isGzip);
streamCopy.from( streamCopy.from(
function (err, pgstream, copyFromStream) { function (err, pgstream) {
if (err) { if (err) {
return next(err); return next(err);
} }
@ -139,7 +139,7 @@ function handleCopyFrom (logger) {
return next(err); return next(err);
}) })
.on('end', () => { .on('end', () => {
metrics.end(copyFromStream.rowCount); metrics.end( streamCopy.getRowCount(StreamCopy.ACTION_FROM) );
const { time, rows } = metrics; const { time, rows } = metrics;

2
app/services/stream_copy.js
View File

@ -65,7 +65,7 @@ module.exports = class StreamCopy {
client.connection.sendCopyFail('CARTO SQL API: Connection closed by client'); client.connection.sendCopyFail('CARTO SQL API: Connection closed by client');
}); });
cb(null, pgstream, copyFromStream); cb(null, pgstream);
}); });
} }