Author: stefanegli Date: Tue Aug 25 13:58:35 2015 New Revision: 1697677 URL: http://svn.apache.org/r1697677 Log: OAK-3289 : store longs not integers as RDBMK otherwise auto-returns longs anyway
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocumentTest.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java?rev=1697677&r1=1697676&r2=1697677&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java Tue Aug 25 13:58:35 2015 @@ -162,7 +162,7 @@ class ClusterViewDocument { private final String createdAt; /** the id of the instance that created this view, for debugging only **/ - private final Integer createdBy; + private final Long createdBy; /** * Main method by which the ClusterViewDocument is updated in the settings @@ -199,7 +199,7 @@ class ClusterViewDocument { updateOp.set(RECOVERING_KEY, setToCsv(recoveringIds)); updateOp.set(INACTIVE_KEY, setToCsv(inactiveIds)); updateOp.set(CREATED_KEY, standardDateFormat.format(now)); - updateOp.set(CREATOR_KEY, localClusterId); + updateOp.set(CREATOR_KEY, (long)localClusterId); Map<Object, String> historyMap = new HashMap<Object, String>(); if (previousView != null) { Map<Object, String> previousHistory = previousView.getHistory(); @@ -447,7 +447,7 @@ class ClusterViewDocument { this.clusterViewId = (String) doc.get(CLUSTER_VIEW_ID_KEY); this.viewSeqNum = (Long) doc.get(VIEW_SEQ_NUM_KEY); this.createdAt = (String) doc.get(CREATED_KEY); - this.createdBy = (Integer) doc.get(CREATOR_KEY); + this.createdBy = (Long) doc.get(CREATOR_KEY); Object obj = doc.get(ACTIVE_KEY); if (obj == null || !(obj instanceof String)) { @@ -525,7 +525,7 @@ class ClusterViewDocument { * Returns the id of the instance that created this view, for debugging * purpose only **/ - int getCreatedBy() { + long getCreatedBy() { return createdBy; } Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocumentTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocumentTest.java?rev=1697677&r1=1697676&r2=1697677&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocumentTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocumentTest.java Tue Aug 25 13:58:35 2015 @@ -144,7 +144,7 @@ public class ClusterViewDocumentTest { assertTrue(id != null && id.length() > 0); String createdAt = doc.getCreatedAt(); assertTrue(createdAt != null && createdAt.length() > 0); - int createdBy = doc.getCreatedBy(); + long createdBy = doc.getCreatedBy(); assertEquals(localClusterId, createdBy); assertEquals(1, doc.getViewSeqNum()); assertEquals(1, doc.getActiveIds().size());