usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [09/11] incubator-usergrid git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-396
Date Mon, 16 Mar 2015 00:25:04 GMT
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
USERGRID-396

# By Todd Nine (13) and others
# Via Todd Nine (3) and others
* 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (32 commits)
  Fixes ttl on map entry keys
  Addes Cache to MapMangerFactorImpl for efficiency
  Added a timeout to the map module
  change timer for buffer consumer
  change timer for buffer consumer
  Moved remaining CpEntityManager timers into the constructor.
  Changed log level to warn to catch issues with version mismatch in logging
  Changes index declaration to be explicit on the index
  Added operational logging to tasks
  Moved add alias and test new index into try so we don't keep moving the index alias
  Fixes merge error
  move timers up
  move timers up
  move timers up
  Adds put test to gatling
  Fixes lookup cache bug
  changing buffer impl to queue
  changing buffer impl to queue
  Added caching to org/app lookup
  Upgraded plexus utils and fixes build concurrency issues with surefire
  ...


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

Branch: refs/heads/two-dot-o
Commit: c45a3ed0b08ac3b175d5e3cf214b8352c271ef77
Parents: 4c0102e 06e7ad6
Author: GERey <greyes@apigee.com>
Authored: Thu Mar 12 15:41:03 2015 -0700
Committer: GERey <greyes@apigee.com>
Committed: Thu Mar 12 15:41:03 2015 -0700

----------------------------------------------------------------------
 .../Client/IUsergridClient.cs                   |   2 +-
 .../Usergrid.Notifications/Client/PushClient.cs |  24 ++
 .../Usergrid.Notifications/MainPage.xaml        |   1 +
 .../Usergrid.Notifications/MainPage.xaml.cs     |  29 ++-
 .../main/dist/init_instance/init_rest_server.sh |   3 -
 .../src/main/groovy/configure_usergrid.groovy   |   6 +-
 stack/awscluster/ugcluster-cf.json              |   8 +
 stack/core/pom.xml                              |   7 +-
 .../corepersistence/CpEntityManager.java        | 140 +++++++++-
 .../corepersistence/CpEntityManagerFactory.java | 156 ++++--------
 .../corepersistence/CpRelationManager.java      |  39 ++-
 .../corepersistence/OrgApplicationCache.java    |  67 +++++
 .../OrgApplicationCacheImpl.java                | 181 +++++++++++++
 .../corepersistence/results/EntityVerifier.java |   4 +-
 .../results/FilteringLoader.java                |   2 +-
 .../cassandra/CassandraPersistenceUtils.java    |   2 +-
 .../main/resources/usergrid-core-context.xml    |  14 +-
 .../cassandra/EntityManagerFactoryImplIT.java   |   1 +
 .../core/metrics/MetricsFactoryImpl.java        |   3 +-
 .../usergrid/persistence/map/MapManager.java    |   8 +
 .../persistence/map/MapManagerFactory.java      |   2 +
 .../persistence/map/guice/MapModule.java        |   6 +-
 .../map/impl/MapManagerFactoryImpl.java         |  67 +++++
 .../persistence/map/impl/MapManagerImpl.java    |   6 +
 .../persistence/map/impl/MapSerialization.java  |  20 +-
 .../map/impl/MapSerializationImpl.java          | 106 ++++++--
 .../persistence/map/MapManagerTest.java         |  49 +++-
 stack/corepersistence/queryindex/pom.xml        |  16 +-
 .../persistence/index/EntityIndexFactory.java   |   4 +-
 .../persistence/index/IndexBufferProducer.java  |  10 +-
 .../usergrid/persistence/index/IndexFig.java    |  12 +-
 .../persistence/index/guice/IndexModule.java    |  11 +-
 .../index/impl/EsEntityIndexBatchImpl.java      |  15 +-
 .../index/impl/EsEntityIndexFactoryImpl.java    |  85 +++++++
 .../index/impl/EsEntityIndexImpl.java           | 253 +++++++++++++++----
 .../index/impl/EsIndexBufferConsumerImpl.java   |  48 +++-
 .../index/impl/EsIndexBufferProducerImpl.java   |  30 ++-
 .../persistence/index/impl/IndexingUtils.java   |   3 -
 .../persistence/index/utils/StringUtils.java    | 126 +--------
 .../persistence/index/utils/UUIDUtils.java      |   4 -
 .../persistence/index/impl/EntityIndexTest.java | 101 +++++++-
 .../datagenerators/EntityDataGenerator.scala    |  25 ++
 .../datagenerators/FeederGenerator.scala        |  18 +-
 .../usergrid/scenarios/EntityScenarios.scala    |   8 +-
 .../org/apache/usergrid/settings/Settings.scala |   4 +-
 .../simulations/PutCustomEntitySimulation.scala |  75 ++++++
 stack/pom.xml                                   |  24 +-
 stack/rest/pom.xml                              |   2 +-
 .../org/apache/usergrid/rest/IndexResource.java |  19 ++
 stack/services/pom.xml                          |   7 +-
 .../services/notifications/wns/WNSAdapter.java  |  39 +++
 .../resources/usergrid-services-context.xml     |   8 +-
 .../usergrid/management/OrganizationIT.java     |   2 +-
 53 files changed, 1491 insertions(+), 411 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c45a3ed0/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------


Mime
View raw message