revert debug change + dry

Author: original-brownbear

server/src/main/java/org/elasticsearch/action/search/ArraySearchPhaseResults.java

@@ -43,7 +43,7 @@ Stream<Result> getSuccessfulResults() {
     @Override
     void consumeResult(Result result, Runnable next) {
         assert results.get(result.getShardIndex()) == null : "shardIndex: " + result.getShardIndex() + " is already set";
-        results.setOnce(result.getShardIndex(), result);
+        results.set(result.getShardIndex(), result);
         result.incRef();
         next.run();
     }

server/src/main/java/org/elasticsearch/common/lucene/Lucene.java

@@ -429,7 +429,10 @@ public static void writeTopDocsIncludingShardIndex(StreamOutput out, TopDocs top
         } else {
             out.writeByte((byte) 0);
             writeTotalHits(out, topDocs.totalHits);
-            out.writeArray(Lucene::writeScoreDocWithShardIndex, topDocs.scoreDocs);
+            out.writeArray((o, scoreDoc) -> {
+                writeScoreDoc(o, scoreDoc);
+                o.writeVInt(scoreDoc.shardIndex);
+            }, topDocs.scoreDocs);
         }
     }
 
@@ -587,15 +590,6 @@ public static void writeScoreDoc(StreamOutput out, ScoreDoc scoreDoc) throws IOE
         out.writeFloat(scoreDoc.score);
     }
 
-    public static void writeScoreDocWithShardIndex(StreamOutput out, ScoreDoc scoreDoc) throws IOException {
-        if (scoreDoc.getClass().equals(ScoreDoc.class) == false) {
-            throw new IllegalArgumentException("This method can only be used to serialize a ScoreDoc, not a " + scoreDoc.getClass());
-        }
-        out.writeVInt(scoreDoc.doc);
-        out.writeFloat(scoreDoc.score);
-        out.writeVInt(scoreDoc.shardIndex);
-    }
-
     // LUCENE 4 UPGRADE: We might want to maintain our own ordinal, instead of Lucene's ordinal
     public static SortField.Type readSortType(StreamInput in) throws IOException {
         return SortField.Type.values()[in.readVInt()];