You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/30 04:40:10 UTC
[44/45] git commit: Merge remote-tracking branch 'origin/two-dot-o'
into key-row-sharding
Merge remote-tracking branch 'origin/two-dot-o' into key-row-sharding
Conflicts:
stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f85fed19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f85fed19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f85fed19
Branch: refs/heads/key-row-sharding
Commit: f85fed191721bc761251d839f3042e2be7d3573d
Parents: 00ae403 0bfca7e
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Oct 29 21:38:44 2014 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Oct 29 21:38:44 2014 -0600
----------------------------------------------------------------------
portal/js/push/push-config.html | 89 +-
.../main/resources/usergrid-default.properties | 3 +
.../corepersistence/CpEntityDeleteListener.java | 45 +-
.../corepersistence/CpEntityManager.java | 73 +-
.../corepersistence/CpEntityManagerFactory.java | 53 +-
.../corepersistence/CpManagerCache.java | 117 ++-
.../corepersistence/CpRelationManager.java | 944 +++++++++++--------
.../usergrid/corepersistence/CpWalker.java | 44 +-
.../migration/GraphShardVersionMigration.java | 28 +
.../corepersistence/migration/Versions.java | 4 +
.../results/FilteringLoader.java | 63 +-
.../results/ResultsLoaderFactory.java | 5 +-
.../results/ResultsLoaderFactoryImpl.java | 4 -
.../results/ResultsVerifier.java | 6 +-
.../results/VersionVerifier.java | 8 +-
.../corepersistence/util/CpEntityMapUtils.java | 5 +-
.../usergrid/persistence/entities/Notifier.java | 2 -
.../usergrid/persistence/index/EntityIndex.java | 4 +-
.../persistence/index/EntityIndexBatch.java | 6 -
.../persistence/index/EntityIndexFactory.java | 2 -
.../usergrid/persistence/index/IndexScope.java | 9 +-
.../persistence/index/guice/IndexModule.java | 1 -
.../index/impl/EsEntityIndexBatchImpl.java | 3 +-
.../index/impl/EsEntityIndexImpl.java | 71 +-
.../persistence/index/impl/EsProvider.java | 11 +-
.../index/query/CandidateResults.java | 7 +-
.../persistence/index/query/EntityResults.java | 6 +-
.../persistence/index/query/Identifier.java | 3 +-
.../usergrid/persistence/index/query/Query.java | 27 +-
.../persistence/index/query/Results.java | 4 +-
.../usergrid/persistence/queue/QueueFig.java | 3 +
.../persistence/queue/QueueScopeFactory.java | 34 +
.../persistence/queue/guice/QueueModule.java | 10 +-
.../queue/impl/QueueScopeFactoryImpl.java | 47 +
.../queue/impl/SQSQueueManagerImpl.java | 6 +-
.../persistence/queue/QueueManagerTest.java | 27 +-
stack/loadtests/README.md | 52 -
stack/loadtests/gatling/LICENSE | 202 ----
stack/loadtests/gatling/conf/application.conf | 21 -
stack/loadtests/gatling/conf/gatling.conf | 162 ----
stack/loadtests/gatling/conf/logback.xml | 35 -
stack/loadtests/gatling/conf/recorder.conf | 51 -
.../gatling/lib/Saxon-HE-9.5.1-6-compressed.jar | Bin 3813075 -> 0 bytes
.../gatling/lib/akka-actor_2.10-2.3.6.jar | Bin 2583959 -> 0 bytes
.../lib/async-http-client-1.9.0-BETA13.jar | Bin 579954 -> 0 bytes
stack/loadtests/gatling/lib/boon-0.26.jar | Bin 1026950 -> 0 bytes
.../loadtests/gatling/lib/commons-pool-1.6.jar | Bin 111119 -> 0 bytes
.../lib/compiler-interface-0.13.5-sources.jar | Bin 30056 -> 0 bytes
.../lib/concurrentlinkedhashmap-lru-1.4.jar | Bin 116575 -> 0 bytes
stack/loadtests/gatling/lib/config-1.2.1.jar | Bin 219554 -> 0 bytes
.../gatling/lib/fastring_2.10-0.2.4.jar | Bin 98640 -> 0 bytes
.../gatling/lib/gatling-app-2.0.0-RC5.jar | Bin 73052 -> 0 bytes
.../gatling/lib/gatling-charts-2.0.0-RC5.jar | Bin 500609 -> 0 bytes
.../lib/gatling-charts-highcharts-2.0.0-RC5.jar | Bin 214683 -> 0 bytes
.../gatling/lib/gatling-core-2.0.0-RC5.jar | Bin 1678475 -> 0 bytes
.../gatling/lib/gatling-http-2.0.0-RC5.jar | Bin 1222752 -> 0 bytes
.../gatling/lib/gatling-jdbc-2.0.0-RC5.jar | Bin 41648 -> 0 bytes
.../gatling/lib/gatling-jms-2.0.0-RC5.jar | Bin 174279 -> 0 bytes
.../gatling/lib/gatling-metrics-2.0.0-RC5.jar | Bin 72446 -> 0 bytes
.../gatling/lib/gatling-recorder-2.0.0-RC5.jar | Bin 815471 -> 0 bytes
.../gatling/lib/gatling-redis-2.0.0-RC5.jar | Bin 19970 -> 0 bytes
.../gatling/lib/geronimo-jms_1.1_spec-1.1.1.jar | Bin 32359 -> 0 bytes
.../gatling/lib/incremental-compiler-0.13.5.jar | Bin 2214694 -> 0 bytes
.../gatling/lib/jackson-annotations-2.4.0.jar | Bin 38605 -> 0 bytes
.../gatling/lib/jackson-core-2.4.2.jar | Bin 225316 -> 0 bytes
.../gatling/lib/jackson-databind-2.4.2.jar | Bin 1075759 -> 0 bytes
stack/loadtests/gatling/lib/jodd-core-3.6.jar | Bin 373882 -> 0 bytes
.../loadtests/gatling/lib/jodd-lagarto-3.6.jar | Bin 204738 -> 0 bytes
stack/loadtests/gatling/lib/jodd-log-3.6.jar | Bin 14547 -> 0 bytes
.../gatling/lib/jsonpath_2.10-0.5.0.jar | Bin 180090 -> 0 bytes
stack/loadtests/gatling/lib/jzlib-1.1.3.jar | Bin 71976 -> 0 bytes
.../gatling/lib/logback-classic-1.1.2.jar | Bin 270750 -> 0 bytes
.../gatling/lib/logback-core-1.1.2.jar | Bin 427729 -> 0 bytes
.../loadtests/gatling/lib/netty-3.9.4.Final.jar | Bin 1310154 -> 0 bytes
stack/loadtests/gatling/lib/opencsv-2.3.jar | Bin 19827 -> 0 bytes
.../gatling/lib/redisclient_2.10-2.13.jar | Bin 712616 -> 0 bytes
.../gatling/lib/sbt-interface-0.13.5.jar | Bin 52012 -> 0 bytes
stack/loadtests/gatling/lib/scala-compiler.jar | Bin 14445780 -> 0 bytes
stack/loadtests/gatling/lib/scala-library.jar | Bin 7126372 -> 0 bytes
stack/loadtests/gatling/lib/scala-reflect.jar | Bin 3203471 -> 0 bytes
.../gatling/lib/scala-swing-2.10.4.jar | Bin 707298 -> 0 bytes
.../lib/scalalogging-slf4j_2.10-1.1.0.jar | Bin 79003 -> 0 bytes
.../loadtests/gatling/lib/scopt_2.10-3.2.0.jar | Bin 122918 -> 0 bytes
stack/loadtests/gatling/lib/slf4j-api-1.7.7.jar | Bin 29257 -> 0 bytes
stack/loadtests/gatling/lib/t-digest-3.0.jar | Bin 49754 -> 0 bytes
stack/loadtests/gatling/lib/threetenbp-1.0.jar | Bin 507797 -> 0 bytes
.../gatling/lib/uncommons-maths-1.2.3.jar | Bin 49923 -> 0 bytes
stack/loadtests/gatling/lib/zinc-0.3.5.3.jar | Bin 392810 -> 0 bytes
stack/loadtests/gatling/scripts/gatling-ug.sh | 49 -
.../gatling/user-files/data/search.csv | 3 -
.../gatling/user-files/request-bodies/.keep | 0
stack/loadtests/loadtest_setup.sh | 45 -
stack/loadtests/pom.xml | 156 +++
.../data-generators/EntityDataGenerator.scala | 57 --
.../data-generators/FeederGenerator.scala | 101 --
.../scenarios/ApplicationScenarios.scala | 45 -
.../scenarios/ConnectionScenarios.scala | 30 -
.../usergrid/scenarios/DeviceScenarios.scala | 65 --
.../usergrid/scenarios/GeoScenarios.scala | 43 -
.../scenarios/NotificationScenarios.scala | 71 --
.../usergrid/scenarios/NotifierScenarios.scala | 65 --
.../scenarios/OrganizationScenarios.scala | 42 -
.../usergrid/scenarios/TokenScenarios.scala | 59 --
.../usergrid/scenarios/UserScenarios.scala | 50 -
.../org/apache/usergrid/settings/Headers.scala | 43 -
.../org/apache/usergrid/settings/Settings.scala | 54 --
.../org/apache/usergrid/settings/Utils.scala | 87 --
.../simulations/GetEntitySimulation.scala | 41 -
.../simulations/PostDevicesSimulation.scala | 42 -
.../simulations/PostUsersSimulation.scala | 47 -
.../PushTargetDeviceSimulation.scala | 53 --
.../simulations/PushTargetUserSimulation.scala | 68 --
.../datagenerators/EntityDataGenerator.scala | 59 ++
.../datagenerators/FeederGenerator.scala | 114 +++
.../scenarios/ApplicationScenarios.scala | 46 +
.../scenarios/ConnectionScenarios.scala | 36 +
.../usergrid/scenarios/DeviceScenarios.scala | 85 ++
.../usergrid/scenarios/GeoScenarios.scala | 44 +
.../scenarios/NotificationScenarios.scala | 74 ++
.../usergrid/scenarios/NotifierScenarios.scala | 66 ++
.../scenarios/OrganizationScenarios.scala | 43 +
.../usergrid/scenarios/TokenScenarios.scala | 60 ++
.../usergrid/scenarios/UserScenarios.scala | 50 +
.../org/apache/usergrid/settings/Headers.scala | 43 +
.../org/apache/usergrid/settings/Settings.scala | 50 +
.../org/apache/usergrid/settings/Utils.scala | 91 ++
.../simulations/GetEntitySimulation.scala | 44 +
.../simulations/PostDevicesSimulation.scala | 45 +
.../simulations/PostUsersSimulation.scala | 50 +
...PushNotificationTargetDeviceSimulation.scala | 57 ++
.../PushNotificationTargetUserSimulation.scala | 72 ++
stack/loadtests/src/main/scripts/gatling-mvn.sh | 28 +
stack/loadtests/src/main/scripts/gatling-ug.sh | 51 +
stack/loadtests/src/test/resources/gatling.conf | 154 +++
stack/loadtests/src/test/resources/logback.xml | 37 +
.../loadtests/src/test/resources/recorder.conf | 37 +
stack/loadtests/src/test/scala/Engine.scala | 32 +
.../src/test/scala/IDEPathHelper.scala | 37 +
stack/loadtests/src/test/scala/Recorder.scala | 28 +
.../_maven.repositories | 8 -
...14c97c6e3ef40c88590e1b196d3ec55b-javadoc.jar | Bin 160201 -> 0 bytes
...14c97c6e3ef40c88590e1b196d3ec55b-sources.jar | Bin 59744 -> 0 bytes
...63dec68314c97c6e3ef40c88590e1b196d3ec55b.jar | Bin 67751 -> 0 bytes
...7c6e3ef40c88590e1b196d3ec55b.jar.lastUpdated | 13 -
...63dec68314c97c6e3ef40c88590e1b196d3ec55b.pom | 166 ----
...7c6e3ef40c88590e1b196d3ec55b.pom.lastUpdated | 13 -
.../pushy-0.4-apigee.pom | 166 ----
stack/pom.xml | 2 +-
stack/services/pom.xml | 2 +-
.../notifications/ApplicationQueueManager.java | 586 +-----------
.../notifications/InactiveDeviceManager.java | 79 ++
.../notifications/NotificationsService.java | 40 +-
.../services/notifications/ProviderAdapter.java | 42 +-
.../notifications/ProviderAdapterFactory.java | 49 +
.../services/notifications/QueueListener.java | 89 +-
.../services/notifications/TaskManager.java | 17 +-
.../services/notifications/TestAdapter.java | 23 +-
.../notifications/apns/APNsAdapter.java | 200 ++--
.../notifications/apns/EntityPushManager.java | 75 ++
.../apns/ExpiredTokenListener.java | 52 +
.../services/notifications/gcm/GCMAdapter.java | 142 ++-
.../impl/ApplicationQueueManagerImpl.java | 523 ++++++++++
.../services/notifiers/NotifiersService.java | 30 +-
.../notifications/NotifiersServiceIT.java | 33 +-
.../apns/MockSuccessfulProviderAdapter.java | 38 +-
.../apns/NotificationsServiceIT.java | 67 +-
.../gcm/MockSuccessfulProviderAdapter.java | 33 +-
.../gcm/NotificationsServiceIT.java | 81 +-
168 files changed, 3967 insertions(+), 3748 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f85fed19/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigration.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigration.java
index 0000000,0000000..e714b5e
new file mode 100644
--- /dev/null
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigration.java
@@@ -1,0 -1,0 +1,28 @@@
++/*
++ *
++ * * 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.usergrid.corepersistence.migration;
++
++
++/**
++ * Migration for migrating graph edges to the new Shards
++ */
++public class GraphShardVersionMigration {}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f85fed19/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/Versions.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/Versions.java
index 0000000,0000000..56bd65e
new file mode 100644
--- /dev/null
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/Versions.java
@@@ -1,0 -1,0 +1,4 @@@
++package org.apache.usergrid.corepersistence.migration;
++
++
++public class Versions {}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f85fed19/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/QueueManagerTest.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/QueueManagerTest.java
index 85db87d,1d3c049..8eb5625
--- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/QueueManagerTest.java
+++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/QueueManagerTest.java
@@@ -19,9 -19,12 +19,10 @@@
package org.apache.usergrid.persistence.queue;
-import com.amazonaws.services.glacier.TreeHashGenerator;
-import org.apache.usergrid.persistence.collection.util.InvalidEntityGenerator;
import org.apache.usergrid.persistence.queue.guice.TestQueueModule;
+ import org.apache.usergrid.persistence.queue.impl.QueueScopeFactoryImpl;
import org.apache.usergrid.persistence.queue.impl.QueueScopeImpl;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;