Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@ private static String buildDescription(ExpressionFactory factory) {
if (expr.isOperator()) {
operators.add(expr);
} else {
primaries.add(expr);
if (expr != null) {
primaries.add(expr);
}
}
}
Collections.sort(operators, new Comparator<Expression>() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,10 @@ public int solve(int[] prefix, SolutionAcceptor<ColumnName> output) {
}
int result = search(choices, output);
for(int i=prefix.length-1; i >=0; --i) {
rollback(choices.get(i));
Node<ColumnName> choice = choices.get(i);
if (choice != null) {
rollback(choice);
}
}
return result;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,11 @@ private Pair<Long, Long> dumpStoreEntries(
}
List<DirListingMetadata> childMD = new ArrayList<>(childDirs.size());
for (DDBPathMetadata childDir : childDirs) {
childMD.add(getStore().listChildren(
childDir.getFileStatus().getPath()));
DirListingMetadata data = getStore().listChildren(
childDir.getFileStatus().getPath());
if (data != null) {
childMD.add(data);
}
}
pushAll(queue, childMD);
}
Expand Down