fix rawfile tests

pravega · Oct 25, 2023 · fe0881d · fe0881d
1 parent f8e9acb
commit fe0881d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/parquet-file-sample-data/sub1.parquet b/parquet-file-sample-data/sub1.parquet
diff --git a/parquet-file-sample-data/sub2.parquet b/parquet-file-sample-data/sub2.parquet
diff --git a/parquet-file-sample-data/sub3.parquet b/parquet-file-sample-data/sub3.parquet
diff --git a/...ga-sensor-collector/src/main/java/io/pravega/sensor/collector/rawfile/EventGenerator.java b/...ga-sensor-collector/src/main/java/io/pravega/sensor/collector/rawfile/EventGenerator.java
@@ -67,8 +67,10 @@ protected Pair<Long, Long> generateEventsFromInputStream(CountingInputStream inp
             byte[] byteArray = inputStream.readAllBytes();
             //TODO: Batching
 
-            consumer.accept(new PravegaWriterEvent(routingKey, nextSequenceNumber, byteArray));
-            nextSequenceNumber++;			        
+            if (byteArray.length > 0) {         //non-empty file
+                consumer.accept(new PravegaWriterEvent(routingKey, nextSequenceNumber, byteArray));
+                nextSequenceNumber++;
+            }			        
             final long endOffset = inputStream.getCount();
 
             return new ImmutablePair<>(nextSequenceNumber, endOffset);

diff --git a/...nsor-collector/src/test/java/io/pravega/sensor/collector/rawfile/EventGeneratorTests.java b/...nsor-collector/src/test/java/io/pravega/sensor/collector/rawfile/EventGeneratorTests.java
@@ -28,7 +28,7 @@ public void TestFile() throws IOException {
         final List<PravegaWriterEvent> events = new ArrayList<>();
         Pair<Long, Long> nextSequenceNumberAndOffset = eventGenerator.generateEventsFromInputStream(inputStream, 100, events::add);
         log.info("events={}", events);
-        Assert.assertEquals(102L, (long) nextSequenceNumberAndOffset.getLeft());
+        Assert.assertEquals(101L, (long) nextSequenceNumberAndOffset.getLeft());
         Assert.assertEquals(rawfileStr.length(), (long) nextSequenceNumberAndOffset.getRight());
     }
 

diff --git a/...or-collector/src/test/java/io/pravega/sensor/collector/rawfile/RawFileProcessorTests.java b/...or-collector/src/test/java/io/pravega/sensor/collector/rawfile/RawFileProcessorTests.java
@@ -35,7 +35,8 @@ public void getNewFilesTest() {
 
     @Test
     public void getDirectoryListingTest() throws IOException {
-        final List<FileNameWithOffset> actual = FileUtils.getDirectoryListing("../raw-file-sample-data","parquet");
+        final List<FileNameWithOffset> actual = FileUtils.getDirectoryListing(
+                "../raw-file-sample-data/","parquet");
         log.info("actual={}", actual);
     }
 }