コメント追加

This commit is contained in:
r-ca committed 2024-01-24 18:06:10 +09:00
1 parent d3afdbcef5
commit 826f8928d1
1 file changed
+8 -4
@@ -185,7 +185,6 @@ public class LacertaVcsImpl implements LacertaVcs {
} }
vcsRevEntitiesBeforeTarget.add(vcsRevEntity); vcsRevEntitiesBeforeTarget.add(vcsRevEntity);
}); });
return vcsRevEntitiesBeforeTarget; return vcsRevEntitiesBeforeTarget;
}); });
} }
@@ -197,12 +196,18 @@ public class LacertaVcsImpl implements LacertaVcs {
logIds.addAll(vcsRevEntity.logIds); logIds.addAll(vcsRevEntity.logIds);
}); });
// TODO-rca: ソートしないといけないかも(順番が保証されているわけではない + 順番が変わるとほぼ確実に壊れる) // TODO-rca: ソートしないといけないかも(順番が保証されているわけではない + 順番が変わるとほぼ確実に壊れる)
return new ArrayList<>(database.vcsLogDao().findByIds(logIds)); ArrayList<VcsLogEntity> vcsLogEntities = new ArrayList<>(database.vcsLogDao().findByIds(logIds));
logger.debug(TAG, "getLogInRevsAsync finished\nResult size: " + vcsLogEntities.size());
return vcsLogEntities;
}); });
} }
private CompletableFuture<ArrayList<VcsLogEntity>> getLogInRevAsync(VcsRevEntity revEntity) { private CompletableFuture<ArrayList<VcsLogEntity>> getLogInRevAsync(VcsRevEntity revEntity) {
return CompletableFuture.supplyAsync(() -> new ArrayList<>(database.vcsLogDao().findByIds(revEntity.logIds))); return CompletableFuture.supplyAsync(() -> {
ArrayList<VcsLogEntity> vcsLogEntities = new ArrayList<>(database.vcsLogDao().findByIds(revEntity.logIds));
logger.debug(TAG, "getLogInRevAsync finished\nResult size: " + vcsLogEntities.size());
return vcsLogEntities;
});
} }
@Override @Override
@@ -210,7 +215,6 @@ public class LacertaVcsImpl implements LacertaVcs {
return CompletableFuture.supplyAsync(() -> { return CompletableFuture.supplyAsync(() -> {
logger.debug(TAG, "getDocumentPagePathListRev"); logger.debug(TAG, "getDocumentPagePathListRev");
ArrayList<VcsLogEntity> vcsLogEntities = getRevBeforeTargetIdAsync(revId).thenCompose(this::getLogInRevsAsync).join(); ArrayList<VcsLogEntity> vcsLogEntities = getRevBeforeTargetIdAsync(revId).thenCompose(this::getLogInRevsAsync).join();
logger.debug(TAG, "Query finished\nSize: " + vcsLogEntities.size());
// finalで宣言しないとLambda式内で扱えないので // finalで宣言しないとLambda式内で扱えないので
final ArrayList<String>[] fileNameList = new ArrayList[]{new ArrayList<>()}; final ArrayList<String>[] fileNameList = new ArrayList[]{new ArrayList<>()};