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 2015/06/17 22:55:28 UTC
[14/15] jena git commit: move checksum calculation into Entity
move checksum calculation into Entity
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/454af09c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/454af09c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/454af09c
Branch: refs/heads/master
Commit: 454af09c018729f5fd275e12a2a9241a48340458
Parents: 01c7fd5
Author: Alexis Miara <al...@hotmail.com>
Authored: Tue Jun 9 14:32:17 2015 -0400
Committer: Alexis Miara <al...@hotmail.com>
Committed: Tue Jun 9 14:32:17 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/query/text/Entity.java | 9 ++++++++-
.../java/org/apache/jena/query/text/TextIndexLucene.java | 9 ++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/454af09c/jena-text/src/main/java/org/apache/jena/query/text/Entity.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/Entity.java b/jena-text/src/main/java/org/apache/jena/query/text/Entity.java
index c7757a3..4ca5782 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/Entity.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/Entity.java
@@ -18,6 +18,8 @@
package org.apache.jena.query.text;
+import org.apache.commons.codec.digest.DigestUtils;
+
import java.util.HashMap ;
import java.util.Map ;
@@ -54,7 +56,12 @@ public class Entity
{ return map.get(key) ; }
public Map<String, Object> getMap() { return map ; }
-
+
+ public String getChecksum(String property, String value) {
+ String key = getGraph() + "-" + getId() + "-" + property + "-" + value + "-" + getLanguage();
+ return DigestUtils.sha256Hex(key);
+ }
+
@Override
public String toString() {
return id+" : "+map ;
http://git-wip-us.apache.org/repos/asf/jena/blob/454af09c/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
index 51873c6..c677184 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
@@ -22,7 +22,6 @@ import java.io.IOException ;
import java.util.* ;
import java.util.Map.Entry ;
-import org.apache.commons.codec.digest.DigestUtils;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.sparql.util.NodeFactoryExtra ;
@@ -223,8 +222,8 @@ public class TextIndexLucene implements TextIndex {
Map<String, Object> map = entity.getMap();
String property = map.keySet().iterator().next();
String value = (String)map.get(property);
- String key = entity.getGraph() + "-" + entity.getId() + "-" + property + "-" + value + "-" + entity.getLanguage();
- Term uid = new Term(docDef.getUidField(), DigestUtils.sha256Hex(key));
+ String hash = entity.getChecksum(property, value);
+ Term uid = new Term(docDef.getUidField(), hash);
indexWriter.deleteDocuments(uid);
} catch (Exception e) {
@@ -254,8 +253,8 @@ public class TextIndexLucene implements TextIndex {
doc.add(new Field(langField, lang, StringField.TYPE_STORED));
}
if (uidField != null) {
- String key = entity.getGraph() + "-" + entity.getId() + "-" + e.getKey() + "-" + e.getValue() + "-" + entity.getLanguage();
- doc.add(new Field(uidField, DigestUtils.sha256Hex(key), StringField.TYPE_STORED));
+ String hash = entity.getChecksum(e.getKey(), (String) e.getValue());
+ doc.add(new Field(uidField, hash, StringField.TYPE_STORED));
}
}
return doc ;