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