提交 b160245c 编写于 作者: S Serge Rider

#7352 Make startTimestamp shared among all pipes


Former-commit-id: 49be72ae
上级 51bc39c4
......@@ -19,6 +19,8 @@ package org.jkiss.dbeaver.tools.transfer;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.tools.transfer.registry.DataTransferProcessorDescriptor;
import java.util.Date;
/**
* Data transfer pipe is tuple of produces and consumer
*/
......@@ -66,6 +68,7 @@ public class DataTransferPipe {
processorDescriptor != null && processorDescriptor.isHTMLFormat());
parameters.orderNumber = pipeIndex;
parameters.totalConsumers = totalPipes;
parameters.startTimestamp = new Date();
consumer.initTransfer(
producer.getDatabaseObject(),
consumerSettings,
......
......@@ -21,6 +21,7 @@ import org.jkiss.dbeaver.model.data.DBDDataReceiver;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSObject;
import java.util.Date;
import java.util.Map;
/**
......@@ -34,6 +35,7 @@ public interface IDataTransferConsumer<SETTINGS extends IDataTransferSettings, P
public int totalConsumers;
public boolean isBinary;
public boolean isHTML;
public Date startTimestamp;
public TransferParameters() {
}
......
......@@ -100,7 +100,6 @@ public class StreamTransferConsumer implements IDataTransferConsumer<StreamConsu
private StringWriter outputBuffer;
private boolean initialized = false;
private TransferParameters parameters;
private Date startTimestamp;
public StreamTransferConsumer() {
}
......@@ -250,8 +249,6 @@ public class StreamTransferConsumer implements IDataTransferConsumer<StreamConsu
} catch (DBException e) {
throw new DBCException("Can't initialize data exporter", e);
}
startTimestamp = new Date();
}
private void closeExporter() {
......@@ -490,9 +487,9 @@ public class StreamTransferConsumer implements IDataTransferConsumer<StreamConsu
}
case VARIABLE_TIMESTAMP:
Date ts;
if (startTimestamp != null) {
if (parameters.startTimestamp != null) {
// Use saved timestamp (#7352)
ts = startTimestamp;
ts = parameters.startTimestamp;
} else {
ts = new Date();
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册