You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2020/07/28 09:39:09 UTC
[lucene-solr] branch jira/SOLR-14608-export updated: SOLR-14608:
Fix code formatting.
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/SOLR-14608-export
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/SOLR-14608-export by this push:
new ebd5bca SOLR-14608: Fix code formatting.
ebd5bca is described below
commit ebd5bcaab8c917b16164bcd059276558002b09a6
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Tue Jul 28 11:38:44 2020 +0200
SOLR-14608: Fix code formatting.
---
.../apache/solr/handler/export/DoubleValue.java | 7 +-
.../solr/handler/export/DoubleValueSortDoc.java | 16 ++---
.../apache/solr/handler/export/ExportBuffers.java | 2 -
.../apache/solr/handler/export/ExportWriter.java | 80 +++++++---------------
.../org/apache/solr/handler/export/FloatValue.java | 6 +-
.../org/apache/solr/handler/export/IntValue.java | 6 +-
.../solr/handler/export/QuadValueSortDoc.java | 24 +++----
.../solr/handler/export/SingleValueSortDoc.java | 16 ++---
.../org/apache/solr/handler/export/SortDoc.java | 8 +--
.../solr/handler/export/StringFieldWriter.java | 12 ++--
.../apache/solr/handler/export/StringValue.java | 4 +-
.../solr/handler/export/TripleValueSortDoc.java | 21 +++---
.../java/org/apache/solr/util/SolrLogPostTool.java | 24 +++----
13 files changed, 91 insertions(+), 135 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/handler/export/DoubleValue.java b/solr/core/src/java/org/apache/solr/handler/export/DoubleValue.java
index 47c7b52..db1c04c 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/DoubleValue.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/DoubleValue.java
@@ -82,14 +82,13 @@ class DoubleValue implements SortValue {
}
-
- @Override
+ @Override
public boolean isPresent() {
return present;
}
public void setCurrentValue(SortValue sv) {
- DoubleValue dv = (DoubleValue)sv;
+ DoubleValue dv = (DoubleValue) sv;
this.currentValue = dv.currentValue;
this.present = dv.present;
}
@@ -100,7 +99,7 @@ class DoubleValue implements SortValue {
}
public int compareTo(SortValue o) {
- DoubleValue dv = (DoubleValue)o;
+ DoubleValue dv = (DoubleValue) o;
return comp.compare(currentValue, dv.currentValue);
}
}
diff --git a/solr/core/src/java/org/apache/solr/handler/export/DoubleValueSortDoc.java b/solr/core/src/java/org/apache/solr/handler/export/DoubleValueSortDoc.java
index 99f56ca..117fe6c 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/DoubleValueSortDoc.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/DoubleValueSortDoc.java
@@ -57,7 +57,7 @@ class DoubleValueSortDoc extends SingleValueSortDoc {
@Override
public void setGlobalValues(SortDoc previous) {
- DoubleValueSortDoc doubleValueSortDoc = (DoubleValueSortDoc)previous;
+ DoubleValueSortDoc doubleValueSortDoc = (DoubleValueSortDoc) previous;
value1.toGlobalValue(doubleValueSortDoc.value1);
value2.toGlobalValue(doubleValueSortDoc.value2);
}
@@ -66,8 +66,8 @@ class DoubleValueSortDoc extends SingleValueSortDoc {
this.docId = sortDoc.docId;
this.ord = sortDoc.ord;
this.docBase = sortDoc.docBase;
- value1.setCurrentValue(((DoubleValueSortDoc)sortDoc).value1);
- value2.setCurrentValue(((DoubleValueSortDoc)sortDoc).value2);
+ value1.setCurrentValue(((DoubleValueSortDoc) sortDoc).value1);
+ value2.setCurrentValue(((DoubleValueSortDoc) sortDoc).value2);
}
public DoubleValueSortDoc(SortValue value1, SortValue value2) {
@@ -80,26 +80,26 @@ class DoubleValueSortDoc extends SingleValueSortDoc {
}
public boolean lessThan(Object o) {
- DoubleValueSortDoc sd = (DoubleValueSortDoc)o;
+ DoubleValueSortDoc sd = (DoubleValueSortDoc) o;
int comp = value1.compareTo(sd.value1);
- if(comp == -1) {
+ if (comp == -1) {
return true;
} else if (comp == 1) {
return false;
} else {
comp = value2.compareTo(sd.value2);
- if(comp == -1) {
+ if (comp == -1) {
return true;
} else if (comp == 1) {
return false;
} else {
- return docId+docBase > sd.docId+sd.docBase;
+ return docId + docBase > sd.docId + sd.docBase;
}
}
}
public int compareTo(Object o) {
- DoubleValueSortDoc sd = (DoubleValueSortDoc)o;
+ DoubleValueSortDoc sd = (DoubleValueSortDoc) o;
int comp = value1.compareTo(sd.value1);
if (comp == 0) {
return value2.compareTo(sd.value2);
diff --git a/solr/core/src/java/org/apache/solr/handler/export/ExportBuffers.java b/solr/core/src/java/org/apache/solr/handler/export/ExportBuffers.java
index 9e759a9..89c341e 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/ExportBuffers.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/ExportBuffers.java
@@ -259,12 +259,10 @@ class ExportBuffers {
}
public void initialize(SortDoc proto) {
-
outDocsIndex = EMPTY;
for (int i = 0; i < outDocs.length; i++) {
outDocs[i] = proto.copy();
}
-
}
@Override
diff --git a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
index 1a63a0c..af1a7d0 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
@@ -310,9 +310,9 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
Timer.Context timerContext = transferBatchToBufferTimer.time();
try {
int outDocsIndex = -1;
- for(int i=0; i<30000; i++) {
+ for (int i = 0; i < 30000; i++) {
SortDoc sortDoc = mergeIterator.next();
- if(sortDoc != null) {
+ if (sortDoc != null) {
destination.outDocs[++outDocsIndex].setValues(sortDoc);
} else {
break;
@@ -330,35 +330,6 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
}
}
-
-
- private void transferBatchToBufferForOutput(SortQueue queue,
- List<LeafReaderContext> leaves,
- ExportBuffers.Buffer destination) throws IOException {
- Timer.Context timerContext = transferBatchToBufferTimer.time();
- try {
- int outDocsIndex = -1;
- for (int i = 0; i < queue.maxSize; i++) {
- SortDoc s = queue.pop();
- if (s.docId > -1) {
- destination.outDocs[++outDocsIndex].setValues(s);
- // remove this doc id from the matching bitset, it's been exported
- sets[s.ord].clear(s.docId);
- s.reset(); // reuse
- }
- }
- destination.outDocsIndex = outDocsIndex;
- } catch (Throwable t) {
- log.error("transfer", t);
- if (t instanceof InterruptedException) {
- Thread.currentThread().interrupt();
- }
- throw t;
- } finally {
- timerContext.stop();
- }
- }
-
protected void writeDocs(SolrQueryRequest req, OutputStream os, IteratorWriter.ItemWriter writer, Sort sort) throws IOException {
List<LeafReaderContext> leaves = req.getSearcher().getTopReaderContext().leaves();
final int queueSize = Math.min(batchSize, totalHits);
@@ -622,8 +593,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
}
- public static class MergeIterator {
-
+ static class MergeIterator {
private TreeSet<SortDoc> set = new TreeSet();
private SegmentIterator[] segmentIterators;
private SortDoc outDoc;
@@ -631,13 +601,13 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
public MergeIterator(SegmentIterator[] segmentIterators, SortDoc proto) {
outDoc = proto.copy();
this.segmentIterators = segmentIterators;
- for(int i=0; i<segmentIterators.length; i++) {
+ for (int i = 0; i < segmentIterators.length; i++) {
try {
SortDoc sortDoc = segmentIterators[i].next();
- if(sortDoc != null) {
+ if (sortDoc != null) {
set.add(sortDoc);
}
- } catch(Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
throw e;
}
@@ -651,17 +621,16 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
*/
public SortDoc next() {
-
SortDoc sortDoc = set.pollLast();
//We've exhausted all documents
- if(sortDoc == null) {
+ if (sortDoc == null) {
return null;
} else {
outDoc.setValues(sortDoc);
}
SortDoc nextDoc = segmentIterators[sortDoc.ord].next();
- if(nextDoc != null) {
+ if (nextDoc != null) {
//The entire expense of the operation is here
set.add(nextDoc);
}
@@ -669,24 +638,23 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
}
}
- public MergeIterator getMergeIterator(List<LeafReaderContext> leafs, FixedBitSet[] bits, SortDoc sortDoc) throws IOException {
-
+ public MergeIterator getMergeIterator(List<LeafReaderContext> leaves, FixedBitSet[] bits, SortDoc sortDoc) throws IOException {
long totalDocs = 0;
- for(int i=0; i< leafs.size(); i++) {
- totalDocs += leafs.get(i).reader().maxDoc();
+ for (int i = 0; i < leaves.size(); i++) {
+ totalDocs += leaves.get(i).reader().maxDoc();
}
- int[] sizes = new int[leafs.size()];
- for(int i=0; i< leafs.size(); i++) {
- long maxDoc = leafs.get(i).reader().maxDoc();
- int sortQueueSize = Math.min((int)(((double)maxDoc/(double)totalDocs) * 200000), 30000);
+ int[] sizes = new int[leaves.size()];
+ for (int i = 0; i < leaves.size(); i++) {
+ long maxDoc = leaves.get(i).reader().maxDoc();
+ int sortQueueSize = Math.min((int) (((double) maxDoc / (double) totalDocs) * 200000), 30000);
sizes[i] = sortQueueSize;
}
- SegmentIterator[] segmentIterators = new SegmentIterator[leafs.size()];
- for(int i=0; i<segmentIterators.length; i++) {
+ SegmentIterator[] segmentIterators = new SegmentIterator[leaves.size()];
+ for (int i = 0; i < segmentIterators.length; i++) {
SortQueue sortQueue = new SortQueue(sizes[i], sortDoc.copy());
- segmentIterators[i] = new SegmentIterator(bits[i], leafs.get(i), sortQueue, sortDoc.copy());
+ segmentIterators[i] = new SegmentIterator(bits[i], leaves.get(i), sortQueue, sortDoc.copy());
}
return new MergeIterator(segmentIterators, sortDoc);
@@ -719,16 +687,16 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
public SortDoc next() {
SortDoc sortDoc = null;
- if(index > -1) {
+ if (index > -1) {
sortDoc = outDocs[index--];
} else {
topDocs();
- if(index > -1) {
+ if (index > -1) {
sortDoc = outDocs[index--];
}
}
- if(sortDoc != null) {
+ if (sortDoc != null) {
//Clear the bit so it's not loaded again.
bits.clear(sortDoc.docId);
@@ -743,7 +711,6 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
} else {
nextDoc = null;
}
-
return nextDoc;
}
@@ -765,9 +732,9 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
//Pop the queue and load up the array.
index = -1;
- while(true) {
+ while (true) {
SortDoc sortDoc = queue.pop();
- if(sortDoc.docId > -1) {
+ if (sortDoc.docId > -1) {
outDocs[++index] = sortDoc;
}
}
@@ -786,5 +753,4 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
return "Early Client Disconnect";
}
}
-
}
diff --git a/solr/core/src/java/org/apache/solr/handler/export/FloatValue.java b/solr/core/src/java/org/apache/solr/handler/export/FloatValue.java
index 2d5e821..f6ee024 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/FloatValue.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/FloatValue.java
@@ -61,8 +61,6 @@ class FloatValue implements SortValue {
lastDocID = 0;
}
-
-
public void setCurrentValue(int docId) throws IOException {
if (docId < lastDocID) {
throw new AssertionError("docs were sent out-of-order: lastDocID=" + lastDocID + " vs doc=" + docId);
@@ -87,7 +85,7 @@ class FloatValue implements SortValue {
}
public void setCurrentValue(SortValue sv) {
- FloatValue fv = (FloatValue)sv;
+ FloatValue fv = (FloatValue) sv;
this.currentValue = fv.currentValue;
this.present = fv.present;
}
@@ -98,7 +96,7 @@ class FloatValue implements SortValue {
}
public int compareTo(SortValue o) {
- FloatValue fv = (FloatValue)o;
+ FloatValue fv = (FloatValue) o;
return comp.compare(currentValue, fv.currentValue);
}
}
diff --git a/solr/core/src/java/org/apache/solr/handler/export/IntValue.java b/solr/core/src/java/org/apache/solr/handler/export/IntValue.java
index 736f433..876b2cb 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/IntValue.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/IntValue.java
@@ -79,18 +79,18 @@ public class IntValue implements SortValue {
}
- @Override
+ @Override
public boolean isPresent() {
return this.present;
}
public int compareTo(SortValue o) {
- IntValue iv = (IntValue)o;
+ IntValue iv = (IntValue) o;
return comp.compare(currentValue, iv.currentValue);
}
public void setCurrentValue(SortValue sv) {
- IntValue iv = (IntValue)sv;
+ IntValue iv = (IntValue) sv;
this.currentValue = iv.currentValue;
this.present = iv.present;
}
diff --git a/solr/core/src/java/org/apache/solr/handler/export/QuadValueSortDoc.java b/solr/core/src/java/org/apache/solr/handler/export/QuadValueSortDoc.java
index b4ccc93..bf4c6a6 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/QuadValueSortDoc.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/QuadValueSortDoc.java
@@ -96,32 +96,32 @@ class QuadValueSortDoc extends TripleValueSortDoc {
public boolean lessThan(Object o) {
- QuadValueSortDoc sd = (QuadValueSortDoc)o;
+ QuadValueSortDoc sd = (QuadValueSortDoc) o;
int comp = value1.compareTo(sd.value1);
- if(comp == -1) {
+ if (comp == -1) {
return true;
} else if (comp == 1) {
return false;
} else {
comp = value2.compareTo(sd.value2);
- if(comp == -1) {
+ if (comp == -1) {
return true;
} else if (comp == 1) {
return false;
} else {
comp = value3.compareTo(sd.value3);
- if(comp == -1) {
+ if (comp == -1) {
return true;
} else if (comp == 1) {
return false;
} else {
comp = value4.compareTo(sd.value4);
- if(comp == -1) {
+ if (comp == -1) {
return true;
} else if (comp == 1) {
return false;
} else {
- return docId+docBase > sd.docId+sd.docBase;
+ return docId + docBase > sd.docId + sd.docBase;
}
}
}
@@ -129,16 +129,16 @@ class QuadValueSortDoc extends TripleValueSortDoc {
}
public int compareTo(Object o) {
- QuadValueSortDoc sd = (QuadValueSortDoc)o;
+ QuadValueSortDoc sd = (QuadValueSortDoc) o;
int comp = value1.compareTo(sd.value1);
- if(comp == 0) {
+ if (comp == 0) {
comp = value2.compareTo(sd.value2);
- if(comp == 0) {
+ if (comp == 0) {
comp = value3.compareTo(sd.value3);
- if(comp == 0) {
+ if (comp == 0) {
comp = value4.compareTo(sd.value4);
- if(comp == 0) {
- return docId+docBase - sd.docId+sd.docBase;
+ if (comp == 0) {
+ return docId + docBase - sd.docId + sd.docBase;
} else {
return comp;
}
diff --git a/solr/core/src/java/org/apache/solr/handler/export/SingleValueSortDoc.java b/solr/core/src/java/org/apache/solr/handler/export/SingleValueSortDoc.java
index 25e01a5..8e59778 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/SingleValueSortDoc.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/SingleValueSortDoc.java
@@ -54,7 +54,7 @@ class SingleValueSortDoc extends SortDoc {
this.docId = sortDoc.docId;
this.ord = sortDoc.ord;
this.docBase = sortDoc.docBase;
- value1.setCurrentValue(((SingleValueSortDoc)sortDoc).value1);
+ value1.setCurrentValue(((SingleValueSortDoc) sortDoc).value1);
}
public SingleValueSortDoc(SortValue value1) {
@@ -63,7 +63,7 @@ class SingleValueSortDoc extends SortDoc {
}
public void setGlobalValues(SortDoc previous) {
- SortValue previousValue = ((SingleValueSortDoc)previous).value1;
+ SortValue previousValue = ((SingleValueSortDoc) previous).value1;
value1.toGlobalValue(previousValue);
}
@@ -72,22 +72,22 @@ class SingleValueSortDoc extends SortDoc {
}
public boolean lessThan(Object o) {
- SingleValueSortDoc sd = (SingleValueSortDoc)o;
+ SingleValueSortDoc sd = (SingleValueSortDoc) o;
int comp = value1.compareTo(sd.value1);
- if(comp == -1) {
+ if (comp == -1) {
return true;
} else if (comp == 1) {
return false;
} else {
- return docId+docBase > sd.docId+sd.docBase;
+ return docId + docBase > sd.docId + sd.docBase;
}
}
public int compareTo(Object o) {
- SingleValueSortDoc sd = (SingleValueSortDoc)o;
+ SingleValueSortDoc sd = (SingleValueSortDoc) o;
int comp = value1.compareTo(sd.value1);
- if(comp == 0) {
- return docId+docBase - sd.docId+sd.docBase;
+ if (comp == 0) {
+ return docId + docBase - sd.docId + sd.docBase;
} else {
return comp;
}
diff --git a/solr/core/src/java/org/apache/solr/handler/export/SortDoc.java b/solr/core/src/java/org/apache/solr/handler/export/SortDoc.java
index ac0bd7b..e21e18b 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/SortDoc.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/SortDoc.java
@@ -72,7 +72,7 @@ class SortDoc implements Comparable {
public void setGlobalValues(SortDoc previous) {
SortValue[] previousValues = previous.sortValues;
- for(int i=0; i<sortValues.length; i++) {
+ for (int i = 0; i < sortValues.length; i++) {
sortValues[i].toGlobalValue(previousValues[i]);
}
}
@@ -92,7 +92,6 @@ class SortDoc implements Comparable {
for (int i = 0; i < sortValues.length; i++) {
svs[i] = sortValues[i].copy();
}
-
return new SortDoc(svs);
}
@@ -100,7 +99,7 @@ class SortDoc implements Comparable {
if (docId == -1) {
return true;
}
- SortDoc sd = (SortDoc)o;
+ SortDoc sd = (SortDoc) o;
SortValue[] sortValues1 = sd.sortValues;
for (int i = 0; i < sortValues.length; i++) {
int comp = sortValues[i].compareTo(sortValues1[i]);
@@ -114,7 +113,7 @@ class SortDoc implements Comparable {
}
public int compareTo(Object o) {
- SortDoc sd = (SortDoc)o;
+ SortDoc sd = (SortDoc) o;
for (int i = 0; i < sortValues.length; i++) {
int comp = sortValues[i].compareTo(sd.sortValues[i]);
if (comp != 0) {
@@ -124,7 +123,6 @@ class SortDoc implements Comparable {
return 0;
}
-
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append(ord).append(':').append(docBase).append(':').append(docId).append("; ");
diff --git a/solr/core/src/java/org/apache/solr/handler/export/StringFieldWriter.java b/solr/core/src/java/org/apache/solr/handler/export/StringFieldWriter.java
index 2a78bb8..3d6bb75 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/StringFieldWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/StringFieldWriter.java
@@ -56,21 +56,21 @@ class StringFieldWriter extends FieldWriter {
}
public boolean write(SortDoc sortDoc, LeafReader reader, MapWriter.EntryWriter ew, int fieldIndex) throws IOException {
- StringValue stringValue = (StringValue)sortDoc.getSortValue(this.field);
+ StringValue stringValue = (StringValue) sortDoc.getSortValue(this.field);
BytesRef ref = null;
- if(stringValue != null) {
+ if (stringValue != null) {
//We already have the top level ordinal used for sorting.
//Now let's use it for caching the BytesRef so we don't have to look it up.
//When we have long runs of repeated values do to the sort order of the docs this i huge win.
- if(this.lastOrd == stringValue.currentOrd) {
+ if (this.lastOrd == stringValue.currentOrd) {
ref = lastRef;
}
this.lastOrd = stringValue.currentOrd;
}
- if(ref == null) {
+ if (ref == null) {
SortedDocValues vals = DocValues.getSorted(reader, this.field);
if (vals.advance(sortDoc.docId) != sortDoc.docId) {
return false;
@@ -84,10 +84,8 @@ class StringFieldWriter extends FieldWriter {
if (ew instanceof JavaBinCodec.BinEntryWriter) {
ew.put(this.field, utf8.reset(ref.bytes, ref.offset, ref.length, null));
} else {
- String v = null;
fieldType.indexedToReadable(ref, cref);
- v = cref.toString();
- ew.put(this.field, v);
+ ew.put(this.field, cref.toString());
}
return true;
}
diff --git a/solr/core/src/java/org/apache/solr/handler/export/StringValue.java b/solr/core/src/java/org/apache/solr/handler/export/StringValue.java
index 0f82d46..d45018a 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/StringValue.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/StringValue.java
@@ -104,7 +104,7 @@ class StringValue implements SortValue {
}
public void setCurrentValue(SortValue sv) {
- StringValue v = (StringValue)sv;
+ StringValue v = (StringValue) sv;
this.currentOrd = v.currentOrd;
this.present = v.present;
this.leafOrd = v.leafOrd;
@@ -125,7 +125,7 @@ class StringValue implements SortValue {
public void toGlobalValue(SortValue previousValue) {
lastOrd = currentOrd;
StringValue sv = (StringValue)previousValue;
- if(sv.lastOrd == currentOrd) {
+ if (sv.lastOrd == currentOrd) {
//Take the global ord from the previousValue
this.currentOrd = sv.currentOrd;
} else {
diff --git a/solr/core/src/java/org/apache/solr/handler/export/TripleValueSortDoc.java b/solr/core/src/java/org/apache/solr/handler/export/TripleValueSortDoc.java
index 09c357c..5176ede 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/TripleValueSortDoc.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/TripleValueSortDoc.java
@@ -72,9 +72,9 @@ class TripleValueSortDoc extends DoubleValueSortDoc {
this.docId = sortDoc.docId;
this.ord = sortDoc.ord;
this.docBase = sortDoc.docBase;
- value1.setCurrentValue(((TripleValueSortDoc)sortDoc).value1);
- value2.setCurrentValue(((TripleValueSortDoc)sortDoc).value2);
- value3.setCurrentValue(((TripleValueSortDoc)sortDoc).value3);
+ value1.setCurrentValue(((TripleValueSortDoc) sortDoc).value1);
+ value2.setCurrentValue(((TripleValueSortDoc) sortDoc).value2);
+ value3.setCurrentValue(((TripleValueSortDoc) sortDoc).value3);
}
public TripleValueSortDoc(SortValue value1, SortValue value2, SortValue value3) {
@@ -87,27 +87,26 @@ class TripleValueSortDoc extends DoubleValueSortDoc {
}
public boolean lessThan(Object o) {
-
- TripleValueSortDoc sd = (TripleValueSortDoc)o;
+ TripleValueSortDoc sd = (TripleValueSortDoc) o;
int comp = value1.compareTo(sd.value1);
- if(comp == -1) {
+ if (comp == -1) {
return true;
} else if (comp == 1) {
return false;
} else {
comp = value2.compareTo(sd.value2);
- if(comp == -1) {
+ if (comp == -1) {
return true;
} else if (comp == 1) {
return false;
} else {
comp = value3.compareTo(sd.value3);
- if(comp == -1) {
+ if (comp == -1) {
return true;
} else if (comp == 1) {
return false;
} else {
- return docId+docBase > sd.docId+sd.docBase;
+ return docId + docBase > sd.docId + sd.docBase;
}
}
}
@@ -120,8 +119,8 @@ class TripleValueSortDoc extends DoubleValueSortDoc {
comp = value2.compareTo(sd.value2);
if (comp == 0) {
comp = value3.compareTo(sd.value3);
- if(comp == 0) {
- return docId+docBase - sd.docId+sd.docBase;
+ if (comp == 0) {
+ return docId + docBase - sd.docId + sd.docBase;
} else {
return comp;
}
diff --git a/solr/core/src/java/org/apache/solr/util/SolrLogPostTool.java b/solr/core/src/java/org/apache/solr/util/SolrLogPostTool.java
index 08e1618..b9a2ae6 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrLogPostTool.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrLogPostTool.java
@@ -474,60 +474,60 @@ public class SolrLogPostTool {
private void addParams(SolrInputDocument doc, String params) {
String[] pairs = params.split("&");
- for(String pair : pairs) {
+ for (String pair : pairs) {
String[] parts = pair.split("=");
- if(parts.length == 2 && parts[0].equals("q")) {
+ if (parts.length == 2 && parts[0].equals("q")) {
String dq = URLDecoder.decode(parts[1], Charset.defaultCharset());
setFieldIfUnset(doc, "q_s", dq);
setFieldIfUnset(doc, "q_t", dq);
}
- if(parts[0].equals("rows")) {
+ if (parts[0].equals("rows")) {
String dr = URLDecoder.decode(parts[1], Charset.defaultCharset());
setFieldIfUnset(doc, "rows_i", dr);
}
- if(parts[0].equals("start")) {
+ if (parts[0].equals("start")) {
String dr = URLDecoder.decode(parts[1], Charset.defaultCharset());
setFieldIfUnset(doc, "start_i", dr);
}
- if(parts[0].equals("distrib")) {
+ if (parts[0].equals("distrib")) {
String dr = URLDecoder.decode(parts[1], Charset.defaultCharset());
setFieldIfUnset(doc, "distrib_s", dr);
}
- if(parts[0].equals("shards")) {
+ if (parts[0].equals("shards")) {
setFieldIfUnset(doc, "shards_s", "true");
}
- if(parts[0].equals("ids") && !isRTGRequest(doc)) {
+ if (parts[0].equals("ids") && !isRTGRequest(doc)) {
setFieldIfUnset(doc, "ids_s", "true");
}
- if(parts[0].equals("isShard")) {
+ if (parts[0].equals("isShard")) {
String dr = URLDecoder.decode(parts[1], Charset.defaultCharset());
setFieldIfUnset(doc, "isShard_s", dr);
}
- if(parts[0].equals("wt")) {
+ if (parts[0].equals("wt")) {
String dr = URLDecoder.decode(parts[1], Charset.defaultCharset());
setFieldIfUnset(doc, "wt_s", dr);
}
- if(parts[0].equals("facet")) {
+ if (parts[0].equals("facet")) {
String dr = URLDecoder.decode(parts[1], Charset.defaultCharset());
setFieldIfUnset(doc, "facet_s", dr);
}
- if(parts[0].equals("shards.purpose")) {
+ if (parts[0].equals("shards.purpose")) {
try {
int purpose = Integer.parseInt(parts[1]);
String[] purposes = getRequestPurposeNames(purpose);
for (String p : purposes) {
doc.addField("purpose_ss", p);
}
- } catch(Throwable e) {
+ } catch (Throwable e) {
//We'll just sit on this for now and not interrupt the load for this one field.
}
}