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 <[email protected]> Authored: Sat Sep 27 22:50:24 2014 +0100 Committer: Andy Seaborne <[email protected]> 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 ; } }
