Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Less offset indirection [don't merge] #42

Open
wants to merge 3 commits into
base: 0.9.2-mmx
Choose a base branch
from
Open

Less offset indirection [don't merge] #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76ca253
Make GenericIndexedWriter guava 14 friendly
drcrallen Sep 27, 2016
d97127a
Move to raw InputSupplier even though it is deprecated
drcrallen Sep 27, 2016
d030c08
Avoid Offset object wrapping in QueryableIndexStorageAdapter when que…
leventov Sep 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions processing/src/main/java/io/druid/segment/QueryableIndexStorageAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,19 +417,28 @@ public Cursor apply(final Long input)
}
}

final Offset offset = descending ?
new DescendingTimestampCheckingOffset(
baseOffset,
timestamps,
timeStart,
minDataTimestamp >= timeStart
) :
new AscendingTimestampCheckingOffset(
baseOffset,
timestamps,
timeEnd,
maxDataTimestamp < timeEnd
);
final Offset offset;
if (descending) {
if (minDataTimestamp >= timeStart) {
offset = baseOffset;
} else {
offset = new DescendingTimestampCheckingOffset(
baseOffset,
timestamps,
timeStart
);
}
} else {
if (maxDataTimestamp < timeEnd) {
offset = baseOffset;
} else {
offset = new AscendingTimestampCheckingOffset(
baseOffset,
timestamps,
timeEnd
);
}
}


final Offset initOffset = offset.clone();
Expand Down Expand Up @@ -1178,20 +1187,16 @@ private abstract static class TimestampCheckingOffset implements Offset
protected final Offset baseOffset;
protected final GenericColumn timestamps;
protected final long timeLimit;
protected final boolean allWithinThreshold;

public TimestampCheckingOffset(
Offset baseOffset,
GenericColumn timestamps,
long timeLimit,
boolean allWithinThreshold
long timeLimit
)
{
this.baseOffset = baseOffset;
this.timestamps = timestamps;
this.timeLimit = timeLimit;
// checks if all the values are within the Threshold specified, skips timestamp lookups and checks if all values are within threshold.
this.allWithinThreshold = allWithinThreshold;
}

@Override
Expand All @@ -1206,9 +1211,6 @@ public boolean withinBounds()
if (!baseOffset.withinBounds()) {
return false;
}
if (allWithinThreshold) {
return true;
}
return timeInRange(timestamps.getLongSingleValueRow(baseOffset.getOffset()));
}

Expand All @@ -1231,11 +1233,10 @@ private static class AscendingTimestampCheckingOffset extends TimestampCheckingO
public AscendingTimestampCheckingOffset(
Offset baseOffset,
GenericColumn timestamps,
long timeLimit,
boolean allWithinThreshold
long timeLimit
)
{
super(baseOffset, timestamps, timeLimit, allWithinThreshold);
super(baseOffset, timestamps, timeLimit);
}

@Override
Expand All @@ -1254,7 +1255,7 @@ public String toString()
@Override
public Offset clone()
{
return new AscendingTimestampCheckingOffset(baseOffset.clone(), timestamps, timeLimit, allWithinThreshold);
return new AscendingTimestampCheckingOffset(baseOffset.clone(), timestamps, timeLimit);
}
}

Expand All @@ -1263,11 +1264,10 @@ private static class DescendingTimestampCheckingOffset extends TimestampChecking
public DescendingTimestampCheckingOffset(
Offset baseOffset,
GenericColumn timestamps,
long timeLimit,
boolean allWithinThreshold
long timeLimit
)
{
super(baseOffset, timestamps, timeLimit, allWithinThreshold);
super(baseOffset, timestamps, timeLimit);
}

@Override
Expand All @@ -1287,7 +1287,7 @@ public String toString()
@Override
public Offset clone()
{
return new DescendingTimestampCheckingOffset(baseOffset.clone(), timestamps, timeLimit, allWithinThreshold);
return new DescendingTimestampCheckingOffset(baseOffset.clone(), timestamps, timeLimit);
}
}

Expand Down
42 changes: 25 additions & 17 deletions processing/src/main/java/io/druid/segment/data/GenericIndexedWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
import java.nio.channels.WritableByteChannel;
Expand Down Expand Up @@ -136,26 +135,35 @@ public long getSerializedSize()

public ByteSource combineStreams()
{
return ByteSource.concat(
Iterables.transform(
Arrays.asList("meta", "header", "values"),
new Function<String,ByteSource>() {

@Override
public ByteSource apply(final String input)
{
return new ByteSource()
// ByteSource.concat is only available in guava 15 and higher
return new ByteSource()
{
@Override
public InputStream openStream() throws IOException
{
// When we no longer have to maintain compat with Guava 14, this can be upgraded
return ByteStreams.join(
Iterables.transform(
Arrays.asList("meta", "header", "values"),
new Function<String, InputSupplier<InputStream>>()
{
@Override
public InputStream openStream() throws IOException
public InputSupplier<InputStream> apply(final String input)
{
return ioPeon.makeInputStream(makeFilename(input));
return new InputSupplier<InputStream>()
{
@Override
public InputStream getInput() throws IOException
{
return ioPeon.makeInputStream(makeFilename(input));
}
};
}
};
}
}
)
);
}
)
).getInput();
}
};
}

public void writeToChannel(WritableByteChannel channel) throws IOException
Expand Down