svn commit: r1551163 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/mongomk/Range.java test/java/org/apache/jackrabbit/oak/plugins/mongomk/RangeTest.java

[mr...@apache.org]

Author: mreutegg
Date: Mon Dec 16 10:50:34 2013
New Revision: 1551163

URL: http://svn.apache.org/r1551163
Log:
OAK-1289: Range check fails with IllegalArgumentException

Added:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/RangeTest.java   (with props)
Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/Range.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/Range.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/Range.java?rev=1551163&r1=1551162&r2=1551163&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/Range.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/Range.java Mon Dec 16 10:50:34 2013
@@ -51,8 +51,9 @@ final class Range {
      * @return <code>true</code> if within this range; <code>false</code>
      * otherwise.
      */
-    boolean includes(Revision r) {
-        return high.compareRevisionTime(r) >= 0
+    boolean includes(@Nonnull Revision r) {
+        return high.getClusterId() == r.getClusterId()
+                && high.compareRevisionTime(r) >= 0
                 && low.compareRevisionTime(r) <= 0;
     }
 

Added: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/RangeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/RangeTest.java?rev=1551163&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/RangeTest.java (added)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/RangeTest.java Mon Dec 16 10:50:34 2013
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.plugins.mongomk;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class RangeTest {
+
+    @Test
+    public void includes() {
+        Revision lower = new Revision(0xff, 0, 1);
+        Revision low = new Revision(0x100, 0, 1);
+        Revision high = new Revision(0x300, 0, 1);
+        Revision higher = new Revision(0x301, 0, 1);
+        Revision r = new Revision(0x200, 0, 1);
+        Revision other = new Revision(0x200, 0, 2);
+
+        Range range = new Range(high, low);
+
+        // bounds are inclusive
+        assertTrue(range.includes(low));
+        assertTrue(range.includes(high));
+        // within bounds
+        assertTrue(range.includes(r));
+        // outside bounds
+        assertFalse(range.includes(lower));
+        assertFalse(range.includes(higher));
+        // other cluster id
+        assertFalse(range.includes(other));
+    }
+}

Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/RangeTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/RangeTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL