You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/08/10 19:28:59 UTC
[1/2] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-903
Repository: incubator-usergrid
Updated Branches:
refs/heads/UESRGRID-904 [created] 4a6c544a6
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-903
# By Todd Nine (7) and Michael Russo (1)
# Via Shawn Feldman (2) and others
* 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
Fixes incorrect ack
Fixes jackson issue with long fields and serialization that is broken in 2.6.0
Added tests to check for resume functionality
Fixes fat finger
Upgrades Jackson to fix this issue.
Fixes runtime bug with joda time conflict with Astayanx
Invalidate the migration info cache after resetting the version.
Updates amazon async service wiring to wire to event builder
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4d75b6b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4d75b6b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4d75b6b1
Branch: refs/heads/UESRGRID-904
Commit: 4d75b6b108c6fc28e943983597043c8ba5ddb4a5
Parents: 0a78e15 cce5fa5
Author: GERey <gr...@apigee.com>
Authored: Wed Aug 5 15:30:16 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Wed Aug 5 15:30:16 2015 -0700
----------------------------------------------------------------------
.../asyncevents/AmazonAsyncEventService.java | 259 +++++-----
.../asyncevents/AsyncIndexProvider.java | 11 +-
.../asyncevents/EventBuilder.java | 11 +-
.../asyncevents/EventBuilderImpl.java | 21 +-
.../asyncevents/InMemoryAsyncEventService.java | 14 +-
.../asyncevents/model/AsyncEvent.java | 153 +-----
.../asyncevents/model/EdgeDeleteEvent.java | 36 +-
.../asyncevents/model/EdgeIndexEvent.java | 39 +-
.../asyncevents/model/EntityDeleteEvent.java | 18 +-
.../asyncevents/model/EntityIndexEvent.java | 30 +-
.../model/InitializeApplicationIndexEvent.java | 21 +-
.../index/AmazonAsyncEventServiceTest.java | 8 +-
.../index/AsyncIndexServiceTest.java | 14 +-
.../PerformanceEntityRebuildIndexTest.java | 385 --------------
.../usergrid/persistence/RebuildIndexTest.java | 515 +++++++++++++++++++
.../data/DataMigrationManagerImpl.java | 1 +
stack/corepersistence/pom.xml | 1 -
.../index/IndexLocationStrategy.java | 4 +-
stack/corepersistence/queue/pom.xml | 20 +-
.../queue/util/AmazonNotificationUtils.java | 230 +++++----
20 files changed, 966 insertions(+), 825 deletions(-)
----------------------------------------------------------------------
[2/2] incubator-usergrid git commit: Added a test that highlights
USERGRID-904
Posted by gr...@apache.org.
Added a test that highlights USERGRID-904
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4a6c544a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4a6c544a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4a6c544a
Branch: refs/heads/UESRGRID-904
Commit: 4a6c544a66551fb0b7a6922fc92394e7761465c0
Parents: 4d75b6b
Author: GERey <gr...@apigee.com>
Authored: Mon Aug 10 10:28:57 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Mon Aug 10 10:28:57 2015 -0700
----------------------------------------------------------------------
.../rest/applications/queries/OrderByTest.java | 23 ++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a6c544a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/OrderByTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/OrderByTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/OrderByTest.java
index 869d5b1..50d98a0 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/OrderByTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/OrderByTest.java
@@ -82,6 +82,29 @@ public class OrderByTest extends QueryTestBase {
assertEquals( "fury ",activities.getResponse().getEntities().get( 0 ).get( "random" ) );
}
+ @Test
+ public void testValueWithStrangeEncodingsStillReturn() throws IOException {
+ String encodingTestString = "%7Bfury%7D";
+ String collectionName = "stuff";
+ Entity spaceAtTheEndOfString = new Entity();
+ spaceAtTheEndOfString.put( "name","thing1" );
+ spaceAtTheEndOfString.put( "random", encodingTestString );
+ this.app().collection( collectionName ).post( spaceAtTheEndOfString );
+
+// //Add an extra entity to make sure this won't be returned in the below query.
+// Entity noSpaceButSimilarString = new Entity();
+// noSpaceButSimilarString.put( "name","thing2" );
+// noSpaceButSimilarString.put( "random", "fury" );
+// this.app().collection( collectionName ).post( noSpaceButSimilarString );
+// refreshIndex();
+
+ QueryParameters params = new QueryParameters()
+ .setQuery("select * where random = \"%7Bfury%7D\"");
+ Collection activities = this.app().collection(collectionName ).get(params);
+ assertEquals(1, activities.getResponse().getEntityCount());
+ assertEquals( encodingTestString,activities.getResponse().getEntities().get( 0 ).get( "random" ) );
+ }
+
/**
* Test correct sort order for Long properties
*