You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/01/21 02:20:25 UTC
[1/3] git commit: Initial commit to prove issue
Updated Branches:
refs/heads/USERGRID-2862-limitfix [deleted] b2a48c35f
refs/heads/master 1150e47da -> b22115aec
refs/pull/31/head [created] 9dd14f186
Initial commit to prove issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3c2f803f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3c2f803f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3c2f803f
Branch: refs/heads/master
Commit: 3c2f803fb5596256ee9043c9589563fde4322b5e
Parents: 1150e47
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Jan 20 16:50:11 2014 -0800
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Jan 20 16:50:11 2014 -0800
----------------------------------------------------------------------
.../query/ir/result/AbstractScanColumnTest.java | 84 ++++++++++++++++++++
1 file changed, 84 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3c2f803f/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/AbstractScanColumnTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/AbstractScanColumnTest.java b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/AbstractScanColumnTest.java
new file mode 100644
index 0000000..0b56220
--- /dev/null
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/AbstractScanColumnTest.java
@@ -0,0 +1,84 @@
+package org.usergrid.persistence.query.ir.result;
+
+
+import java.nio.ByteBuffer;
+import java.util.UUID;
+
+import org.junit.Test;
+import org.usergrid.utils.UUIDUtils;
+
+import static junit.framework.Assert.assertNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+
+/**
+ * Simple test to test null value
+ */
+public class AbstractScanColumnTest {
+
+ @Test
+ public void testValues() {
+ final UUID uuid = UUIDUtils.newTimeUUID();
+ final ByteBuffer buffer = ByteBuffer.allocate( 4 );
+ buffer.putInt( 1 );
+ buffer.rewind();
+
+ TestScanColumn col = new TestScanColumn( uuid, buffer );
+
+ assertSame( uuid, col.getUUID() );
+
+ assertEquals( 1, col.getCursorValue().getInt() );
+ }
+
+
+ @Test
+ public void nullUUID() {
+ final UUID uuid = null;
+ final ByteBuffer buffer = ByteBuffer.allocate( 4 );
+ buffer.putInt( 1 );
+ buffer.rewind();
+
+ TestScanColumn col = new TestScanColumn( uuid, buffer );
+
+ assertNull( col.getUUID() );
+
+ assertEquals( 1, col.getCursorValue().getInt() );
+ }
+
+
+ @Test
+ public void nullBuffer() {
+ final UUID uuid = UUIDUtils.newTimeUUID();
+ final ByteBuffer buffer = null;
+
+ TestScanColumn col = new TestScanColumn( uuid, buffer );
+
+ assertSame( uuid, col.getUUID() );
+
+ assertNull( col.getCursorValue() );
+ }
+
+
+ @Test
+ public void nullBoth() {
+ final UUID uuid = null;
+ final ByteBuffer buffer = null;
+
+ TestScanColumn col = new TestScanColumn( uuid, buffer );
+
+ assertNull( col.getUUID() );
+
+ assertNull( col.getCursorValue() );
+ }
+
+
+
+
+ private class TestScanColumn extends AbstractScanColumn {
+
+ protected TestScanColumn( final UUID uuid, final ByteBuffer buffer ) {
+ super( uuid, buffer );
+ }
+ }
+}
[3/3] git commit: Merge pull request #31 from
usergrid/USERGRID-2862-limitfix
Posted by sn...@apache.org.
Merge pull request #31 from usergrid/USERGRID-2862-limitfix
Usergrid 2862 limitfix
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b22115ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b22115ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b22115ae
Branch: refs/heads/master
Commit: b22115aec275b24019556edda509a109650ae385
Parents: 1150e47 9dd14f1
Author: tonuquq <to...@gmail.com>
Authored: Mon Jan 20 16:55:22 2014 -0800
Committer: tonuquq <to...@gmail.com>
Committed: Mon Jan 20 16:55:22 2014 -0800
----------------------------------------------------------------------
.../query/ir/result/AbstractScanColumn.java | 4 +-
.../query/ir/result/AbstractScanColumnTest.java | 84 ++++++++++++++++++++
2 files changed, 86 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: Fixes issue
Posted by sn...@apache.org.
Fixes issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9dd14f18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9dd14f18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9dd14f18
Branch: refs/heads/master
Commit: 9dd14f1863b714e224531aa45595b0ed03731163
Parents: 3c2f803
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Jan 20 16:51:18 2014 -0800
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Jan 20 16:51:18 2014 -0800
----------------------------------------------------------------------
.../usergrid/persistence/query/ir/result/AbstractScanColumn.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9dd14f18/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
index 94fb2b3..d05661b 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
@@ -19,7 +19,7 @@ public abstract class AbstractScanColumn implements ScanColumn {
protected AbstractScanColumn( UUID uuid, ByteBuffer buffer ) {
this.uuid = uuid;
- this.buffer = buffer.duplicate();
+ this.buffer = buffer;
}
@@ -31,7 +31,7 @@ public abstract class AbstractScanColumn implements ScanColumn {
@Override
public ByteBuffer getCursorValue() {
- return buffer.duplicate();
+ return buffer == null ? null :buffer.duplicate();
}