Skip to content
Open
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
047ca4c
[FLINK] Support ORC filesystem sink format
zhanglistar Jun 22, 2026
33077f2
[FLINK] Add Nexmark q10 ORC test dependencies
zhanglistar Jun 22, 2026
a655cce
Update Flink ORC velox4j dependency
zhanglistar Jun 22, 2026
32520f8
Update Flink CI Velox4J revision
zhanglistar Jun 22, 2026
577f25b
[FLINK] Verify ORC sink output read-back
zhanglistar Jun 23, 2026
40f95a4
Update Flink CI Velox4J ORC revision
zhanglistar Jun 23, 2026
284f690
Update Flink CI Velox4J revision
zhanglistar Jun 23, 2026
16903b9
[FLINK] Gracefully finish two-input Velox operators
zhanglistar Jun 23, 2026
8d6e784
[FLINK] Test two-input operator close cleanup
zhanglistar Jun 23, 2026
9b1a6cc
[FLINK] Add dedicated Nexmark ORC q10 query
zhanglistar Jun 23, 2026
21c3dbf
[FLINK] Avoid finishing Velox tasks during close
zhanglistar Jun 23, 2026
d24ae30
[FLINK] Update Velox4J ORC revision
zhanglistar Jun 23, 2026
5d5dffb
[FLINK] Update Velox4J gluten-0530 revision
zhanglistar Jun 23, 2026
d991fb9
[FLINK] Update Velox4J gluten-0530 revision
zhanglistar Jun 29, 2026
7281193
[FLINK] Fix spotless format for operator implements
zhanglistar Jun 29, 2026
2ace364
[FLINK] Fix spotless format for NexmarkTest
zhanglistar Jun 30, 2026
8dffd9b
[FLINK] Fix close tests for unbindNativeCallbackTarget
zhanglistar Jun 30, 2026
262bdd0
[FLINK] Remove duplicate noMoreInput from close to fix VeloxException
zhanglistar Jun 30, 2026
3f1f5eb
[FLINK] Fix ORC dependency and restore finishTask in endInput
zhanglistar Jun 30, 2026
0162dc9
[FLINK] Simplify ORC verification to avoid dependency conflicts
zhanglistar Jun 30, 2026
fe1cdde
[FLINK] Move finishTask from endInput to close to fix EmptyOperator NYI
zhanglistar Jun 30, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/flink.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
export fmt_SOURCE=BUNDLED
export folly_SOURCE=BUNDLED
git clone -b gluten-0530 https://github.com/bigo-sg/velox4j.git
cd velox4j && git reset --hard 97fc1edafebd0f505e613d260f77f92f5252d048
cd velox4j && git reset --hard f112d178576e2010954db01ccae3761aeb200a47
git apply $GITHUB_WORKSPACE/gluten-flink/patches/fix-velox4j.patch
$GITHUB_WORKSPACE/build/mvn clean install -DskipTests -Dgpg.skip -Dspotless.skip=true
cd ..
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.apache.flink.contrib.streaming.state.RocksDBKeyedStateBackend;
import org.apache.flink.runtime.state.StateInitializationContext;
import org.apache.flink.runtime.state.StateSnapshotContext;
import org.apache.flink.streaming.api.operators.BoundedOneInput;
import org.apache.flink.streaming.api.operators.OneInputStreamOperator;
import org.apache.flink.streaming.api.watermark.Watermark;
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
Expand All @@ -50,7 +51,10 @@

/** Calculate operator in gluten, which will call Velox to run. */
public class GlutenOneInputOperator<IN, OUT> extends TableStreamOperator<OUT>
implements OneInputStreamOperator<IN, OUT>, GlutenOperator, NativeCallbackTarget {
implements OneInputStreamOperator<IN, OUT>,
BoundedOneInput,
GlutenOperator,
NativeCallbackTarget {

private final StatefulPlanNode glutenPlan;
private final String id;
Expand Down Expand Up @@ -218,24 +222,46 @@ private void drainTaskOutput() {
}
UpIterator.State state = task.advance();
if (state == UpIterator.State.AVAILABLE) {
final StatefulElement statefulElement = task.statefulGet();
try {
if (statefulElement.isWatermark()) {
StatefulWatermark watermark = statefulElement.asWatermark();
output.emitWatermark(new Watermark(watermark.getTimestamp()));
} else {
outputBridge.collect(
output, statefulElement.asRecord(), sessionResource.getAllocator(), outputType);
}
} finally {
statefulElement.close();
}
processAvailableElement();
} else {
break;
}
}
}

private void processAvailableElement() {
final StatefulElement statefulElement = task.statefulGet();
try {
if (statefulElement.isWatermark()) {
StatefulWatermark watermark = statefulElement.asWatermark();
output.emitWatermark(new Watermark(watermark.getTimestamp()));
} else {
outputBridge.collect(
output, statefulElement.asRecord(), sessionResource.getAllocator(), outputType);
}
} finally {
statefulElement.close();
}
}

private void finishTask() {
while (true) {
UpIterator.State state = task.advance();
switch (state) {
case AVAILABLE:
processAvailableElement();
break;
case BLOCKED:
task.waitFor();
break;
case FINISHED:
return;
default:
throw new IllegalStateException("Unknown Velox task state: " + state);
}
}
}

