usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [03/14] git commit: Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into two-dot-o
Date Tue, 04 Nov 2014 22:59:25 GMT
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into two-dot-o

Conflicts:
	stack/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2aa09538
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2aa09538
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2aa09538

Branch: refs/heads/key-row-sharding
Commit: 2aa09538c5f616405733523d243da898dda1e7e3
Parents: 4db5a0b 3f4825c
Author: ryan bridges <rbridges@apigee.com>
Authored: Wed Oct 22 15:37:36 2014 -0400
Committer: ryan bridges <rbridges@apigee.com>
Committed: Wed Oct 22 15:37:36 2014 -0400

----------------------------------------------------------------------
 portal/js/global/ug-service.js                  |    2 +-
 portal/js/push/push-history.html                |    8 +-
 .../push/push-send-notification-controller.js   |   44 +-
 stack/awscluster/src/main/cql/create_locks.cql  |   24 +-
 .../awscluster/src/main/cql/create_usergrid.cql |   80 +-
 .../main/cql/create_usergrid_applications.cql   |  411 +----
 .../main/dist/init_instance/create_keyspaces.sh |   28 +-
 .../src/main/dist/init_instance/create_raid0.sh |   19 +-
 .../dist/init_instance/create_raid0_2disks.sh   |   54 -
 .../src/main/dist/init_instance/init_cass.sh    |   70 -
 .../main/dist/init_instance/init_db_server.sh   |   11 +-
 .../main/dist/init_instance/init_es_server.sh   |   67 +
 .../dist/init_instance/init_graphite_server.sh  |   11 +-
 .../main/dist/init_instance/init_rest_server.sh |   24 +
 .../dist/init_instance/install_cassandra.sh     |    6 +-
 .../dist/init_instance/install_elasticsearch.sh |   22 +-
 .../init_instance/install_opscenter_agent.sh    |    1 +
 .../main/dist/init_instance/install_yourkit.sh  |    6 +-
 .../src/main/groovy/configure_cassandra.groovy  |   26 +-
 .../main/groovy/configure_elasticsearch.groovy  |   26 +-
 .../src/main/groovy/configure_usergrid.groovy   |   22 +-
 .../src/main/groovy/tag_instance.groovy         |   10 +-
 stack/awscluster/ugcluster-cf.json              |  345 +++-
 .../main/resources/usergrid-default.properties  |    2 +-
 stack/core/pom.xml                              |   21 -
 .../corepersistence/CpEntityDeleteListener.java |    2 +-
 .../corepersistence/CpEntityManager.java        |  457 ++----
 .../corepersistence/CpEntityManagerFactory.java |  220 ++-
 .../corepersistence/CpEntityMapUtils.java       |  323 ----
 .../corepersistence/CpManagerCache.java         |    2 +-
 .../usergrid/corepersistence/CpNamingUtils.java |  106 --
 .../corepersistence/CpRelationManager.java      | 1553 ++++++++----------
 .../usergrid/corepersistence/CpSetup.java       |    3 +
 .../usergrid/corepersistence/CpVisitor.java     |   35 +
 .../usergrid/corepersistence/CpWalker.java      |  128 ++
 .../corepersistence/results/EntityVerifier.java |  127 ++
 .../results/FilteringLoader.java                |  249 +++
 .../corepersistence/results/IdsVerifier.java    |   46 +
 .../corepersistence/results/RefsVerifier.java   |   42 +
 .../corepersistence/results/ResultsLoader.java  |   43 +
 .../results/ResultsLoaderFactory.java           |   39 +
 .../results/ResultsLoaderFactoryImpl.java       |   67 +
 .../results/ResultsVerifier.java                |   54 +
 .../results/VersionVerifier.java                |   81 +
 .../corepersistence/util/CpEntityMapUtils.java  |  323 ++++
 .../corepersistence/util/CpNamingUtils.java     |  106 ++
 .../apache/usergrid/metrics/MetricsFactory.java |   21 +-
 .../usergrid/persistence/EntityManager.java     |    9 +-
 .../persistence/EntityManagerFactory.java       |    8 +-
 .../apache/usergrid/persistence/Results.java    |    6 +-
 .../cassandra/EntityManagerImpl.java            |   12 +
 .../persistence/entities/Notification.java      |   13 +
 .../usergrid/batch/job/SchedulerRuntime8IT.java |    3 +
 .../CpEntityDeleteListenerTest.java             |    2 +-
 .../CpEntityIndexDeleteListenerTest.java        |    3 +-
 .../corepersistence/CpEntityMapUtilsTest.java   |    2 +
 .../corepersistence/StaleIndexCleanupTest.java  |  249 +++
 .../PerformanceEntityRebuildIndexTest.java      |   36 +-
 .../query/AbstractIteratingQueryIT.java         |    3 +
 .../collection/EntityCollectionManager.java     |   23 +
 .../persistence/collection/EntitySet.java       |   47 +
 .../persistence/collection/MvccEntity.java      |   68 +
 .../persistence/collection/MvccLogEntry.java    |   94 ++
 .../persistence/collection/VersionSet.java      |   67 +
 .../exception/CollectionRuntimeException.java   |    2 +-
 .../exception/WriteCommitException.java         |    4 +-
 .../WriteOptimisticVerifyException.java         |    4 +-
 .../exception/WriteStartException.java          |    4 +-
 .../exception/WriteUniqueVerifyException.java   |    3 +-
 .../collection/guice/CollectionModule.java      |   19 +-
 .../impl/EntityCollectionManagerImpl.java       |  257 ++-
 .../impl/EntityVersionCleanupTask.java          |    2 +-
 .../mvcc/MvccEntitySerializationStrategy.java   |   20 +-
 .../mvcc/MvccLogEntrySerializationStrategy.java |   17 +-
 .../collection/mvcc/changelog/ChangeLog.java    |   68 +
 .../mvcc/changelog/ChangeLogEntry.java          |  104 --
 .../mvcc/changelog/ChangeLogGenerator.java      |   16 +-
 .../mvcc/changelog/ChangeLogGeneratorImpl.java  |  138 +-
 .../mvcc/changelog/ChangeLogImpl.java           |  135 ++
 .../collection/mvcc/entity/MvccEntity.java      |   68 -
 .../collection/mvcc/entity/MvccLogEntry.java    |   93 --
 .../mvcc/entity/MvccValidationUtils.java        |    4 +
 .../mvcc/entity/impl/MvccEntityDeleteEvent.java |    2 +-
 .../mvcc/entity/impl/MvccEntityEvent.java       |    2 +-
 .../mvcc/entity/impl/MvccEntityImpl.java        |    2 +-
 .../mvcc/entity/impl/MvccEntityWriteEvent.java  |    3 +-
 .../mvcc/entity/impl/MvccLogEntryImpl.java      |    2 +-
 .../mvcc/event/PostProcessObserver.java         |   39 -
 .../mvcc/stage/EntityUpdateEvent.java           |    1 -
 .../mvcc/stage/delete/MarkCommit.java           |  157 +-
 .../collection/mvcc/stage/delete/MarkStart.java |    4 +-
 .../collection/mvcc/stage/load/Load.java        |   98 --
 .../mvcc/stage/write/EntityVersion.java         |   64 -
 .../stage/write/EntityVersionSerializer.java    |   71 -
 .../mvcc/stage/write/FieldSerializer.java       |  107 --
 .../mvcc/stage/write/RollbackAction.java        |    9 +-
 .../mvcc/stage/write/UniqueValue.java           |   39 -
 .../mvcc/stage/write/UniqueValueImpl.java       |  124 --
 .../write/UniqueValueSerializationStrategy.java |   66 -
 .../UniqueValueSerializationStrategyImpl.java   |  194 ---
 .../mvcc/stage/write/WriteCommit.java           |   18 +-
 .../mvcc/stage/write/WriteOptimisticVerify.java |   52 +-
 .../collection/mvcc/stage/write/WriteStart.java |   17 +-
 .../mvcc/stage/write/WriteUniqueVerify.java     |  209 ++-
 .../collection/serialization/EntityRepair.java  |   38 +
 .../serialization/OptimisticUpdate.java         |    2 +-
 .../serialization/SerializationFig.java         |   19 +
 .../collection/serialization/UniqueValue.java   |   49 +
 .../UniqueValueSerializationStrategy.java       |   68 +
 .../serialization/UniqueValueSet.java           |   32 +
 .../serialization/impl/EntityRepairImpl.java    |  149 ++
 .../serialization/impl/EntitySetImpl.java       |   62 +
 .../serialization/impl/EntityVersion.java       |   64 +
 .../impl/EntityVersionSerializer.java           |   81 +
 .../serialization/impl/FieldSerializer.java     |  118 ++
 .../serialization/impl/LogEntryIterator.java    |    2 +-
 .../MvccEntitySerializationStrategyImpl.java    |  175 +-
 .../MvccLogEntrySerializationStrategyImpl.java  |  129 +-
 .../serialization/impl/SerializationModule.java |    3 +-
 .../serialization/impl/UniqueValueImpl.java     |  114 ++
 .../UniqueValueSerializationStrategyImpl.java   |  229 +++
 .../serialization/impl/UniqueValueSetImpl.java  |   85 +
 .../serialization/impl/VersionSetImpl.java      |   80 +
 .../persistence/collection/util/RepairUtil.java |  138 --
 .../collection/EntityCollectionManagerIT.java   |  431 ++++-
 .../changelog/ChangeLogGeneratorImplTest.java   |  375 +++--
 .../mvcc/entity/impl/MvccEntityImplTest.java    |    2 +-
 .../mvcc/entity/impl/MvccLogEntryImplTest.java  |    2 +-
 .../mvcc/stage/AbstractMvccEntityStageTest.java |    2 +-
 .../mvcc/stage/TestEntityGenerator.java         |    2 +-
 .../mvcc/stage/delete/MarkCommitTest.java       |   12 +-
 .../mvcc/stage/delete/MarkStartTest.java        |    4 +-
 .../collection/mvcc/stage/load/LoadTest.java    |  361 ----
 .../write/EntityVersionSerializerTest.java      |    2 +
 .../mvcc/stage/write/FieldSerializerTest.java   |    1 +
 ...niqueValueSerializationStrategyImplTest.java |  119 +-
 .../mvcc/stage/write/WriteCommitTest.java       |    5 +-
 .../stage/write/WriteOptimisticVerifyTest.java  |   35 +-
 .../mvcc/stage/write/WriteStartTest.java        |    4 +-
 .../stage/write/WriteUniqueVerifyStageTest.java |   48 -
 .../mvcc/stage/write/WriteUniqueVerifyTest.java |   58 +-
 .../serialization/EntityRepairImplTest.java     |  147 ++
 .../impl/LogEntryIteratorTest.java              |    2 +-
 ...MvccEntitySerializationStrategyImplTest.java |   40 +-
 .../impl/MvccLESSTransientTest.java             |    7 +-
 ...ccLogEntrySerializationStrategyImplTest.java |   19 +-
 .../util/InvalidMvccEntityGenerator.java        |    2 +-
 .../util/InvalidValueGeneratorTest.java         |    2 +-
 .../collection/util/LogEntryMock.java           |    4 +-
 stack/corepersistence/common/pom.xml            |   13 +-
 .../persistence/model/field/AbstractField.java  |    4 +
 .../persistence/model/field/ArrayField.java     |    3 +
 .../persistence/model/field/BooleanField.java   |    6 +
 .../persistence/model/field/ByteArrayField.java |    6 +
 .../persistence/model/field/DoubleField.java    |    6 +
 .../model/field/EntityObjectField.java          |    6 +
 .../usergrid/persistence/model/field/Field.java |    8 +
 .../persistence/model/field/FieldTypeName.java  |   42 +
 .../persistence/model/field/FloatField.java     |    6 +
 .../persistence/model/field/IntegerField.java   |    6 +
 .../persistence/model/field/ListField.java      |    7 +
 .../persistence/model/field/LocationField.java  |    6 +
 .../persistence/model/field/LongField.java      |    6 +
 .../persistence/model/field/SetField.java       |    6 +
 .../persistence/model/field/StringField.java    |    6 +
 .../persistence/model/field/UUIDField.java      |    6 +
 stack/corepersistence/pom.xml                   |    5 +-
 .../usergrid/persistence/index/EntityIndex.java |    6 +
 .../persistence/index/EntityIndexBatch.java     |    3 +
 .../index/impl/EsEntityIndexBatchImpl.java      |  121 +-
 .../index/impl/EsEntityIndexImpl.java           |  384 +++--
 .../persistence/index/impl/EsProvider.java      |   21 +-
 .../persistence/index/impl/IndexScopeImpl.java  |   37 +
 .../persistence/index/impl/IndexingUtils.java   |   66 +
 .../index/query/CandidateResult.java            |   30 +
 .../persistence/index/impl/EntityIndexTest.java |    5 +
 stack/corepersistence/queue/pom.xml             |    8 +-
 .../usergrid/persistence/queue/Queue.java       |    4 +
 .../queue/impl/SQSQueueManagerImpl.java         |  131 +-
 stack/loadtests/README.md                       |   53 +
 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 0 -> 3813075 bytes
 .../gatling/lib/akka-actor_2.10-2.3.6.jar       |  Bin 0 -> 2583959 bytes
 .../lib/async-http-client-1.9.0-BETA13.jar      |  Bin 0 -> 579954 bytes
 stack/loadtests/gatling/lib/boon-0.26.jar       |  Bin 0 -> 1026950 bytes
 .../loadtests/gatling/lib/commons-pool-1.6.jar  |  Bin 0 -> 111119 bytes
 .../lib/compiler-interface-0.13.5-sources.jar   |  Bin 0 -> 30056 bytes
 .../lib/concurrentlinkedhashmap-lru-1.4.jar     |  Bin 0 -> 116575 bytes
 stack/loadtests/gatling/lib/config-1.2.1.jar    |  Bin 0 -> 219554 bytes
 .../gatling/lib/fastring_2.10-0.2.4.jar         |  Bin 0 -> 98640 bytes
 .../gatling/lib/gatling-app-2.0.0-RC5.jar       |  Bin 0 -> 73052 bytes
 .../gatling/lib/gatling-charts-2.0.0-RC5.jar    |  Bin 0 -> 500609 bytes
 .../lib/gatling-charts-highcharts-2.0.0-RC5.jar |  Bin 0 -> 214683 bytes
 .../gatling/lib/gatling-core-2.0.0-RC5.jar      |  Bin 0 -> 1678475 bytes
 .../gatling/lib/gatling-http-2.0.0-RC5.jar      |  Bin 0 -> 1222752 bytes
 .../gatling/lib/gatling-jdbc-2.0.0-RC5.jar      |  Bin 0 -> 41648 bytes
 .../gatling/lib/gatling-jms-2.0.0-RC5.jar       |  Bin 0 -> 174279 bytes
 .../gatling/lib/gatling-metrics-2.0.0-RC5.jar   |  Bin 0 -> 72446 bytes
 .../gatling/lib/gatling-recorder-2.0.0-RC5.jar  |  Bin 0 -> 815471 bytes
 .../gatling/lib/gatling-redis-2.0.0-RC5.jar     |  Bin 0 -> 19970 bytes
 .../gatling/lib/geronimo-jms_1.1_spec-1.1.1.jar |  Bin 0 -> 32359 bytes
 .../gatling/lib/incremental-compiler-0.13.5.jar |  Bin 0 -> 2214694 bytes
 .../gatling/lib/jackson-annotations-2.4.0.jar   |  Bin 0 -> 38605 bytes
 .../gatling/lib/jackson-core-2.4.2.jar          |  Bin 0 -> 225316 bytes
 .../gatling/lib/jackson-databind-2.4.2.jar      |  Bin 0 -> 1075759 bytes
 stack/loadtests/gatling/lib/jodd-core-3.6.jar   |  Bin 0 -> 373882 bytes
 .../loadtests/gatling/lib/jodd-lagarto-3.6.jar  |  Bin 0 -> 204738 bytes
 stack/loadtests/gatling/lib/jodd-log-3.6.jar    |  Bin 0 -> 14547 bytes
 .../gatling/lib/jsonpath_2.10-0.5.0.jar         |  Bin 0 -> 180090 bytes
 stack/loadtests/gatling/lib/jzlib-1.1.3.jar     |  Bin 0 -> 71976 bytes
 .../gatling/lib/logback-classic-1.1.2.jar       |  Bin 0 -> 270750 bytes
 .../gatling/lib/logback-core-1.1.2.jar          |  Bin 0 -> 427729 bytes
 .../loadtests/gatling/lib/netty-3.9.4.Final.jar |  Bin 0 -> 1310154 bytes
 stack/loadtests/gatling/lib/opencsv-2.3.jar     |  Bin 0 -> 19827 bytes
 .../gatling/lib/redisclient_2.10-2.13.jar       |  Bin 0 -> 712616 bytes
 .../gatling/lib/sbt-interface-0.13.5.jar        |  Bin 0 -> 52012 bytes
 stack/loadtests/gatling/lib/scala-compiler.jar  |  Bin 0 -> 14445780 bytes
 stack/loadtests/gatling/lib/scala-library.jar   |  Bin 0 -> 7126372 bytes
 stack/loadtests/gatling/lib/scala-reflect.jar   |  Bin 0 -> 3203471 bytes
 .../gatling/lib/scala-swing-2.10.4.jar          |  Bin 0 -> 707298 bytes
 .../lib/scalalogging-slf4j_2.10-1.1.0.jar       |  Bin 0 -> 79003 bytes
 .../loadtests/gatling/lib/scopt_2.10-3.2.0.jar  |  Bin 0 -> 122918 bytes
 stack/loadtests/gatling/lib/slf4j-api-1.7.7.jar |  Bin 0 -> 29257 bytes
 stack/loadtests/gatling/lib/t-digest-3.0.jar    |  Bin 0 -> 49754 bytes
 stack/loadtests/gatling/lib/threetenbp-1.0.jar  |  Bin 0 -> 507797 bytes
 .../gatling/lib/uncommons-maths-1.2.3.jar       |  Bin 0 -> 49923 bytes
 stack/loadtests/gatling/lib/zinc-0.3.5.3.jar    |  Bin 0 -> 392810 bytes
 stack/loadtests/gatling/scripts/gatling-ug.sh   |   43 +
 .../gatling/user-files/data/search.csv          |    3 +
 .../gatling/user-files/request-bodies/.keep     |    0
 stack/loadtests/loadtest_setup.sh               |   45 +
 .../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 +
 stack/pom.xml                                   |   36 +-
 .../apache/usergrid/rest/SystemResource.java    |   74 +-
 stack/rest/src/main/webapp/WEB-INF/web.xml      |    2 +-
 .../usergrid/rest/management/AccessTokenIT.java |  381 +++--
 .../cassandra/ManagementServiceImpl.java        |   38 +-
 .../usergrid/services/ServiceManager.java       |    7 +-
 .../services/devices/DevicesService.java        |   55 +-
 .../notifications/ApplicationQueueManager.java  |   17 +-
 .../notifications/NotificationsService.java     |    9 +-
 .../services/notifications/QueueListener.java   |   10 +-
 .../services/notifications/TaskManager.java     |  105 +-
 .../services/users/devices/DevicesService.java  |   33 +
 .../cassandra/ManagementServiceIT.java          |    2 +-
 .../usergrid/services/TestQueueManager.java     |    4 +-
 .../AbstractServiceNotificationIT.java          |   10 +-
 .../notifications/NotifiersServiceIT.java       |    1 +
 .../apns/NotificationsServiceIT.java            |  186 ++-
 .../gcm/NotificationsServiceIT.java             |  172 +-
 .../src/test/resources/log4j.properties         |    4 +
 273 files changed, 9585 insertions(+), 5776 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aa09538/stack/pom.xml
----------------------------------------------------------------------


Mime
View raw message