dweiss commented on a change in pull request #128:
URL: https://github.com/apache/lucene/pull/128#discussion_r628015890
##########
File path: lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
##########
@@ -731,40 +747,188 @@ public Status checkIndex(List<String> onlySegments)
throws IOException {
}
if (checksumsOnly == false) {
+ // This redundant assignment is done to make compiler happy
+ SegmentReader finalReader = reader;
+
// Test Livedocs
- segInfoStat.liveDocStatus = testLiveDocs(reader, infoStream,
failFast);
+ CompletableFuture<Void> testliveDocs =
+ CompletableFuture.supplyAsync(
+ () -> {
+ try {
+ return testLiveDocs(finalReader, infoStream,
failFast);
+ } catch (IOException e) {
+ throw new CompletionException(e);
+ }
+ },
+ executor)
+ .thenAccept(
+ liveDocStatus -> {
+ segInfoStat.liveDocStatus = liveDocStatus;
+ });
// Test Fieldinfos
- segInfoStat.fieldInfoStatus = testFieldInfos(reader, infoStream,
failFast);
+ CompletableFuture<Void> testFieldInfos =
+ CompletableFuture.supplyAsync(
+ () -> {
+ try {
+ return testFieldInfos(finalReader, infoStream,
failFast);
+ } catch (IOException e) {
+ throw new CompletionException(e);
+ }
+ },
+ executor)
+ .thenAccept(
+ fieldInfoStatus -> {
+ segInfoStat.fieldInfoStatus = fieldInfoStatus;
+ });
// Test Field Norms
- segInfoStat.fieldNormStatus = testFieldNorms(reader, infoStream,
failFast);
+ CompletableFuture<Void> testFieldNorms =
+ CompletableFuture.supplyAsync(
+ () -> {
+ try {
+ return testFieldNorms(finalReader, infoStream,
failFast);
+ } catch (IOException e) {
+ throw new CompletionException(e);
+ }
+ },
+ executor)
+ .thenAccept(
+ fieldNormStatus -> {
+ segInfoStat.fieldNormStatus = fieldNormStatus;
+ });
// Test the Term Index
- segInfoStat.termIndexStatus =
- testPostings(reader, infoStream, verbose, doSlowChecks,
failFast);
+ CompletableFuture<Void> testTermIndex =
+ CompletableFuture.supplyAsync(
+ () -> {
+ try {
+ return testPostings(
+ finalReader, infoStream, verbose, doSlowChecks,
failFast);
+ } catch (IOException e) {
+ throw new CompletionException(e);
+ }
+ },
+ executor)
+ .thenAccept(
+ termIndexStatus -> {
+ segInfoStat.termIndexStatus = termIndexStatus;
+ });
// Test Stored Fields
- segInfoStat.storedFieldStatus = testStoredFields(reader, infoStream,
failFast);
+ CompletableFuture<Void> testStoredFields =
+ CompletableFuture.supplyAsync(
+ () -> {
+ try {
+ return testStoredFields(finalReader, infoStream,
failFast);
+ } catch (IOException e) {
+ throw new CompletionException(e);
+ }
+ },
+ executor)
+ .thenAccept(
+ storedFieldStatus -> {
+ segInfoStat.storedFieldStatus = storedFieldStatus;
+ });
// Test Term Vectors
- segInfoStat.termVectorStatus =
- testTermVectors(reader, infoStream, verbose, doSlowChecks,
failFast);
+ CompletableFuture<Void> testTermVectors =
+ CompletableFuture.supplyAsync(
+ () -> {
+ try {
+ return testTermVectors(
+ finalReader, infoStream, verbose, doSlowChecks,
failFast);
+ } catch (IOException e) {
+ throw new CompletionException(e);
+ }
+ },
+ executor)
+ .thenAccept(
+ termVectorStatus -> {
+ segInfoStat.termVectorStatus = termVectorStatus;
+ });
// Test Docvalues
- segInfoStat.docValuesStatus = testDocValues(reader, infoStream,
failFast);
+ CompletableFuture<Void> testDocValues =
+ CompletableFuture.supplyAsync(
+ () -> {
+ try {
+ return testDocValues(finalReader, infoStream,
failFast);
+ } catch (IOException e) {
+ throw new CompletionException(e);
+ }
+ },
+ executor)
+ .thenAccept(
+ docValuesStatus -> {
+ segInfoStat.docValuesStatus = docValuesStatus;
+ });
// Test PointValues
- segInfoStat.pointsStatus = testPoints(reader, infoStream, failFast);
+ CompletableFuture<Void> testPointvalues =
+ CompletableFuture.supplyAsync(
+ () -> {
Review comment:
I added a commit that shows what I meant (and replaces three calls).
Sorry for not replacing all of them. Maybe it can be made even less verbose if
you fold all those blocks into a single function that accepts executor, first
callable, follow-up callable and just returns completable future from the
composition of these.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
