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/24 13:20:24 UTC
[01/16] git commit: Fix /management/me end-point so that it correctly
accepts POST of form-encoded data.
Updated Branches:
refs/pull/27/merge c8c995257 -> e6035dc6c (forced update)
refs/pull/29/merge d21544db9 -> 91495599d (forced update)
Fix /management/me end-point so that it correctly accepts POST of form-encoded data.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0c19ebd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0c19ebd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0c19ebd9
Branch: refs/pull/27/merge
Commit: 0c19ebd98b0af07ff773405f6ea2c04927199d8c
Parents: e2ee790
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Jan 17 13:42:20 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Jan 17 13:42:20 2014 -0500
----------------------------------------------------------------------
.../rest/management/ManagementResource.java | 16 ++++++++--------
.../rest/management/ManagementResourceIT.java | 13 ++++++++++---
2 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0c19ebd9/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
index e75bd2f..34b7639 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
@@ -299,14 +299,14 @@ public class ManagementResource extends AbstractContextResource {
@Path( "me" )
@Consumes( APPLICATION_FORM_URLENCODED )
public Response getAccessTokenLightPost( @Context UriInfo ui, @HeaderParam( "Authorization" ) String authorization,
- @QueryParam( "grant_type" ) String grant_type,
- @QueryParam( "username" ) String username,
- @QueryParam( "password" ) String password,
- @QueryParam( "client_id" ) String client_id,
- @QueryParam( "client_secret" ) String client_secret,
- @QueryParam( "ttl" ) long ttl,
- @QueryParam( "access_token" ) String access_token,
- @QueryParam( "callback" ) @DefaultValue( "" ) String callback )
+ @FormParam( "grant_type" ) String grant_type,
+ @FormParam( "username" ) String username,
+ @FormParam( "password" ) String password,
+ @FormParam( "client_id" ) String client_id,
+ @FormParam( "client_secret" ) String client_secret,
+ @FormParam( "ttl" ) long ttl,
+ @FormParam( "access_token" ) String access_token,
+ @FormParam( "callback" ) @DefaultValue( "" ) String callback )
throws Exception {
return getAccessTokenInternal( ui, authorization, grant_type, username, password, client_id, client_secret, ttl,
callback, false );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0c19ebd9/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
index 1ea108b..9a7b873 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
@@ -33,6 +33,7 @@ import org.apache.commons.lang.StringUtils;
import com.sun.jersey.api.client.ClientResponse.Status;
import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.representation.Form;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -370,10 +371,16 @@ public class ManagementResourceIT extends AbstractRestIT {
@Test
- public void meTokenPostForm() throws Exception {
- JsonNode node = resource().path( "/management/me" ).queryParam( "grant_type", "password" )
- .queryParam( "username", "test@usergrid.com" ).queryParam( "password", "test" )
+ public void meTokenPostForm() {
+
+ Form form = new Form();
+ form.add( "grant_type", "password" );
+ form.add( "username", "test@usergrid.com" );
+ form.add( "password", "test");
+
+ JsonNode node = resource().path( "/management/me" )
.accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_FORM_URLENCODED_TYPE )
+ .entity( form, MediaType.APPLICATION_FORM_URLENCODED_TYPE )
.post( JsonNode.class );
logNode( node );
[12/16] git commit: Fixes NPE issue in the union iterator
Posted by sn...@apache.org.
Fixes NPE issue in the union iterator
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5d75a299
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5d75a299
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5d75a299
Branch: refs/pull/27/merge
Commit: 5d75a2992475ab907b15e4a2f86ab50ae89a1e40
Parents: 9dd14f1
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Jan 20 18:18:15 2014 -0800
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Jan 20 18:18:15 2014 -0800
----------------------------------------------------------------------
.../query/ir/result/UnionIterator.java | 9 ++-
.../query/ir/result/UnionIteratorTest.java | 70 ++++++++++++++++++++
2 files changed, 78 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d75a299/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
index efd4e3d..00e90b8 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
@@ -58,7 +58,14 @@ public class UnionIterator extends MultiIterator {
super( pageSize );
this.id = id;
- list = new SortedColumnList( pageSize, UUID_SERIALIZER.fromByteBuffer( minUuid ) );
+
+ UUID parseMinUuid = null;
+
+ if(minUuid != null) {
+ parseMinUuid = UUID_SERIALIZER.fromByteBuffer( minUuid );
+ }
+
+ list = new SortedColumnList( pageSize, parseMinUuid );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d75a299/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
index 683f00d..8fd9ea8 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
@@ -16,6 +16,7 @@
package org.usergrid.persistence.query.ir.result;
+import java.nio.ByteBuffer;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
@@ -23,6 +24,8 @@ import java.util.UUID;
import org.junit.Test;
import org.usergrid.utils.UUIDUtils;
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -295,6 +298,73 @@ public class UnionIteratorTest {
}
+ @Test
+ public void nullCursorBytes() {
+
+ UUID id1 = UUIDUtils.minTimeUUID( 1 );
+ UUID id2 = UUIDUtils.minTimeUUID( 2 );
+ UUID id3 = UUIDUtils.minTimeUUID( 3 );
+ UUID id4 = UUIDUtils.minTimeUUID( 4 );
+ UUID id5 = UUIDUtils.minTimeUUID( 5 );
+
+
+ InOrderIterator second = new InOrderIterator( 100 );
+ second.add( id1 );
+ second.add( id2 );
+ second.add( id3 );
+ second.add( id4 );
+ second.add( id5 );
+
+ UnionIterator union = new UnionIterator( 100, 1, null );
+
+ union.addIterator( second );
+
+ Set<ScanColumn> ids = union.next();
+
+ // now make sure it's right, only 1, 3 and 8 intersect
+ assertTrue( ids.contains( uuidColumn( id1 ) ) );
+ assertTrue( ids.contains( uuidColumn( id2 ) ) );
+ assertTrue( ids.contains( uuidColumn( id3 ) ) );
+ assertTrue( ids.contains( uuidColumn( id4 ) ) );
+ assertTrue( ids.contains( uuidColumn( id5 ) ) );
+ }
+
+
+ @Test
+ public void validCursorBytes() {
+
+
+ ByteBuffer cursor = UUIDSerializer.get().toByteBuffer( UUIDUtils.minTimeUUID( 4 ) );
+
+ UUID id1 = UUIDUtils.minTimeUUID( 1 );
+ UUID id2 = UUIDUtils.minTimeUUID( 2 );
+ UUID id3 = UUIDUtils.minTimeUUID( 3 );
+ UUID id4 = UUIDUtils.minTimeUUID( 4 );
+ UUID id5 = UUIDUtils.minTimeUUID( 5 );
+
+
+ InOrderIterator second = new InOrderIterator( 100 );
+ second.add( id1 );
+ second.add( id2 );
+ second.add( id3 );
+ second.add( id4 );
+ second.add( id5 );
+
+ UnionIterator union = new UnionIterator( 100, 1, cursor );
+
+ union.addIterator( second );
+
+ Set<ScanColumn> ids = union.next();
+
+ // now make sure it's right, only 1, 3 and 8 intersect
+ assertFalse( ids.contains( uuidColumn( id1 ) ) );
+ assertFalse( ids.contains( uuidColumn( id2 ) ) );
+ assertFalse( ids.contains( uuidColumn( id3 ) ) );
+ assertFalse( ids.contains( uuidColumn( id4 ) ) );
+ assertTrue( ids.contains( uuidColumn( id5 ) ) );
+ }
+
+
private void reverse( UUID[] array ) {
UUID temp = null;
[14/16] git commit: Merge pull request #32 from
usergrid/USERGRID-2862-limitfix
Posted by sn...@apache.org.
Merge pull request #32 from usergrid/USERGRID-2862-limitfix
Fixes NPE issue in the union iterator
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/832017bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/832017bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/832017bf
Branch: refs/pull/29/merge
Commit: 832017bf7b1c2e8b809b8254f2fd70eebab58d0f
Parents: b22115a 5d75a29
Author: Rod Simpson <ro...@rodsimpson.com>
Authored: Mon Jan 20 18:21:28 2014 -0800
Committer: Rod Simpson <ro...@rodsimpson.com>
Committed: Mon Jan 20 18:21:28 2014 -0800
----------------------------------------------------------------------
.../query/ir/result/UnionIterator.java | 9 ++-
.../query/ir/result/UnionIteratorTest.java | 70 ++++++++++++++++++++
2 files changed, 78 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[07/16] 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/pull/29/merge
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();
}
[16/16] git commit: Merge 46dbb163ee7fc1aa289d9dca5eb7f743b6993b62
into 832017bf7b1c2e8b809b8254f2fd70eebab58d0f
Posted by sn...@apache.org.
Merge 46dbb163ee7fc1aa289d9dca5eb7f743b6993b62 into 832017bf7b1c2e8b809b8254f2fd70eebab58d0f
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e6035dc6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e6035dc6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e6035dc6
Branch: refs/pull/27/merge
Commit: e6035dc6c0209938b4a1485719e7a036018caa21
Parents: 832017b 46dbb16
Author: Jackson Chung <cy...@gmail.com>
Authored: Fri Jan 24 04:20:02 2014 -0800
Committer: Jackson Chung <cy...@gmail.com>
Committed: Fri Jan 24 04:20:02 2014 -0800
----------------------------------------------------------------------
.../java/org/usergrid/services/AbstractCollectionService.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
[15/16] git commit: Merge 5a1fabaa5699b24ced30ee56c982320fbbf98f4f
into 832017bf7b1c2e8b809b8254f2fd70eebab58d0f
Posted by sn...@apache.org.
Merge 5a1fabaa5699b24ced30ee56c982320fbbf98f4f into 832017bf7b1c2e8b809b8254f2fd70eebab58d0f
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/91495599
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/91495599
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/91495599
Branch: refs/pull/29/merge
Commit: 91495599d51a19c1ad9f470324989e14685ffc5d
Parents: 832017b 5a1faba
Author: Tim Anglade <ti...@gmail.com>
Authored: Fri Jan 24 04:19:57 2014 -0800
Committer: Tim Anglade <ti...@gmail.com>
Committed: Fri Jan 24 04:19:57 2014 -0800
----------------------------------------------------------------------
.../org/usergrid/tools/OrganizationExport.java | 28 +++++++++++++-------
1 file changed, 18 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[09/16] 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/pull/29/merge
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(-)
----------------------------------------------------------------------
[13/16] git commit: Merge pull request #32 from
usergrid/USERGRID-2862-limitfix
Posted by sn...@apache.org.
Merge pull request #32 from usergrid/USERGRID-2862-limitfix
Fixes NPE issue in the union iterator
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/832017bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/832017bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/832017bf
Branch: refs/pull/27/merge
Commit: 832017bf7b1c2e8b809b8254f2fd70eebab58d0f
Parents: b22115a 5d75a29
Author: Rod Simpson <ro...@rodsimpson.com>
Authored: Mon Jan 20 18:21:28 2014 -0800
Committer: Rod Simpson <ro...@rodsimpson.com>
Committed: Mon Jan 20 18:21:28 2014 -0800
----------------------------------------------------------------------
.../query/ir/result/UnionIterator.java | 9 ++-
.../query/ir/result/UnionIteratorTest.java | 70 ++++++++++++++++++++
2 files changed, 78 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[08/16] 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/pull/27/merge
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();
}
[05/16] git commit: Initial commit to prove issue
Posted by sn...@apache.org.
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/pull/27/merge
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 );
+ }
+ }
+}
[06/16] git commit: Initial commit to prove issue
Posted by sn...@apache.org.
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/pull/29/merge
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 );
+ }
+ }
+}
[02/16] git commit: Fix /management/me end-point so that it correctly
accepts POST of form-encoded data.
Posted by sn...@apache.org.
Fix /management/me end-point so that it correctly accepts POST of form-encoded data.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0c19ebd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0c19ebd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0c19ebd9
Branch: refs/pull/29/merge
Commit: 0c19ebd98b0af07ff773405f6ea2c04927199d8c
Parents: e2ee790
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Jan 17 13:42:20 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Jan 17 13:42:20 2014 -0500
----------------------------------------------------------------------
.../rest/management/ManagementResource.java | 16 ++++++++--------
.../rest/management/ManagementResourceIT.java | 13 ++++++++++---
2 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0c19ebd9/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
index e75bd2f..34b7639 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
@@ -299,14 +299,14 @@ public class ManagementResource extends AbstractContextResource {
@Path( "me" )
@Consumes( APPLICATION_FORM_URLENCODED )
public Response getAccessTokenLightPost( @Context UriInfo ui, @HeaderParam( "Authorization" ) String authorization,
- @QueryParam( "grant_type" ) String grant_type,
- @QueryParam( "username" ) String username,
- @QueryParam( "password" ) String password,
- @QueryParam( "client_id" ) String client_id,
- @QueryParam( "client_secret" ) String client_secret,
- @QueryParam( "ttl" ) long ttl,
- @QueryParam( "access_token" ) String access_token,
- @QueryParam( "callback" ) @DefaultValue( "" ) String callback )
+ @FormParam( "grant_type" ) String grant_type,
+ @FormParam( "username" ) String username,
+ @FormParam( "password" ) String password,
+ @FormParam( "client_id" ) String client_id,
+ @FormParam( "client_secret" ) String client_secret,
+ @FormParam( "ttl" ) long ttl,
+ @FormParam( "access_token" ) String access_token,
+ @FormParam( "callback" ) @DefaultValue( "" ) String callback )
throws Exception {
return getAccessTokenInternal( ui, authorization, grant_type, username, password, client_id, client_secret, ttl,
callback, false );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0c19ebd9/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
index 1ea108b..9a7b873 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
@@ -33,6 +33,7 @@ import org.apache.commons.lang.StringUtils;
import com.sun.jersey.api.client.ClientResponse.Status;
import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.representation.Form;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -370,10 +371,16 @@ public class ManagementResourceIT extends AbstractRestIT {
@Test
- public void meTokenPostForm() throws Exception {
- JsonNode node = resource().path( "/management/me" ).queryParam( "grant_type", "password" )
- .queryParam( "username", "test@usergrid.com" ).queryParam( "password", "test" )
+ public void meTokenPostForm() {
+
+ Form form = new Form();
+ form.add( "grant_type", "password" );
+ form.add( "username", "test@usergrid.com" );
+ form.add( "password", "test");
+
+ JsonNode node = resource().path( "/management/me" )
.accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_FORM_URLENCODED_TYPE )
+ .entity( form, MediaType.APPLICATION_FORM_URLENCODED_TYPE )
.post( JsonNode.class );
logNode( node );
[10/16] 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/pull/27/merge
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(-)
----------------------------------------------------------------------
[04/16] git commit: Merge branch 'master' of
https://github.com/usergrid/usergrid
Posted by sn...@apache.org.
Merge branch 'master' of https://github.com/usergrid/usergrid
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1150e47d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1150e47d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1150e47d
Branch: refs/pull/27/merge
Commit: 1150e47da5e1094ef26cb051cade57591b925fc6
Parents: 0c19ebd 5217213
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Jan 17 13:43:00 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Jan 17 13:43:00 2014 -0500
----------------------------------------------------------------------
sdks/html5-javascript/examples/test/test.js | 94 +-
sdks/html5-javascript/usergrid.js | 3726 +++++++++---------
sdks/nodejs/changelog.md | 6 +
sdks/nodejs/lib/usergrid.js | 72 +-
sdks/nodejs/package.json | 2 +-
sdks/nodejs/readme.md | 2 +-
sdks/nodejs/test.js | 175 +-
sdks/php/lib/vendor/Apigee/Usergrid/Client.php | 7 +-
stack/core/pom.xml | 6 +-
.../org/usergrid/persistence/EntityManager.java | 6 +-
.../usergrid/persistence/RelationManager.java | 6 +-
.../persistence/cassandra/CassandraService.java | 10 +
.../cassandra/EntityManagerImpl.java | 35 +-
.../persistence/cassandra/QueryProcessor.java | 18 +-
.../cassandra/RelationManagerImpl.java | 35 +-
.../cassandra/index/IndexScanner.java | 1 +
.../usergrid/persistence/query/ir/OrNode.java | 18 +-
.../persistence/query/ir/SearchVisitor.java | 4 +-
.../query/ir/result/AbstractScanColumn.java | 10 +
.../query/ir/result/IntersectionIterator.java | 5 +-
.../query/ir/result/SliceIterator.java | 56 +-
.../query/ir/result/UnionIterator.java | 203 +-
.../persistence/query/util/PeekingIterator.java | 64 -
.../main/resources/usergrid-core-context.xml | 2 +-
.../batch/job/AbstractSchedulerRuntimeIT.java | 1 +
.../usergrid/batch/job/SchedulerRuntime1IT.java | 38 +-
.../usergrid/batch/job/SchedulerRuntime2IT.java | 61 +-
.../org/usergrid/batch/job/TestJobListener.java | 20 +-
.../usergrid/batch/job/TestJobListenerTest.java | 8 +-
.../count/BatchCountParallelismTest.java | 29 +-
.../count/CassandraCounterStoreTest.java | 63 -
.../org/usergrid/persistence/CollectionIT.java | 8 +-
.../query/AbstractIteratingQueryIT.java | 20 +-
.../persistence/query/AllInCollectionIT.java | 2 +-
.../persistence/query/AllInConnectionIT.java | 2 +-
.../query/AllInConnectionNoTypeIT.java | 20 +-
.../query/IntersectionUnionPagingIT.java | 163 +
.../query/MultiOrderByCollectionIT.java | 2 +-
.../MultiOrderByComplexUnionCollectionIT.java | 2 +-
.../MultiOrderByComplexUnionConnectionIT.java | 2 +-
.../query/MultiOrderByConnectionIT.java | 2 +-
.../query/NotOrderByCollectionIT.java | 2 +-
.../query/NotOrderByConnectionIT.java | 2 +-
...gleOrderByBoundRangeScanAscCollectionIT.java | 2 +-
...gleOrderByBoundRangeScanAscConnectionIT.java | 2 +-
...leOrderByBoundRangeScanDescCollectionIT.java | 2 +-
...leOrderByBoundRangeScanDescConnectionIT.java | 2 +-
...eOrderByComplexIntersectionCollectionIT.java | 2 +-
...eOrderByComplexIntersectionConnectionIT.java | 2 +-
.../SingleOrderByComplexUnionCollectionIT.java | 2 +-
.../SingleOrderByComplexUnionConnectionIT.java | 2 +-
.../SingleOrderByIntersectionCollectionIT.java | 2 +-
.../SingleOrderByIntersectionConnectionIT.java | 2 +-
.../SingleOrderByLessThanLimitCollectionIT.java | 2 +-
.../SingleOrderByLessThanLimitConnectionIT.java | 2 +-
.../SingleOrderByMaxLimitCollectionIT.java | 2 +-
.../SingleOrderByMaxLimitConnectionIT.java | 2 +-
...SingleOrderByNoIntersectionCollectionIT.java | 2 +-
...SingleOrderByNoIntersectionConnectionIT.java | 2 +-
.../query/SingleOrderByNotCollectionIT.java | 2 +-
.../query/SingleOrderByNotConnectionIT.java | 2 +-
...OrderBySameRangeScanGreaterCollectionIT.java | 2 +-
...OrderBySameRangeScanGreaterConnectionIT.java | 2 +-
...meRangeScanGreaterThanEqualCollectionIT.java | 2 +-
...gleOrderBySameRangeScanLessCollectionIT.java | 2 +-
...gleOrderBySameRangeScanLessConnectionIT.java | 2 +-
...ySameRangeScanLessThanEqualCollectionIT.java | 2 +-
...ySameRangeScanLessThanEqualConnectionIT.java | 2 +-
.../query/ir/result/UnionIteratorTest.java | 84 +-
.../persistence/query/tree/GrammarTreeTest.java | 35 +
stack/mongo-emulator/pom.xml | 2 +-
stack/pom.xml | 4 +-
stack/rest/pom.xml | 12 +-
.../applications/assets/AssetsResource.java | 25 +-
.../rest/applications/users/UserResource.java | 6 +-
.../rest/management/ManagementResource.java | 2 +-
.../rest/management/users/UserResource.java | 2 +-
.../queues/AbstractQueueResourceIT.java | 30 +-
stack/services/pom.xml | 14 +-
.../services/AbstractConnectionsService.java | 13 +-
stack/test-utils/pom.xml | 2 +-
.../usergrid/cassandra/AvailablePortFinder.java | 30 +-
.../usergrid/cassandra/CassandraResource.java | 22 +-
stack/tools/pom.xml | 2 +-
stack/websocket/pom.xml | 2 +-
85 files changed, 2950 insertions(+), 2397 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1150e47d/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
----------------------------------------------------------------------
[03/16] git commit: Merge branch 'master' of
https://github.com/usergrid/usergrid
Posted by sn...@apache.org.
Merge branch 'master' of https://github.com/usergrid/usergrid
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1150e47d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1150e47d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1150e47d
Branch: refs/pull/29/merge
Commit: 1150e47da5e1094ef26cb051cade57591b925fc6
Parents: 0c19ebd 5217213
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Jan 17 13:43:00 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Jan 17 13:43:00 2014 -0500
----------------------------------------------------------------------
sdks/html5-javascript/examples/test/test.js | 94 +-
sdks/html5-javascript/usergrid.js | 3726 +++++++++---------
sdks/nodejs/changelog.md | 6 +
sdks/nodejs/lib/usergrid.js | 72 +-
sdks/nodejs/package.json | 2 +-
sdks/nodejs/readme.md | 2 +-
sdks/nodejs/test.js | 175 +-
sdks/php/lib/vendor/Apigee/Usergrid/Client.php | 7 +-
stack/core/pom.xml | 6 +-
.../org/usergrid/persistence/EntityManager.java | 6 +-
.../usergrid/persistence/RelationManager.java | 6 +-
.../persistence/cassandra/CassandraService.java | 10 +
.../cassandra/EntityManagerImpl.java | 35 +-
.../persistence/cassandra/QueryProcessor.java | 18 +-
.../cassandra/RelationManagerImpl.java | 35 +-
.../cassandra/index/IndexScanner.java | 1 +
.../usergrid/persistence/query/ir/OrNode.java | 18 +-
.../persistence/query/ir/SearchVisitor.java | 4 +-
.../query/ir/result/AbstractScanColumn.java | 10 +
.../query/ir/result/IntersectionIterator.java | 5 +-
.../query/ir/result/SliceIterator.java | 56 +-
.../query/ir/result/UnionIterator.java | 203 +-
.../persistence/query/util/PeekingIterator.java | 64 -
.../main/resources/usergrid-core-context.xml | 2 +-
.../batch/job/AbstractSchedulerRuntimeIT.java | 1 +
.../usergrid/batch/job/SchedulerRuntime1IT.java | 38 +-
.../usergrid/batch/job/SchedulerRuntime2IT.java | 61 +-
.../org/usergrid/batch/job/TestJobListener.java | 20 +-
.../usergrid/batch/job/TestJobListenerTest.java | 8 +-
.../count/BatchCountParallelismTest.java | 29 +-
.../count/CassandraCounterStoreTest.java | 63 -
.../org/usergrid/persistence/CollectionIT.java | 8 +-
.../query/AbstractIteratingQueryIT.java | 20 +-
.../persistence/query/AllInCollectionIT.java | 2 +-
.../persistence/query/AllInConnectionIT.java | 2 +-
.../query/AllInConnectionNoTypeIT.java | 20 +-
.../query/IntersectionUnionPagingIT.java | 163 +
.../query/MultiOrderByCollectionIT.java | 2 +-
.../MultiOrderByComplexUnionCollectionIT.java | 2 +-
.../MultiOrderByComplexUnionConnectionIT.java | 2 +-
.../query/MultiOrderByConnectionIT.java | 2 +-
.../query/NotOrderByCollectionIT.java | 2 +-
.../query/NotOrderByConnectionIT.java | 2 +-
...gleOrderByBoundRangeScanAscCollectionIT.java | 2 +-
...gleOrderByBoundRangeScanAscConnectionIT.java | 2 +-
...leOrderByBoundRangeScanDescCollectionIT.java | 2 +-
...leOrderByBoundRangeScanDescConnectionIT.java | 2 +-
...eOrderByComplexIntersectionCollectionIT.java | 2 +-
...eOrderByComplexIntersectionConnectionIT.java | 2 +-
.../SingleOrderByComplexUnionCollectionIT.java | 2 +-
.../SingleOrderByComplexUnionConnectionIT.java | 2 +-
.../SingleOrderByIntersectionCollectionIT.java | 2 +-
.../SingleOrderByIntersectionConnectionIT.java | 2 +-
.../SingleOrderByLessThanLimitCollectionIT.java | 2 +-
.../SingleOrderByLessThanLimitConnectionIT.java | 2 +-
.../SingleOrderByMaxLimitCollectionIT.java | 2 +-
.../SingleOrderByMaxLimitConnectionIT.java | 2 +-
...SingleOrderByNoIntersectionCollectionIT.java | 2 +-
...SingleOrderByNoIntersectionConnectionIT.java | 2 +-
.../query/SingleOrderByNotCollectionIT.java | 2 +-
.../query/SingleOrderByNotConnectionIT.java | 2 +-
...OrderBySameRangeScanGreaterCollectionIT.java | 2 +-
...OrderBySameRangeScanGreaterConnectionIT.java | 2 +-
...meRangeScanGreaterThanEqualCollectionIT.java | 2 +-
...gleOrderBySameRangeScanLessCollectionIT.java | 2 +-
...gleOrderBySameRangeScanLessConnectionIT.java | 2 +-
...ySameRangeScanLessThanEqualCollectionIT.java | 2 +-
...ySameRangeScanLessThanEqualConnectionIT.java | 2 +-
.../query/ir/result/UnionIteratorTest.java | 84 +-
.../persistence/query/tree/GrammarTreeTest.java | 35 +
stack/mongo-emulator/pom.xml | 2 +-
stack/pom.xml | 4 +-
stack/rest/pom.xml | 12 +-
.../applications/assets/AssetsResource.java | 25 +-
.../rest/applications/users/UserResource.java | 6 +-
.../rest/management/ManagementResource.java | 2 +-
.../rest/management/users/UserResource.java | 2 +-
.../queues/AbstractQueueResourceIT.java | 30 +-
stack/services/pom.xml | 14 +-
.../services/AbstractConnectionsService.java | 13 +-
stack/test-utils/pom.xml | 2 +-
.../usergrid/cassandra/AvailablePortFinder.java | 30 +-
.../usergrid/cassandra/CassandraResource.java | 22 +-
stack/tools/pom.xml | 2 +-
stack/websocket/pom.xml | 2 +-
85 files changed, 2950 insertions(+), 2397 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1150e47d/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
----------------------------------------------------------------------
[11/16] git commit: Fixes NPE issue in the union iterator
Posted by sn...@apache.org.
Fixes NPE issue in the union iterator
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5d75a299
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5d75a299
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5d75a299
Branch: refs/pull/29/merge
Commit: 5d75a2992475ab907b15e4a2f86ab50ae89a1e40
Parents: 9dd14f1
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Jan 20 18:18:15 2014 -0800
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Jan 20 18:18:15 2014 -0800
----------------------------------------------------------------------
.../query/ir/result/UnionIterator.java | 9 ++-
.../query/ir/result/UnionIteratorTest.java | 70 ++++++++++++++++++++
2 files changed, 78 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d75a299/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
index efd4e3d..00e90b8 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
@@ -58,7 +58,14 @@ public class UnionIterator extends MultiIterator {
super( pageSize );
this.id = id;
- list = new SortedColumnList( pageSize, UUID_SERIALIZER.fromByteBuffer( minUuid ) );
+
+ UUID parseMinUuid = null;
+
+ if(minUuid != null) {
+ parseMinUuid = UUID_SERIALIZER.fromByteBuffer( minUuid );
+ }
+
+ list = new SortedColumnList( pageSize, parseMinUuid );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d75a299/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
index 683f00d..8fd9ea8 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
@@ -16,6 +16,7 @@
package org.usergrid.persistence.query.ir.result;
+import java.nio.ByteBuffer;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
@@ -23,6 +24,8 @@ import java.util.UUID;
import org.junit.Test;
import org.usergrid.utils.UUIDUtils;
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -295,6 +298,73 @@ public class UnionIteratorTest {
}
+ @Test
+ public void nullCursorBytes() {
+
+ UUID id1 = UUIDUtils.minTimeUUID( 1 );
+ UUID id2 = UUIDUtils.minTimeUUID( 2 );
+ UUID id3 = UUIDUtils.minTimeUUID( 3 );
+ UUID id4 = UUIDUtils.minTimeUUID( 4 );
+ UUID id5 = UUIDUtils.minTimeUUID( 5 );
+
+
+ InOrderIterator second = new InOrderIterator( 100 );
+ second.add( id1 );
+ second.add( id2 );
+ second.add( id3 );
+ second.add( id4 );
+ second.add( id5 );
+
+ UnionIterator union = new UnionIterator( 100, 1, null );
+
+ union.addIterator( second );
+
+ Set<ScanColumn> ids = union.next();
+
+ // now make sure it's right, only 1, 3 and 8 intersect
+ assertTrue( ids.contains( uuidColumn( id1 ) ) );
+ assertTrue( ids.contains( uuidColumn( id2 ) ) );
+ assertTrue( ids.contains( uuidColumn( id3 ) ) );
+ assertTrue( ids.contains( uuidColumn( id4 ) ) );
+ assertTrue( ids.contains( uuidColumn( id5 ) ) );
+ }
+
+
+ @Test
+ public void validCursorBytes() {
+
+
+ ByteBuffer cursor = UUIDSerializer.get().toByteBuffer( UUIDUtils.minTimeUUID( 4 ) );
+
+ UUID id1 = UUIDUtils.minTimeUUID( 1 );
+ UUID id2 = UUIDUtils.minTimeUUID( 2 );
+ UUID id3 = UUIDUtils.minTimeUUID( 3 );
+ UUID id4 = UUIDUtils.minTimeUUID( 4 );
+ UUID id5 = UUIDUtils.minTimeUUID( 5 );
+
+
+ InOrderIterator second = new InOrderIterator( 100 );
+ second.add( id1 );
+ second.add( id2 );
+ second.add( id3 );
+ second.add( id4 );
+ second.add( id5 );
+
+ UnionIterator union = new UnionIterator( 100, 1, cursor );
+
+ union.addIterator( second );
+
+ Set<ScanColumn> ids = union.next();
+
+ // now make sure it's right, only 1, 3 and 8 intersect
+ assertFalse( ids.contains( uuidColumn( id1 ) ) );
+ assertFalse( ids.contains( uuidColumn( id2 ) ) );
+ assertFalse( ids.contains( uuidColumn( id3 ) ) );
+ assertFalse( ids.contains( uuidColumn( id4 ) ) );
+ assertTrue( ids.contains( uuidColumn( id5 ) ) );
+ }
+
+
private void reverse( UUID[] array ) {
UUID temp = null;