|
@@ -22,11 +22,7 @@ import org.dbsyncer.manager.config.FieldPicker;
|
|
import org.dbsyncer.parser.Parser;
|
|
import org.dbsyncer.parser.Parser;
|
|
import org.dbsyncer.parser.logger.LogService;
|
|
import org.dbsyncer.parser.logger.LogService;
|
|
import org.dbsyncer.parser.logger.LogType;
|
|
import org.dbsyncer.parser.logger.LogType;
|
|
-import org.dbsyncer.parser.model.Connector;
|
|
|
|
-import org.dbsyncer.parser.model.Mapping;
|
|
|
|
-import org.dbsyncer.parser.model.Meta;
|
|
|
|
-import org.dbsyncer.parser.model.Picker;
|
|
|
|
-import org.dbsyncer.parser.model.TableGroup;
|
|
|
|
|
|
+import org.dbsyncer.parser.model.*;
|
|
import org.dbsyncer.parser.util.PickerUtil;
|
|
import org.dbsyncer.parser.util.PickerUtil;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -147,7 +143,7 @@ public class IncrementPuller extends AbstractPuller implements ScheduledTaskJob
|
|
AbstractQuartzExtractor extractor = listener.getExtractor(ListenerTypeEnum.TIMING, connectorConfig.getConnectorType(), AbstractQuartzExtractor.class);
|
|
AbstractQuartzExtractor extractor = listener.getExtractor(ListenerTypeEnum.TIMING, connectorConfig.getConnectorType(), AbstractQuartzExtractor.class);
|
|
extractor.setCommands(list.stream().map(t -> {
|
|
extractor.setCommands(list.stream().map(t -> {
|
|
Picker picker = new Picker(t.getFieldMapping());
|
|
Picker picker = new Picker(t.getFieldMapping());
|
|
- return new TableGroupCommand(picker.getSourcePrimaryKeyName(), t.getCommand());
|
|
|
|
|
|
+ return new TableGroupCommand(picker.getSourcePrimaryKeyName(connectorConfig), t.getCommand());
|
|
}).collect(Collectors.toList()));
|
|
}).collect(Collectors.toList()));
|
|
setExtractorConfig(extractor, connectorConfig, listenerConfig, meta.getSnapshot(), new QuartzListener(mapping, list));
|
|
setExtractorConfig(extractor, connectorConfig, listenerConfig, meta.getSnapshot(), new QuartzListener(mapping, list));
|
|
return extractor;
|
|
return extractor;
|