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 2014/09/28 18:13:02 UTC
[1/3] git commit: Rename the constant for the default BGP reorder
function.
Repository: jena
Updated Branches:
refs/heads/master bbb9cfcaa -> 16fd26026
Rename the constant for the default BGP reorder function.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5a8c7432
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5a8c7432
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5a8c7432
Branch: refs/heads/master
Commit: 5a8c7432508dc690b8f6d4f67be515de6217c44a
Parents: bbb9cfc
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 27 22:50:24 2014 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 27 22:50:24 2014 +0100
----------------------------------------------------------------------
.../java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java | 2 +-
.../src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java | 2 +-
jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java | 6 +++---
.../com/hp/hpl/jena/tdb/graph/AbstractTestGraphsTDB.java | 6 +++---
.../src/test/java/com/hp/hpl/jena/tdb/junit/Base_TS.java | 8 ++++----
5 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/5a8c7432/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
index 28548b5..3a01f60 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
@@ -383,7 +383,7 @@ public class DatasetBuilderStd implements DatasetBuilder {
}
if ( reorder == null )
- reorder = SystemTDB.defaultOptimizer ;
+ reorder = SystemTDB.defaultReorderTransform ;
if ( reorder == null && warnAboutOptimizer )
ARQ.getExecLogger().warn("No BGP optimizer") ;
http://git-wip-us.apache.org/repos/asf/jena/blob/5a8c7432/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
index 280dd47..0a481bf 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
@@ -184,7 +184,7 @@ public class SystemTDB
// public static final int SyncTick = intValue("SyncTick", -1) ;
/** Default BGP optimizer */
- public static ReorderTransformation defaultOptimizer = ReorderLib.fixed() ;
+ public static ReorderTransformation defaultReorderTransform = ReorderLib.fixed() ;
public static final ByteOrder NetworkOrder = ByteOrder.BIG_ENDIAN ;
http://git-wip-us.apache.org/repos/asf/jena/blob/5a8c7432/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java
index e05cdcc..fe9d58d 100644
--- a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java
+++ b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java
@@ -78,11 +78,11 @@ public class TC_TDB
//org.apache.log4j.PropertyConfigurator.configure("log4j.properties") ;
Logger.getLogger("com.hp.hpl.jena.tdb.info").setLevel(Level.WARN) ;
//Logger.getLogger("com.hp.hpl.jena.tdb.exec").setLevel(Level.WARN) ;
- dftReorder = SystemTDB.defaultOptimizer ;
- SystemTDB.defaultOptimizer = ReorderLib.identity() ;
+ dftReorder = SystemTDB.defaultReorderTransform ;
+ SystemTDB.defaultReorderTransform = ReorderLib.identity() ;
}
@AfterClass static public void afterClass() {
- SystemTDB.defaultOptimizer = dftReorder ;
+ SystemTDB.defaultReorderTransform = dftReorder ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/5a8c7432/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/AbstractTestGraphsTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/AbstractTestGraphsTDB.java b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/AbstractTestGraphsTDB.java
index 2ea90f9..46ebe55 100644
--- a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/AbstractTestGraphsTDB.java
+++ b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/AbstractTestGraphsTDB.java
@@ -36,11 +36,11 @@ public class AbstractTestGraphsTDB extends GraphsTests
@BeforeClass public static void setupClass()
{
- reorder = SystemTDB.defaultOptimizer ;
- SystemTDB.defaultOptimizer = ReorderLib.identity() ;
+ reorder = SystemTDB.defaultReorderTransform ;
+ SystemTDB.defaultReorderTransform = ReorderLib.identity() ;
}
- @AfterClass public static void afterClass() { SystemTDB.defaultOptimizer = reorder ; }
+ @AfterClass public static void afterClass() { SystemTDB.defaultReorderTransform = reorder ; }
@Override
protected Dataset createDataset()
http://git-wip-us.apache.org/repos/asf/jena/blob/5a8c7432/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/Base_TS.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/Base_TS.java b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/Base_TS.java
index 37c5b0d..77b7da4 100644
--- a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/Base_TS.java
+++ b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/Base_TS.java
@@ -34,17 +34,17 @@ public class Base_TS
@BeforeClass static public void beforeClass()
{
- rt = SystemTDB.defaultOptimizer ;
+ rt = SystemTDB.defaultReorderTransform ;
level = Logger.getLogger("com.hp.hpl.jena.tdb.info").getLevel() ;
Logger.getLogger("com.hp.hpl.jena.tdb.info").setLevel(Level.FATAL) ;
- SystemTDB.defaultOptimizer = ReorderLib.identity() ;
- rt = SystemTDB.defaultOptimizer ;
+ SystemTDB.defaultReorderTransform = ReorderLib.identity() ;
+ rt = SystemTDB.defaultReorderTransform ;
}
@AfterClass static public void afterClass()
{
if ( level != null )
Logger.getLogger("com.hp.hpl.jena.tdb.info").setLevel(level) ;
- SystemTDB.defaultOptimizer = rt ;
+ SystemTDB.defaultReorderTransform = rt ;
}
}
[2/3] git commit: Make SolverLib.solve public.
Posted by an...@apache.org.
Make SolverLib.solve public.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f786f7ba
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f786f7ba
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f786f7ba
Branch: refs/heads/master
Commit: f786f7ba2f583e4d4d6c2627fc42a00a1d01fad4
Parents: 5a8c743
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Sep 27 23:01:46 2014 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Sep 27 23:01:46 2014 +0100
----------------------------------------------------------------------
.../main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f786f7ba/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java
index bb05ddf..78bb5fe 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java
@@ -200,11 +200,11 @@ public class SolverLib
}
}
- private static Iterator<BindingNodeId> solve(NodeTupleTable nodeTupleTable,
- Tuple<Node> tuple,
- boolean anyGraph,
- Iterator<BindingNodeId> chain, Filter<Tuple<NodeId>> filter,
- ExecutionContext execCxt)
+ public static Iterator<BindingNodeId> solve(NodeTupleTable nodeTupleTable,
+ Tuple<Node> tuple,
+ boolean anyGraph,
+ Iterator<BindingNodeId> chain, Filter<Tuple<NodeId>> filter,
+ ExecutionContext execCxt)
{
return new StageMatchTuple(nodeTupleTable, chain, tuple, anyGraph, filter, execCxt) ;
}
[3/3] git commit: Flush stream after debugging info.
Posted by an...@apache.org.
Flush stream after debugging info.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/16fd2602
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/16fd2602
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/16fd2602
Branch: refs/heads/master
Commit: 16fd2602607ab3c91c61c2e98ada365cf9eb54a9
Parents: f786f7b
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Sep 28 17:11:38 2014 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Sep 28 17:11:38 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/atlas/iterator/Iter.java | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/16fd2602/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
index d74a141..03cd674 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
@@ -621,14 +621,16 @@ public class Iter<T> implements Iterable<T>, Iterator<T> {
* occurs when the returned iterator is used
*/
public static <T> Iterator<T> debug(final PrintStream out, Iterator<T> stream) {
- Transform<T, T> x = new Transform<T, T>() {
- @Override
- public T convert(T item) {
- out.println(item) ;
- return item ;
- }
- } ;
- return map(stream, x) ;
+ try {
+ Transform<T, T> x = new Transform<T, T>() {
+ @Override
+ public T convert(T item) {
+ out.println(item) ;
+ return item ;
+ }
+ } ;
+ return map(stream, x) ;
+ } finally { out.flush() ; }
}
/** Print an iterator (destructive) */