Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix formatting

This commit is contained in:
Xavier Léauté 2014-04-25 15:09:47 -07:00
parent 52f575025b
commit 5ae848ab14
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java
View File

@ -281,7 +281,6 @@ public class IncrementalIndex implements Iterable<Row>
);
}
}
);
}
@ -562,10 +561,15 @@ public class IncrementalIndex implements Iterable<Row>
while (retVal == 0 && valsIndex < lhsVals.length) {
final String lhsVal = lhsVals[valsIndex];
final String rhsVal = rhsVals[valsIndex];
if(lhsVal == null && rhsVal == null) return 0;
else if(lhsVal == null) return -1;
else if(rhsVal == null) return 1;
else retVal = lhsVal.compareTo(rhsVal);
if (lhsVal == null && rhsVal == null) {
return 0;
} else if (lhsVal == null) {
return -1;
} else if (rhsVal == null) {
return 1;
} else {
retVal = lhsVal.compareTo(rhsVal);
}
++valsIndex;
}
++index;
@ -619,7 +623,7 @@ public class IncrementalIndex implements Iterable<Row>
public String get(@Nullable String value)
{
final String retVal;
if(value == null) {
if (value == null) {
retVal = poorMansInterning.get(NULL_STRING);
} else {
retVal = poorMansInterning.get(value);
@ -646,7 +650,9 @@ public class IncrementalIndex implements Iterable<Row>
public synchronized void add(@Nullable String value)
{
if(value == null) value = NULL_STRING;
if (value == null) {
value = NULL_STRING;
}
poorMansInterning.put(value, value);
falseIds.put(value, falseIds.size());
}
@ -654,7 +660,9 @@ public class IncrementalIndex implements Iterable<Row>
public int getSortedId(@Nullable String value)
{
assertSorted();
if(value == null) value = NULL_STRING;
if (value == null) {
value = NULL_STRING;
}
return Arrays.binarySearch(sortedVals, value);
}