You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2017/10/23 19:53:40 UTC
[1/2] jena git commit: Clean up new Java warnings
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 <an...@apache.org>
Authored: Mon Oct 23 20:52:57 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
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 ; }
[2/2] jena git commit: Don't try to tpocess OpTable (was a spurious
warning)
Posted by an...@apache.org.
Don't try to tpocess OpTable (was a spurious warning)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/eac7feb4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/eac7feb4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/eac7feb4
Branch: refs/heads/master
Commit: eac7feb4be2de034dbf6f55468e6355854d08e7a
Parents: d043b29
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Oct 23 20:53:29 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Oct 23 20:53:29 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/sdb/compiler/TransformSDB.java | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/eac7feb4/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/TransformSDB.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/TransformSDB.java b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/TransformSDB.java
index e2bfda6..e82e8cc 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/TransformSDB.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/TransformSDB.java
@@ -155,15 +155,6 @@ public class TransformSDB extends TransformCopy
return super.transform(opFilter, op) ;
}
- @Override
- public Op transform(OpTable opTable)
- {
- if ( ! opTable.isJoinIdentity())
- log.error("OpTable : Not join identity") ;
- //return new OpSQL(null, opUnit, request) ;
- return super.transform(opTable) ;
- }
-
// Modifiers: the structure is:
// slice
// distinct/reduced