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/07/02 20:26:18 UTC
jena git commit: Fix new warnings (Eclipse Oxygen)
Repository: jena
Updated Branches:
refs/heads/master 13aa5535a -> 07d52de4e
Fix new warnings (Eclipse Oxygen)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/07d52de4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/07d52de4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/07d52de4
Branch: refs/heads/master
Commit: 07d52de4e84ec9dbea05fd23b4e17cbb77ed07b0
Parents: 13aa553
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 2 21:26:07 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 2 21:26:07 2017 +0100
----------------------------------------------------------------------
.../algebra/optimize/TransformEliminateAssignments.java | 2 +-
.../src/main/java/org/apache/jena/fuseki/mgt/Backup.java | 8 ++++----
.../org/apache/jena/tdb/base/block/BlockMgrFreeChain.java | 5 -----
.../org/apache/jena/tdb/transaction/BlockMgrJournal.java | 3 ++-
4 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/07d52de4/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformEliminateAssignments.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformEliminateAssignments.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformEliminateAssignments.java
index 357113f..c558702 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformEliminateAssignments.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformEliminateAssignments.java
@@ -466,7 +466,7 @@ public class TransformEliminateAssignments extends TransformCopy {
int i = getUsageCount(var);
if (i > 2) {
- this.assignments.remove(var);
+ this.assignments.remove(Var.alloc(var));
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/07d52de4/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/Backup.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/Backup.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/Backup.java
index 73bb3ea..1befcd7 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/Backup.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/Backup.java
@@ -19,7 +19,6 @@
package org.apache.jena.fuseki.mgt;
import java.io.* ;
-import java.util.HashSet ;
import java.util.Set ;
import java.util.zip.GZIPOutputStream ;
@@ -35,6 +34,7 @@ import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.Transactional ;
import org.apache.jena.sparql.core.TransactionalNull ;
+import org.eclipse.jetty.util.ConcurrentHashSet ;
/** Perform a backup */
public class Backup
@@ -56,9 +56,9 @@ public class Backup
return filename ;
}
- // Rcord of all backups so we don't attempt to backup the
+ // Record of all backups so we don't attempt to backup the
// same dataset multiple times at the same time.
- private static Set<DatasetGraph> activeBackups = new HashSet<>() ;
+ private static Set<DatasetGraph> activeBackups = new ConcurrentHashSet<>() ;
/** Perform a backup.
* A backup is a dump of the datset in comrpessed N-Quads, done inside a transaction.
@@ -86,7 +86,7 @@ public class Backup
// Per backup source lock.
synchronized(activeBackups) {
// Atomically check-and-set
- if ( activeBackups.contains(backupfile) )
+ if ( activeBackups.contains(dsg) )
Log.warn(Fuseki.serverLog, "Backup already in progress") ;
activeBackups.add(dsg) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/07d52de4/jena-tdb/src/main/java/org/apache/jena/tdb/base/block/BlockMgrFreeChain.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/base/block/BlockMgrFreeChain.java b/jena-tdb/src/main/java/org/apache/jena/tdb/base/block/BlockMgrFreeChain.java
index 7005c4f..5eb8b39 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/base/block/BlockMgrFreeChain.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/base/block/BlockMgrFreeChain.java
@@ -65,11 +65,6 @@ public class BlockMgrFreeChain extends BlockMgrWrapper
return super.valid(id) ;
}
- private boolean isFree(int id)
- {
- return freeBlocks.contains(id) ;
- }
-
@Override
public void sync()
{
http://git-wip-us.apache.org/repos/asf/jena/blob/07d52de4/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/BlockMgrJournal.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/BlockMgrJournal.java b/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/BlockMgrJournal.java
index ba0b8e8..025d716 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/BlockMgrJournal.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/BlockMgrJournal.java
@@ -273,7 +273,8 @@ public class BlockMgrJournal implements BlockMgr, TransactionLifecycle
public boolean valid(int id)
{
checkIfClosed() ;
- if ( writeBlocks.containsKey(id) ) return true ;
+ if ( writeBlocks.containsKey(Long.valueOf(id)))
+ return true ;
return blockMgr.valid(id) ;
}