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/09/29 22:00:40 UTC
[14/15] usergrid git commit: Merge branch '2.1-release' of
https://git-wip-us.apache.org/repos/asf/usergrid into export-feature
Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid into export-feature
# By Todd Nine (17) and Shawn Feldman (13)
# Via Shawn Feldman (7) and Todd Nine (2)
* '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid: (30 commits)
remove properties
remove rx
remove system properities
add delete queue for cleanup and poll for messages
upgrade was sdk
Fixes NPE from missing org during testing
change consumer to producer
add subscribe to entity verifier
removing async processing
remove threading
remove batch consumer
remove batch consumer
Updated plugin to also take into account core data version
Fixes missing observer update
Fixed bugs in migration of apps
Adds rest tests and fixes bugs with POST/PUT re-ordering
Changes implementation to update a connection to have the timestamp it was last POSTed.
fix time_to_live gcm
Fixes issues found during review
Fixes incorrect name issue
...
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/da720c1a
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/da720c1a
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/da720c1a
Branch: refs/heads/export-feature
Commit: da720c1a76941cf7e69a2421ff8aa1567df31491
Parents: 34917c8 a770024
Author: GERey <gr...@apigee.com>
Authored: Mon Sep 28 08:20:59 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Mon Sep 28 08:20:59 2015 -0700
----------------------------------------------------------------------
.../usergrid/corepersistence/CoreModule.java | 55 +++-
.../corepersistence/CpEntityManager.java | 9 -
.../corepersistence/CpRelationManager.java | 34 ++-
.../asyncevents/AsyncEventService.java | 2 +
.../corepersistence/index/IndexServiceImpl.java | 4 -
.../migration/CoreMigration.java | 45 +--
.../migration/CoreMigrationPlugin.java | 38 ++-
.../migration/DeDupConnectionDataMigration.java | 93 ++++++
.../migration/EntityTypeMappingMigration.java | 104 -------
.../migration/MigrationModuleVersionPlugin.java | 5 -
.../corepersistence/migration/Versions.java | 31 --
.../builder/PipelineBuilderFactory.java | 3 +
.../read/search/CandidateEntityFilter.java | 5 +-
.../service/ConnectionScope.java | 53 ++++
.../service/ConnectionService.java | 10 +
.../service/ConnectionServiceImpl.java | 90 +++++-
.../corepersistence/util/CpNamingUtils.java | 13 +-
.../corepersistence/StaleIndexCleanupTest.java | 14 +-
.../corepersistence/TestCoreModule.java | 34 +++
.../DeDupConnectionDataMigrationTest.java | 145 +++++++++
.../migration/EntityTypeMappingMigrationIT.java | 125 --------
.../service/ConnectionServiceImplTest.java | 235 +++++++++++++++
stack/core/src/test/resources/log4j.properties | 6 +-
.../serialization/impl/SerializationModule.java | 4 +-
.../migration/CollectionMigrationPlugin.java | 8 +-
.../migration/MvccEntityDataMigrationImpl.java | 10 +-
...ctMvccEntityDataMigrationV1ToV3ImplTest.java | 39 ++-
.../core/future/FutureObservable.java | 44 ---
.../migration/data/AbstractMigrationPlugin.java | 17 +-
.../core/migration/data/DataMigration.java | 11 +-
.../migration/data/MigrationDataProvider.java | 2 +-
.../core/migration/data/MigrationPlugin.java | 4 +-
.../migration/schema/MigrationManagerFig.java | 1 +
.../migration/data/TestProgressObserver.java | 10 +-
.../persistence/graph/guice/GraphModule.java | 4 +-
.../graph/impl/GraphManagerImpl.java | 4 +-
.../impl/stage/EdgeDeleteListenerImpl.java | 4 +-
.../graph/impl/stage/EdgeDeleteRepairImpl.java | 61 ++--
.../impl/TargetIdObservableImpl.java | 13 +-
.../impl/migration/EdgeDataMigrationImpl.java | 12 +-
.../impl/migration/GraphMigrationPlugin.java | 8 +-
.../impl/shard/impl/EdgeSearcher.java | 14 +-
.../impl/ShardedEdgeSerializationImpl.java | 59 ++--
.../shard/impl/serialize/EdgeSerializer.java | 21 +-
.../persistence/graph/GraphManagerIT.java | 73 ++++-
.../migration/EdgeDataMigrationImplTest.java | 59 ++--
.../persistence/index/EntityIndexBatch.java | 1 -
.../usergrid/persistence/index/IndexFig.java | 18 --
.../persistence/index/guice/IndexModule.java | 6 +-
.../index/impl/EsEntityIndexBatchImpl.java | 9 +-
.../index/impl/EsEntityIndexFactoryImpl.java | 8 +-
.../index/impl/EsEntityIndexImpl.java | 6 +-
.../index/impl/EsIndexBufferConsumerImpl.java | 286 ------------------
.../index/impl/EsIndexProducerImpl.java | 209 +++++++++++++
.../index/impl/IndexBufferConsumer.java | 36 ---
.../index/impl/IndexOperationMessage.java | 18 --
.../persistence/index/impl/IndexProducer.java | 37 +++
.../index/impl/IndexRefreshCommandImpl.java | 4 +-
.../EsIndexMappingMigrationPlugin.java | 2 +-
.../index/migration/EsIndexMigrationPlugin.java | 8 +-
.../persistence/index/usergrid-mappings.json | 5 -
.../persistence/queue/DefaultQueueManager.java | 5 +
.../persistence/queue/QueueManager.java | 5 +
.../queue/impl/SNSQueueManagerImpl.java | 9 +
.../queue/impl/SQSQueueManagerImpl.java | 7 +
.../persistence/queue/QueueManagerTest.java | 37 ++-
stack/pom.xml | 2 +-
.../users/ConnectionResourceTest.java | 302 ++++++++++++++-----
stack/scripts/migrate_entity_data.py | 66 ++--
.../management/AppInfoMigrationPlugin.java | 254 ++++++++--------
.../services/AbstractConnectionsService.java | 43 ++-
.../assets/data/AwsSdkS3BinaryStore.java | 37 +--
.../services/notifications/gcm/GCMAdapter.java | 7 +-
.../services/queues/ImportQueueManager.java | 5 +
74 files changed, 1843 insertions(+), 1224 deletions(-)
----------------------------------------------------------------------