Skip to content

Commit

Permalink
0003857: NodeService.findNode(...) (cached versus non-cached), where to
Browse files Browse the repository at this point in the history 
use correct one
  • Loading branch information
philipmarzullo committed Jan 17, 2019
1 parent 764fbfd commit 456427e
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion symmetric-core/src/main/java/org/jumpmind/symmetric/file/FileSyncZipDataWriter.java
View file
Expand Up @@ -145,7 +145,7 @@ public void write(CsvData data) {
snapshotEvents.add(snapshot);
} else if (eventType == DataEventType.RELOAD) {
String targetNodeId = context.getBatch().getTargetNodeId();
Node targetNode = nodeService.findNode(targetNodeId);
Node targetNode = nodeService.findNode(targetNodeId, true);
List<FileTriggerRouter> fileTriggerRouters = fileSyncService
.getFileTriggerRoutersForCurrentNode(false);
for (FileTriggerRouter fileTriggerRouter : fileTriggerRouters) {
Expand Down
14 changes: 7 additions & 7 deletions symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
View file
Expand Up @@ -634,7 +634,7 @@ public boolean extractOnlyOutgoingBatch(String nodeId, long batchId, Writer writ
if (Constants.UNROUTED_NODE_ID.equals(nodeId)) {
targetNode = new Node(nodeId, parameterService.getNodeGroupId());
} else {
targetNode = nodeService.findNode(nodeId);
targetNode = nodeService.findNode(nodeId, true);
}
if (targetNode != null) {
OutgoingBatch batch = outgoingBatchService.findOutgoingBatch(batchId, nodeId);
Expand Down Expand Up @@ -1447,7 +1447,7 @@ protected void transferFromStaging(ExtractMode mode, BatchType batchType, Outgoi
String line = null;
while ((line = reader.readLine()) != null) {
if (line.startsWith(CsvConstants.BATCH)) {
if (nodeService.findNode(batch.getNodeId()).isVersionGreaterThanOrEqualTo(3, 9, 0)) {
if (nodeService.findNode(batch.getNodeId(), true).isVersionGreaterThanOrEqualTo(3, 9, 0)) {
writer.write(getBatchStatsColumns());
writer.newLine();
writer.write(getBatchStats(batch));
Expand Down Expand Up @@ -1482,7 +1482,7 @@ protected void transferFromStaging(ExtractMode mode, BatchType batchType, Outgoi
boolean batchStatsWritten = false;
String prevBuffer = "";
while ((numCharsRead = reader.read(buffer)) != -1) {
if (!batchStatsWritten && nodeService.findNode(batch.getNodeId()).isVersionGreaterThanOrEqualTo(3, 9, 0)) {
if (!batchStatsWritten && nodeService.findNode(batch.getNodeId(), true).isVersionGreaterThanOrEqualTo(3, 9, 0)) {
batchStatsWritten = writeBatchStats(writer, buffer, numCharsRead, prevBuffer, batch);
prevBuffer = new String(buffer);
} else {
Expand Down Expand Up @@ -1702,7 +1702,7 @@ public boolean extractBatchRange(Writer writer, String nodeId, long startBatchId
for (long batchId = startBatchId; batchId <= endBatchId; batchId++) {
OutgoingBatch batch = outgoingBatchService.findOutgoingBatch(batchId, nodeId);
if (batch != null) {
Node targetNode = nodeService.findNode(nodeId);
Node targetNode = nodeService.findNode(nodeId, true);
if (targetNode == null && Constants.UNROUTED_NODE_ID.equals(nodeId)) {
targetNode = new Node();
targetNode.setNodeId("-1");
Expand Down Expand Up @@ -1732,7 +1732,7 @@ public boolean extractBatchRange(Writer writer, String nodeId, Date startBatchTi
startBatchTime, endBatchTime, channelIds);
List<OutgoingBatch> list = batches.getBatches();
for (OutgoingBatch outgoingBatch : list) {
Node targetNode = nodeService.findNode(nodeId);
Node targetNode = nodeService.findNode(nodeId, true);
if (targetNode == null && Constants.UNROUTED_NODE_ID.equals(nodeId)) {
targetNode = new Node();
targetNode.setNodeId("-1");
Expand Down Expand Up @@ -1981,7 +1981,7 @@ public void execute(NodeCommunication nodeCommunication, RemoteNodeStatus status
continue;
}
Node identity = nodeService.findIdentity();
Node targetNode = nodeService.findNode(nodeCommunication.getNodeId());
Node targetNode = nodeService.findNode(nodeCommunication.getNodeId(), true);
log.info(
"Extracting batches for request {}. Starting at batch {}. Ending at batch {}",
new Object[] { request.getRequestId(), request.getStartBatchId(),
Expand Down Expand Up @@ -2633,7 +2633,7 @@ protected void init(Batch batch, List<SelectFromTableEvent> initialLoadEvents) {
this.selectFromTableEventsToSend = new ArrayList<SelectFromTableEvent>(
initialLoadEvents);
this.batch = batch;
this.node = nodeService.findNode(batch.getTargetNodeId());
this.node = nodeService.findNode(batch.getTargetNodeId(), true);
if (node == null) {
throw new SymmetricException("Could not find a node represented by %s",
this.batch.getTargetNodeId());
Expand Down
6 changes: 3 additions & 3 deletions symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
View file
Expand Up @@ -1853,7 +1853,7 @@ private void insertNodeSecurityUpdate(ISqlTransaction transaction, String nodeId
}

public void sendScript(String nodeId, String script, boolean isLoad) {
Node targetNode = engine.getNodeService().findNode(nodeId);
Node targetNode = engine.getNodeService().findNode(nodeId, true);
TriggerHistory history = engine.getTriggerRouterService()
.findTriggerHistoryForGenericSync();
Data data = new Data(history.getSourceTableName(), DataEventType.BSH,
Expand All @@ -1870,7 +1870,7 @@ public void sendScript(String nodeId, String script, boolean isLoad) {
public boolean sendSchema(String nodeId, String catalogName, String schemaName,
String tableName, boolean isLoad) {
Node sourceNode = engine.getNodeService().findIdentity();
Node targetNode = engine.getNodeService().findNode(nodeId);
Node targetNode = engine.getNodeService().findNode(nodeId, true);
if (targetNode == null) {
log.error("Could not send schema to the node {}. The target node does not exist", nodeId);
return false;
Expand Down Expand Up @@ -1902,7 +1902,7 @@ public boolean sendSchema(String nodeId, String catalogName, String schemaName,
public String sendSQL(String nodeId, String catalogName, String schemaName, String tableName,
String sql) {
Node sourceNode = engine.getNodeService().findIdentity();
Node targetNode = engine.getNodeService().findNode(nodeId);
Node targetNode = engine.getNodeService().findNode(nodeId, true);
if (targetNode == null) {
return "Unknown node " + nodeId;
}
Expand Down
4 changes: 2 additions & 2 deletions symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java
View file
Expand Up @@ -105,7 +105,7 @@ public String findIdentityNodeId() {
@Override
public String getExternalId(String nodeId) {
String externalId = null;
Node node = findNode(nodeId);
Node node = findNode(nodeId, true);
if (node != null) {
externalId = node.getExternalId();
}
Expand Down Expand Up @@ -799,7 +799,7 @@ public List<Node> findOfflineNodes(long minutesOffline) {
}
long cutOffTimeMillis = clientNodeCurrentTime.getTime() - offlineNodeDetectionMillis;
if (time == null || time.getTime() < cutOffTimeMillis) {
offlineNodeList.add(findNode(nodeId));
offlineNodeList.add(findNode(nodeId, true));
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java
View file
Expand Up @@ -355,7 +355,7 @@ public void processTableRequestLoads(Node source, ProcessInfo processInfo, Map<

Map<String, List<TableReloadRequest>> requestsSplitByLoad = new HashMap<String, List<TableReloadRequest>>();
for (TableReloadRequest load : loadsToProcess) {
Node targetNode = engine.getNodeService().findNode(load.getTargetNodeId());
Node targetNode = engine.getNodeService().findNode(load.getTargetNodeId(), true);
if (!useExtractJob || streamToFile) {
if (load.isFullLoadRequest() && isValidLoadTarget(load.getTargetNodeId())) {
List<TableReloadRequest> fullLoad = new ArrayList<TableReloadRequest>();
Expand Down Expand Up @@ -393,7 +393,7 @@ public void processTableRequestLoads(Node source, ProcessInfo processInfo, Map<
}

for (Map.Entry<String, List<TableReloadRequest>> entry : requestsSplitByLoad.entrySet()) {
Node targetNode = engine.getNodeService().findNode(entry.getKey().split("::")[0]);
Node targetNode = engine.getNodeService().findNode(entry.getKey().split("::")[0], true);
ITriggerRouterService triggerRouterService = engine.getTriggerRouterService();
List<TriggerRouter> triggerRouters = triggerRoutersByTargetNodeGroupId.get(targetNode.getNodeGroupId());
if (triggerRouters == null) {
Expand Down
2 changes: 1 addition & 1 deletion symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/RestService.java
View file
Expand Up @@ -964,7 +964,7 @@ public final PullDataResults getPullData(
IDataExtractorService dataExtractorService = engine.getDataExtractorService();
IStatisticManager statisticManager = engine.getStatisticManager();
INodeService nodeService = engine.getNodeService();
org.jumpmind.symmetric.model.Node targetNode = nodeService.findNode(nodeId);
org.jumpmind.symmetric.model.Node targetNode = nodeService.findNode(nodeId, true);

if (securityVerified(nodeId, engine, securityToken)) {
ProcessInfo processInfo = statisticManager.newProcessInfo(new ProcessInfoKey(
Expand Down

0 comments on commit 456427e

Please sign in to comment.