Repository: jena Updated Branches: refs/heads/master 48769a510 -> eac7feb4b
Clean up new Java warnings Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d043b294 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d043b294 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d043b294 Branch: refs/heads/master Commit: d043b294d9dda598ea60d1e553425a1781571e76 Parents: 48769a5 Author: Andy Seaborne <[email protected]> Authored: Mon Oct 23 20:52:57 2017 +0100 Committer: Andy Seaborne <[email protected]> Committed: Mon Oct 23 20:52:57 2017 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/jena/sdb/compiler/PatternTable.java | 2 +- .../main/java/org/apache/jena/sdb/core/sqlnode/SqlProject.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/d043b294/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/PatternTable.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/PatternTable.java b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/PatternTable.java index 57739ee..a4bba4a 100644 --- a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/PatternTable.java +++ b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/PatternTable.java @@ -58,7 +58,7 @@ public class PatternTable extends TableDesc @Override public boolean hasColumn(String colName) - { return cols.containsKey(colName) ; } + { return cols.values().contains(colName) ; } @Override public Iterator<String> colNames() http://git-wip-us.apache.org/repos/asf/jena/blob/d043b294/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/SqlProject.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/SqlProject.java b/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/SqlProject.java index dbb0365..4fdc4e1 100644 --- a/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/SqlProject.java +++ b/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/SqlProject.java @@ -105,7 +105,8 @@ public class SqlProject extends SqlNodeBase1 public SqlProject asProject() { return this ; } @Override - public boolean usesColumn(SqlColumn c) { return cols.contains(c) ; } + public boolean usesColumn(SqlColumn c) + { return cols.stream().filter((a)-> a.getColumn().equals(c)).findAny().isPresent(); } public List<ColAlias> getCols() { return cols ; }
