treshenkov/credit_tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

flag calc

Browse source
This commit is contained in:
etreschenkov 2025-11-11 13:01:00 +03:00
parent 4e6ab1a862
commit 0f04ab3e42
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/ru/nbch/credit_tracker/service/task/impl/XmlMergeCoordinator.java
View file

@ -35,7 +35,7 @@ public final class XmlMergeCoordinator implements IPipeLineTerminator<PartFilePa
private Path out;
private BlockingQueue<PartFilePayload> inQueue;
public XmlMergeCoordinator(CreditTrackerSettings config) {
public XmlMergeCoordinator(CreditTrackerSettings config) {
this.mergedDir = Path.of(config.getLoadDir() + File.separator + "tmp_folder" + File.separator + "merged" + File.separator);
}
@ -138,24 +138,20 @@ public final class XmlMergeCoordinator implements IPipeLineTerminator<PartFilePa
}
batch.add(part);
// добираем до batchSize, но не ждём бесконечно
//todo подозрительное действие, прочекать не будет ли мешать poison
while (batch.size() < batchSize) {
PartFilePayload p = inQueue.poll(1000, TimeUnit.MILLISECONDS);
PartFilePayload p = inQueue.poll(1, TimeUnit.SECONDS);
if (p == null) {
break;
}
if (p.isPoison()) {
merge(batch);
done.complete(new SignalXmlFilePayload(out));
return;
}
batch.add(p);
}
if (!batch.isEmpty()) {
log.debug("Starting merge batch; size: {}", batch.size());
mergeBatch(batch);
// удаляем исходники после успешного мерджа
for (PartFilePayload p : batch) Files.deleteIfExists(p.getPartPath());
batch.clear();
merge(batch);
}
} catch (InterruptedException ie) {
Thread.currentThread().interrupt();
@ -165,4 +161,12 @@ public final class XmlMergeCoordinator implements IPipeLineTerminator<PartFilePa
}
}
}
private void merge(List<PartFilePayload> inputs) throws Exception {
log.debug("Starting merge batch; size: {}", inputs.size());
mergeBatch(inputs);
//удаляем исходники после успешного мерджа
for (PartFilePayload p : inputs) Files.deleteIfExists(p.getPartPath());
inputs.clear();
}
}