public <NIN, NOUT> GlutenOneInputOperator<NIN, NOUT> cloneWithInputOutputClasses(
StatefulPlanNode plan, Class<NIN> newInClass, Class<NOUT> newOutClass) {
return new GlutenOneInputOperator<>(
Expand All @@ -259,10 +285,21 @@ public void processWatermark2(Watermark mark) throws Exception {
throw new UnsupportedOperationException("Not implemented for GlutenOneInputOperator");
}

@Override
public void endInput() throws Exception {
if (inputQueue != null) {
inputQueue.noMoreInput();
}
if (task != null) {
finishTask();
}
}

@Override
public void close() throws Exception {
closing = true;
GlutenCloseables.runWithCleanup(
() -> {},
() -> {
Comment thread
zhanglistar marked this conversation as resolved.
if (task != null) {
task.unbindNativeCallbackTarget();
Expand All @@ -273,11 +310,6 @@ public void close() throws Exception {
task.close();
}
},
() -> {
if (inputQueue != null) {
inputQueue.noMoreInput();
}
},
() -> {
if (inputQueue != null) {
inputQueue.close();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.apache.flink.runtime.state.StateInitializationContext;
import org.apache.flink.runtime.state.StateSnapshotContext;
import org.apache.flink.streaming.api.operators.AbstractStreamOperator;
import org.apache.flink.streaming.api.operators.BoundedMultiInput;
import org.apache.flink.streaming.api.operators.TwoInputStreamOperator;
import org.apache.flink.streaming.api.watermark.Watermark;
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
Expand All @@ -51,7 +52,10 @@
* instead of flink RowData.
*/
public class GlutenTwoInputOperator<IN, OUT> extends AbstractStreamOperator<OUT>
implements TwoInputStreamOperator<IN, IN, OUT>, GlutenOperator, NativeCallbackTarget {
implements TwoInputStreamOperator<IN, IN, OUT>,
BoundedMultiInput,
GlutenOperator,
NativeCallbackTarget {

private static final Logger LOG = LoggerFactory.getLogger(GlutenTwoInputOperator.class);

Expand All @@ -75,6 +79,8 @@ public class GlutenTwoInputOperator<IN, OUT> extends AbstractStreamOperator<OUT>
private VectorOutputBridge<OUT> outputBridge;
private String description;
private final GlutenMailboxHolder mailboxHolder = new GlutenMailboxHolder();
private boolean leftInputEnded;
private boolean rightInputEnded;

public GlutenTwoInputOperator(
StatefulPlanNode plan,
Expand Down Expand Up @@ -198,24 +204,46 @@ private void drainTaskOutput() {
}
UpIterator.State state = task.advance();
if (state == UpIterator.State.AVAILABLE) {
final StatefulElement element = task.statefulGet();
try {
if (element.isWatermark()) {
StatefulWatermark watermark = element.asWatermark();
output.emitWatermark(new Watermark(watermark.getTimestamp()));
} else {
outputBridge.collect(
output, element.asRecord(), sessionResource.getAllocator(), outputType);
}
} finally {
element.close();
}
processAvailableElement();
} else {
break;
}
}
}

private void processAvailableElement() {
final StatefulElement element = task.statefulGet();
try {
if (element.isWatermark()) {
StatefulWatermark watermark = element.asWatermark();
output.emitWatermark(new Watermark(watermark.getTimestamp()));
} else {
outputBridge.collect(
output, element.asRecord(), sessionResource.getAllocator(), outputType);
}
} finally {
element.close();
}
}

private void finishTask() {
while (true) {
UpIterator.State state = task.advance();
switch (state) {
case AVAILABLE:
processAvailableElement();
break;
case BLOCKED:
task.waitFor();
break;
case FINISHED:
return;
default:
throw new IllegalStateException("Unknown Velox task state: " + state);
}
}
}

@Override
public void processWatermark(Watermark mark) throws Exception {
task.notifyWatermark(mark.getTimestamp());
Expand All @@ -234,28 +262,52 @@ public void processWatermark2(Watermark mark) throws Exception {
processElementInternal();
}

@Override
public void endInput(int inputId) throws Exception {
switch (inputId) {
case 1:
leftInputEnded = true;
if (leftInputQueue != null) {
leftInputQueue.noMoreInput();
}
break;
case 2:
rightInputEnded = true;
if (rightInputQueue != null) {
rightInputQueue.noMoreInput();
}
break;
default:
throw new IllegalArgumentException("Unknown input id: " + inputId);
}
if (leftInputEnded && rightInputEnded && task != null) {
finishTask();
}
}

@Override
public void close() throws Exception {
closing = true;
GlutenCloseables.runWithCleanup(
() -> {},
() -> {
if (leftInputQueue != null) {
leftInputQueue.close();
if (task != null) {
task.unbindNativeCallbackTarget();
}
},
() -> {
if (rightInputQueue != null) {
rightInputQueue.close();
if (task != null) {
task.close();
}
},
() -> {
if (task != null) {
task.unbindNativeCallbackTarget();
if (leftInputQueue != null) {
leftInputQueue.close();
}
},
() -> {
if (task != null) {
task.close();
if (rightInputQueue != null) {
rightInputQueue.close();
}
},
() -> {
Expand Down
18 changes: 18 additions & 0 deletions gluten-flink/ut/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,24 @@
<version>${flink.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-orc</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.25.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>2.7.4</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
Loading
Loading