Skip to content

[FLINK-22143][table runtime] fix less lines than requested returned by LimitableBulk… #15513

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 2 commits into from
Apr 9, 2021
Merged

[FLINK-22143][table runtime] fix less lines than requested returned by LimitableBulk… #15513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c42bdcb
[FLINK-22143] fix less lines than requested returned by LimitableBulk…
iyupeng Apr 7, 2021
0e2e25e
[FLINK-22143] add a test case for limit over batches in LimitableBul…
iyupeng Apr 8, 2021
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
9 changes: 7 additions & 2 deletions ...le-runtime-blink/src/main/java/org/apache/flink/table/filesystem/LimitableBulkFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,13 @@ public RecordAndPosition<T> next() {
if (reachLimit()) {
return null;
}
numRead.incrementAndGet();
return iterator.next();

RecordAndPosition<T> ret = iterator.next();
if (ret != null) {
numRead.incrementAndGet();
}

return ret;
}

@Override
Expand Down
34 changes: 34 additions & 0 deletions ...untime-blink/src/test/java/org/apache/flink/table/filesystem/LimitableBulkFormatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@
package org.apache.flink.table.filesystem;

import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.MemorySize;
import org.apache.flink.connector.file.src.FileSourceSplit;
import org.apache.flink.connector.file.src.impl.StreamFormatAdapter;
import org.apache.flink.connector.file.src.reader.BulkFormat;
import org.apache.flink.connector.file.src.reader.StreamFormat;
import org.apache.flink.connector.file.src.reader.TextLineFormat;
import org.apache.flink.connector.file.src.util.Utils;
import org.apache.flink.core.fs.Path;
Expand Down Expand Up @@ -65,4 +67,36 @@ public void test() throws IOException {
Utils.forEachRemaining(reader, s -> i.incrementAndGet());
Assert.assertEquals(22, i.get());
}

@Test
public void testLimitOverBatches() throws IOException {
// prepare file
File file = TEMP_FOLDER.newFile();
file.createNewFile();
StringBuilder builder = new StringBuilder();
for (int i = 0; i < 10000; i++) {
builder.append(i).append("\n");
}
FileUtils.writeFileUtf8(file, builder.toString());

// set limit
Long limit = 2048L;

// configuration for small batches
Configuration conf = new Configuration();
conf.set(StreamFormat.FETCH_IO_SIZE, MemorySize.parse("4k"));

// read
BulkFormat<String, FileSourceSplit> format =
LimitableBulkFormat.create(new StreamFormatAdapter<>(new TextLineFormat()), limit);

BulkFormat.Reader<String> reader =
format.createReader(
conf, new FileSourceSplit("id", new Path(file.toURI()), 0, file.length()));

// check
AtomicInteger i = new AtomicInteger(0);
Utils.forEachRemaining(reader, s -> i.incrementAndGet());
Assert.assertEquals(limit.intValue(), i.get());
}
}