Skip to content

DLPX-94056 HOP: Performance Tuning causing Unit Test case to break #8

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

Merged
merged 1 commit into from
May 29, 2025
Merged

DLPX-94056 HOP: Performance Tuning causing Unit Test case to break #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 10 additions & 34 deletions engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1579,23 +1579,11 @@ private Object[] handleGetRow() throws HopException {
// The buffer to grow beyond "a few" entries.
// We'll only do that if the previous transform has not ended...

if (!isStopped() && row == null) {
boolean streamReady = false;
// Check each other input stream to see that stream meets the threshold
for (int r = 0; r < inputRowSets.size(); r++) {
if (inputRowSet.isDone() || inputRowSet.size() > lowerBufferBoundary) {
streamReady = true;
break;
}
nextInputStream();
inputRowSet = currentInputStream();
}
if (!streamReady) {
try {
Thread.sleep(0, 1); // Minimum sleeps vary by OS scheduler, this could be 1ms or more
} catch (InterruptedException e) {
// Ignore sleep interruption exception
}
if (!inputRowSet.isDone() && inputRowSet.size() <= lowerBufferBoundary && !isStopped()) {
try {
Thread.sleep(0, 1);
} catch (InterruptedException e) {
// Ignore sleep interruption exception
}
}

Expand Down Expand Up @@ -1938,23 +1926,11 @@ public Object[] handleGetRowFrom(IRowSet rowSet) throws HopTransformException {
// The buffer to grow beyond "a few" entries.
// We'll only do that if the previous transform has not ended...

if (!isStopped()) {
boolean streamReady = false;
// Check each other input stream to see that stream meets the threshold
for (int r = 0; r < inputRowSets.size(); r++) {
if (rowSet.isDone() || rowSet.size() > lowerBufferBoundary) {
streamReady = true;
break;
}
nextInputStream();
rowSet = currentInputStream();
}
if (!streamReady) {
try {
Thread.sleep(0, 1); // Minimum sleeps vary by OS scheduler, this could be 1ms or more
} catch (InterruptedException e) {
// Ignore sleep interruption exception
}
if (!rowSet.isDone() && rowSet.size() <= lowerBufferBoundary && !isStopped()) {
try {
Thread.sleep(0, 1);
} catch (InterruptedException e) {
// Ignore sleep interruption exception
}
}

Expand Down
6 changes: 3 additions & 3 deletions engine/src/test/java/org/apache/hop/pipeline/transform/DynamicWaitTimesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,21 @@ public class DynamicWaitTimesTest extends TestCase {

public void testSingleStreamStatus() {
IRowSet rowSet = new BlockingRowSet(3);
status = DynamicWaitTimes.build(Collections.singletonList(rowSet), () -> 0);
status = DynamicWaitTimes.build(Collections.singletonList(rowSet), () -> 0, 20);
assertEquals(1, status.get());
status.adjust(true, rowSet);
assertEquals(2, status.get());
for (int i = 0; i < 10; i++) {
status.adjust(true, rowSet);
}
assertEquals(DynamicWaitTimes.MAX_TIMEOUT, status.get());
assertEquals(20, status.get());
}

public void testMultiStreamStatus() {
List<IRowSet> rowSetList =
new ArrayList<>(
Arrays.asList(new BlockingRowSet(1), new BlockingRowSet(2), new BlockingRowSet(7)));
status = DynamicWaitTimes.build(rowSetList, () -> activeStreamIndex.get());
status = DynamicWaitTimes.build(rowSetList, () -> activeStreamIndex.get(), 20);
for (IRowSet iRowSet : rowSetList) {
status.adjust(false, iRowSet);
assertEquals(1, status.get());
Expand Down