Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.druid.frame.read.FrameReader;
import org.apache.druid.frame.write.FrameWriterFactory;
import org.apache.druid.java.util.common.Unit;
import org.apache.druid.java.util.common.logger.Logger;
import org.apache.druid.msq.exec.DataServerQueryHandler;
import org.apache.druid.msq.input.ReadableInput;
import org.apache.druid.msq.input.table.SegmentWithDescriptor;
Expand All @@ -44,6 +45,7 @@

public abstract class BaseLeafFrameProcessor implements FrameProcessor<Object>
{
private static final Logger log = new Logger(BaseLeafFrameProcessor.class);
private final ReadableInput baseInput;
private final ResourceHolder<WritableFrameChannel> outputChannelHolder;
private final ResourceHolder<FrameWriterFactory> frameWriterFactoryHolder;
Expand Down Expand Up @@ -85,7 +87,14 @@ public ReturnOrAwait<Object> runIncrementally(final IntSet readableInputs) throw
final ReturnOrAwait retVal;

if (baseInput.hasSegment()) {
retVal = runWithSegment(baseInput.getSegment());
try {
retVal = runWithSegment(baseInput.getSegment());
}
catch (Exception e) {
// Did not want to load the segment for exception handling, hence adding the descriptor in the log to figure out failures.
log.error("Error processing segment descriptor: [%s]", baseInput.getSegment().getDescriptor());
throw e;
}
} else if (baseInput.hasDataServerQuery()) {
retVal = runWithDataServerQuery(baseInput.getDataServerQuery());
} else {
Expand Down
Loading