Updated Branches: refs/heads/develop 1dda5639e -> 10955ed5b
attempting a different fix for MARMOTTA-401 Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/10955ed5 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/10955ed5 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/10955ed5 Branch: refs/heads/develop Commit: 10955ed5b6c203d39deec7002c84bf0ad1a9d490 Parents: 1dda563 Author: Sebastian Schaffert <[email protected]> Authored: Thu Dec 12 00:43:34 2013 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Thu Dec 12 00:43:34 2013 +0100 ---------------------------------------------------------------------- .../apache/marmotta/commons/sesame/tripletable/IntArray.java | 8 ++++---- .../marmotta/kiwi/persistence/h2/create_base_tables.sql | 2 +- .../marmotta/kiwi/persistence/h2/upgrade_base_002_003.sql | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/10955ed5/commons/sesame-tripletable/src/main/java/org/apache/marmotta/commons/sesame/tripletable/IntArray.java ---------------------------------------------------------------------- diff --git a/commons/sesame-tripletable/src/main/java/org/apache/marmotta/commons/sesame/tripletable/IntArray.java b/commons/sesame-tripletable/src/main/java/org/apache/marmotta/commons/sesame/tripletable/IntArray.java index d97889e..e7867b3 100644 --- a/commons/sesame-tripletable/src/main/java/org/apache/marmotta/commons/sesame/tripletable/IntArray.java +++ b/commons/sesame-tripletable/src/main/java/org/apache/marmotta/commons/sesame/tripletable/IntArray.java @@ -75,7 +75,7 @@ public final class IntArray implements Comparable<IntArray> { int s = subject != null ? subject.hashCode() : Integer.MIN_VALUE; int p = property != null ? property.hashCode() : Integer.MIN_VALUE; - int o = object != null ? object.hashCode() : Integer.MIN_VALUE; + int o = object != null ? (object.hashCode() + 31 * object.getClass().hashCode()) : Integer.MIN_VALUE; int c = context != null ? context.hashCode() : Integer.MIN_VALUE; IntBuffer bb = IntBuffer.allocate(4); @@ -95,7 +95,7 @@ public final class IntArray implements Comparable<IntArray> { int s = subject != null ? subject.hashCode() : Integer.MAX_VALUE; int p = property != null ? property.hashCode() : Integer.MAX_VALUE; - int o = object != null ? object.hashCode() : Integer.MAX_VALUE; + int o = object != null ? (object.hashCode() + 31 * object.getClass().hashCode()) : Integer.MAX_VALUE; int c = context != null ? context.hashCode() : Integer.MAX_VALUE; IntBuffer bb = IntBuffer.allocate(4); @@ -115,7 +115,7 @@ public final class IntArray implements Comparable<IntArray> { int s = subject != null ? subject.hashCode() : Integer.MIN_VALUE; int p = property != null ? property.hashCode() : Integer.MIN_VALUE; - int o = object != null ? object.hashCode() : Integer.MIN_VALUE; + int o = object != null ? (object.hashCode() + 31 * object.getClass().hashCode()) : Integer.MIN_VALUE; int c = context != null ? context.hashCode() : Integer.MIN_VALUE; IntBuffer bb = IntBuffer.allocate(4); @@ -135,7 +135,7 @@ public final class IntArray implements Comparable<IntArray> { int s = subject != null ? subject.hashCode() : Integer.MAX_VALUE; int p = property != null ? property.hashCode() : Integer.MAX_VALUE; - int o = object != null ? object.hashCode() : Integer.MAX_VALUE; + int o = object != null ? (object.hashCode() + 31 * object.getClass().hashCode()) : Integer.MAX_VALUE; int c = context != null ? context.hashCode() : Integer.MAX_VALUE; IntBuffer bb = IntBuffer.allocate(4); http://git-wip-us.apache.org/repos/asf/marmotta/blob/10955ed5/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_base_tables.sql ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_base_tables.sql b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_base_tables.sql index 649ce92..368b5cc 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_base_tables.sql +++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_base_tables.sql @@ -64,7 +64,7 @@ CREATE TABLE registry ( tripleKey BIGINT NOT NULL, tripleId BIGINT NOT NULL, txId BIGINT NOT NULL -) NOT PERSISTENT; +); CREATE INDEX idx_reg_triple ON registry(tripleId); CREATE INDEX idx_reg_key ON registry(tripleKey); CREATE INDEX idx_reg_tx ON registry(txId); http://git-wip-us.apache.org/repos/asf/marmotta/blob/10955ed5/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_base_002_003.sql ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_base_002_003.sql b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_base_002_003.sql index 8458397..cc58522 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_base_002_003.sql +++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_base_002_003.sql @@ -22,7 +22,7 @@ CREATE TABLE registry ( tripleKey BIGINT NOT NULL, tripleId BIGINT NOT NULL, txId BIGINT NOT NULL -) NOT PERSISTENT; +); CREATE INDEX idx_reg_triple ON registry(tripleId); CREATE INDEX idx_reg_key ON registry(tripleKey); CREATE INDEX idx_reg_tx ON registry(txId);
