Merge remote-tracking branch 'remotes/upstream/master'

UCREL · Aug 16, 2021 · 04dc281 · 04dc281
2 parents 2706c11 + 9d03c92
commit 04dc281
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/main/java/storage/ColumnSet.java b/src/main/java/storage/ColumnSet.java
@@ -234,14 +234,18 @@ private Map<Integer, Map<String, String>> getRle(Collection<Integer> rowIndices)
         int currentIndex = 0;
         int posInRleInMem = 0;
         for (int index : rowIndices) {
-            Map<String, String> row = new LinkedHashMap<>();
-            while (currentIndex <= index) {
-                lastVal = rleInMem[posInRleInMem++];
-                currentIndex += rleInMem[posInRleInMem++];
+            try {
+                Map<String, String> row = new LinkedHashMap<>();
+                while (currentIndex <= index) {
+                    lastVal = rleInMem[posInRleInMem++];
+                    currentIndex += rleInMem[posInRleInMem++];
+                }
+                row = numericValueToRowMap(lastVal);
+                //row.put("i", Integer.toString(index));
+                rows.put(index, row);
+            } catch (Exception e){
+                LOG.debug("Spooled off end of corpus");
             }
-            row = numericValueToRowMap(lastVal);
-            //row.put("i", Integer.toString(index));
-            rows.put(index, row);
         }
 
         return rows;
@@ -261,10 +265,10 @@ private Map<Integer, Map<String, String>> getNonRle(Collection<Integer> rowIndic
                 //int numericValue = buf.getInt(index*4);
                 row = numericValueToRowMap(numericValue);
                 //row.put("i", Integer.toString(index));
+                rows.put(index, row);
             } catch (Exception e) {
-                e.printStackTrace();
+                LOG.debug("Spooled off end of corpus");
             }
-            rows.put(index, row);
         }
 
         fc.close();