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 2018/06/28 08:47:56 UTC
[1/4] jena git commit: Remove javadoc @link from main to test
Repository: jena
Updated Branches:
refs/heads/master 44b478ea8 -> 2dbfdd280
Remove javadoc @link from main to test
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2dbfdd28
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2dbfdd28
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2dbfdd28
Branch: refs/heads/master
Commit: 2dbfdd280afeb553bd2d010852f34f7d080187ec
Parents: 59445de
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Jun 28 09:46:33 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jun 28 09:46:42 2018 +0100
----------------------------------------------------------------------
jena-core/src/main/java/org/apache/jena/ontology/OntTools.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2dbfdd28/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java b/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
index f398059..bf3c87f 100755
--- a/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
@@ -35,7 +35,7 @@ import org.apache.jena.shared.JenaException ;
* Some general utilities and algorithms to support developers working with the
* general classes in the Jena ontology API. <strong>Warning</strong> these
* utilities are <strong>experimental</strong>. Extensive testing has not yet
- * occurred (see {@link org.apache.jena.ontology.impl.TestOntTools} in the
+ * occurred (see {@code org.apache.jena.ontology.impl.TestOntTools} in the
* test area for basic unit tests),
* and in particular performance testing has not been carried out yet.
* Users are advised to exercise caution before relying on these utilities in
[2/4] jena git commit: Clean up transactions on threads to avoid a
(harmless) warning.
Posted by an...@apache.org.
Clean up transactions on threads to avoid a (harmless) warning.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/35cbd473
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/35cbd473
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/35cbd473
Branch: refs/heads/master
Commit: 35cbd473ed053fd0ad76f2286d364632b1e29956
Parents: 1fd3936
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jun 26 17:49:03 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jun 28 09:46:42 2018 +0100
----------------------------------------------------------------------
.../TestTransactionCoordinatorControl.java | 36 +++++++++++++++-----
1 file changed, 27 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/35cbd473/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TestTransactionCoordinatorControl.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TestTransactionCoordinatorControl.java b/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TestTransactionCoordinatorControl.java
index 2b6c962..ee65cfc 100644
--- a/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TestTransactionCoordinatorControl.java
+++ b/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TestTransactionCoordinatorControl.java
@@ -71,19 +71,37 @@ public class TestTransactionCoordinatorControl {
Transaction txn = L.syncCallThread(()->txnMgr.begin(TxnType.WRITE, false)) ;
assertNull(txn) ;
txnMgr.enableWriters();
- Transaction txn1 = L.syncCallThread(()->txnMgr.begin(TxnType.WRITE, false)) ;
- assertNotNull(txn1) ;
+ Transaction txn2 = L.syncCallThread(()-> {
+ Transaction txn1 = txnMgr.begin(TxnType.WRITE, false);
+ assertNotNull(txn1);
+ txn1.abort(); txn1.end();
+ return txn1;
+ }) ;
+ assertNotNull(txn2) ;
}
@Test public void txn_coord_disable_writers_3() {
txnMgr.blockWriters();
- Transaction txn = L.syncCallThread(()->txnMgr.begin(TxnType.READ, false)) ;
+ Transaction txn = L.syncCallThread(() -> {
+ Transaction tx = txnMgr.begin(TxnType.READ, false);
+ tx.end();
+ return tx;
+ });
assertNotNull(txn) ;
txnMgr.enableWriters();
- Transaction txn1 = L.syncCallThread(()->txnMgr.begin(TxnType.WRITE, false)) ;
- assertNotNull(txn1) ;
- Transaction txn2 = L.syncCallThread(()->txnMgr.begin(TxnType.READ, false)) ;
- assertNotNull(txn2) ;
+ Transaction txn1 = L.syncCallThread(() -> {
+ Transaction tx = txnMgr.begin(TxnType.WRITE, false);
+ tx.commit();
+ tx.end();
+ return tx;
+ });
+ assertNotNull(txn1);
+ Transaction txn2 = L.syncCallThread(() -> {
+ Transaction tx = txnMgr.begin(TxnType.READ, false);
+ tx.end();
+ return tx;
+ });
+ assertNotNull(txn2);
}
@Test(expected=TransactionException.class)
@@ -116,6 +134,8 @@ public class TestTransactionCoordinatorControl {
assertNotNull(txn1) ;
Transaction txn2 = txnMgr.begin(TxnType.READ, false) ;
assertNotNull(txn2) ;
+ txn1.commit(); txn1.end();
+ txn2.commit(); txn2.end();
}) ;
}
@@ -134,7 +154,5 @@ public class TestTransactionCoordinatorControl {
b = txnMgr.tryExclusiveMode(false);
assertTrue(b) ;
}
-
-
}
[4/4] jena git commit: Skip secondary pass (and message) if no work
to be done.
Posted by an...@apache.org.
Skip secondary pass (and message) if no work to be done.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1fd39361
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1fd39361
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1fd39361
Branch: refs/heads/master
Commit: 1fd393617051904093ece81ce052532e70f8dd79
Parents: 44b478e
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jun 26 17:48:22 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jun 28 09:46:42 2018 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/tdb2/loader/main/LoaderMain.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/1fd39361/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/LoaderMain.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/LoaderMain.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/LoaderMain.java
index 373f24b..458d4f0 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/LoaderMain.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/main/LoaderMain.java
@@ -252,7 +252,8 @@ public class LoaderMain extends LoaderBase implements DataLoader {
/** Execute secondary index building of a {@link LoaderPlan} */
private static void executeSecondary(TupleIndex srcIdx, TupleIndex[][] indexSets, DatasetGraphTDB dsgtdb, MonitorOutput output) {
-
+ if ( indexSets.length == 0 )
+ return;
List<BulkStartFinish> processes = new ArrayList<>();
output.print("Start replay index %s", srcIdx.getName());
// For each phase.
[3/4] jena git commit: Javadoc
Posted by an...@apache.org.
Javadoc
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/59445de4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/59445de4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/59445de4
Branch: refs/heads/master
Commit: 59445de4d9dcac41aa064d4bd20777fd19b0043b
Parents: 35cbd47
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jun 26 17:49:19 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jun 28 09:46:42 2018 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/dboe/migrate/L.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/59445de4/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/migrate/L.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/migrate/L.java b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/migrate/L.java
index 14d4baf..189f97f 100644
--- a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/migrate/L.java
+++ b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/migrate/L.java
@@ -109,9 +109,8 @@ public class L {
return null ;
}
}
-
- /** Execute. Preform the "before" action, then main action.
+ /** Execute. Perform the "before" action, then main action.
* Always call the "after" runnable if the "before" succeeded.
* Be careful about argument order.
* @param action
@@ -124,7 +123,7 @@ public class L {
finally { after.run(); }
}
- /** Execute. Preform the "before" action, then main action.
+ /** Execute. Perform the "before" action, then main action.
* Always call the "after" runnable if the "before" succeeded.
* Be careful about argument order.
* @param action
@@ -174,9 +173,9 @@ public class L {
}
}
- /** Read a whole stream as UTF-8
+ /** Write a string into an {@link OutputStream} as UTF-8.
*
- * @param out OutputStream to be read
+ * @param out OutputStream destination.
* @param content String to be written
* @throws IOException
*/
@@ -189,7 +188,7 @@ public class L {
// ==> IO.writeWholeFileAsUTF8
- /** String to ByteBuffer */
+ /** String to ByteBuffer as UTF-8 bytes */
public static ByteBuffer stringToByteBuffer(String str) {
byte[] b = StrUtils.asUTF8bytes(str) ;
return ByteBuffer.wrap(b) ;