usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [50/50] incubator-usergrid git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-460
Date Wed, 18 Mar 2015 20:56:50 GMT
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
USERGRID-460

# By Todd Nine (24) and Shawn Feldman (16)
# Via Shawn Feldman (7) and others
* 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (40 commits)
  Added more descriptive error message
  Fixes incorrect logging statement
  Fixes issue with atomically moving indexes
  Fixes bug in writeunique verify failover command
  Moved task generation into single factory to clean up code
  Updated futures impl for different queues
  add comment
  add replay strategy
  add replay strategy
  add replay strategy
  Updated queuescope to be name with no need for application id.  We are only using them in
our subsystems, not applications.
  change consistency level
  Fixes issue with duplicate pool size definition
  Fixes worker issue in cloud formation
  Added the ability to specify the number of workers
  change metrics prefix
  Changes the batch future set.
  Changes nodes to 2 per shards with 1 replica.
  Fixed naming convention issue
  resolve futures via done method
  ...


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

Branch: refs/heads/USERGRID-460
Commit: 1087ee67ac6314c304f42398c357f40e245969a6
Parents: 4964ab6 eb0c689
Author: GERey <greyes@apigee.com>
Authored: Wed Mar 18 13:41:53 2015 -0700
Committer: GERey <greyes@apigee.com>
Committed: Wed Mar 18 13:41:53 2015 -0700

----------------------------------------------------------------------
 .../main/dist/init_instance/init_rest_server.sh |  20 +-
 .../dist/init_instance/install_elasticsearch.sh |  22 +-
 .../main/groovy/configure_elasticsearch.groovy  |  80 ++--
 .../src/main/groovy/configure_usergrid.groovy   |  12 +-
 stack/awscluster/ugcluster-cf.json              | 466 +++++++++++++------
 stack/core/pom.xml                              |  10 -
 .../batch/service/JobSchedulerService.java      |   5 -
 .../usergrid/corepersistence/CoreModule.java    |   8 +-
 .../corepersistence/CpEntityManager.java        |  15 +-
 .../corepersistence/CpEntityManagerFactory.java |   4 -
 .../corepersistence/CpRelationManager.java      |  14 -
 .../events/EntityDeletedHandler.java            |  58 ++-
 .../events/EntityVersionCreatedHandler.java     |  60 ++-
 .../events/EntityVersionDeletedHandler.java     |  54 ++-
 .../results/FilteringLoader.java                |   2 +-
 .../persistence/EntityManagerFactory.java       |   2 -
 .../cassandra/EntityManagerFactoryImpl.java     |   3 -
 .../cassandra/EntityManagerImpl.java            |  22 +-
 .../cassandra/RelationManagerImpl.java          |  58 +--
 .../cassandra/index/ConnectedIndexScanner.java  |   2 -
 .../cassandra/index/IndexBucketScanner.java     |   2 -
 .../corepersistence/StaleIndexCleanupTest.java  |  38 +-
 .../PerformanceEntityRebuildIndexTest.java      |   2 +
 .../collection/EntityDeletedFactory.java        |  34 --
 .../collection/EntityVersionCleanupFactory.java |  35 --
 .../collection/EntityVersionCreatedFactory.java |  31 --
 .../collection/guice/CollectionModule.java      |  22 +-
 .../EntityCollectionManagerFactoryImpl.java     |  58 ++-
 .../impl/EntityCollectionManagerImpl.java       | 179 +++++--
 .../collection/impl/EntityDeletedTask.java      |  21 +-
 .../impl/EntityVersionCleanupTask.java          |  40 +-
 .../impl/EntityVersionTaskFactory.java          |  65 +++
 .../mvcc/stage/write/WriteUniqueVerify.java     | 140 +++---
 .../UniqueValueSerializationStrategy.java       |  21 +-
 .../UniqueValueSerializationStrategyImpl.java   |  19 +-
 .../collection/util/EntityUtils.java            |  28 +-
 .../impl/EntityVersionCleanupTaskTest.java      |  68 +--
 .../mvcc/stage/write/WriteUniqueVerifyTest.java |   6 +-
 .../core/astyanax/CassandraConfig.java          |   6 +
 .../core/astyanax/CassandraConfigImpl.java      |   8 +-
 .../persistence/core/astyanax/CassandraFig.java |   9 +-
 .../persistence/core/future/BetterFuture.java   |  43 +-
 .../core/metrics/MetricsFactory.java            |   9 +
 .../core/metrics/MetricsFactoryImpl.java        | 121 +++--
 .../core/astyanax/ColumnNameIteratorTest.java   |   7 +-
 .../MultiKeyColumnNameIteratorTest.java         |   7 +-
 .../astyanax/MultiRowColumnIteratorTest.java    |   7 +-
 stack/corepersistence/graph/pom.xml             |  28 +-
 .../graph/impl/GraphManagerImpl.java            | 288 ++++++++++--
 .../usergrid/persistence/map/MapManager.java    |  35 +-
 .../persistence/map/impl/MapManagerImpl.java    |   8 +
 .../persistence/map/impl/MapSerialization.java  |   9 +
 .../map/impl/MapSerializationImpl.java          |  93 ++++
 .../persistence/map/MapManagerTest.java         |  49 +-
 stack/corepersistence/queryindex/pom.xml        |  17 +-
 .../usergrid/persistence/index/EntityIndex.java |  26 +-
 .../persistence/index/IndexBufferConsumer.java  |  11 +
 .../persistence/index/IndexBufferProducer.java  |   1 -
 .../usergrid/persistence/index/IndexFig.java    |  73 ++-
 .../index/IndexOperationMessage.java            | 115 ++++-
 .../persistence/index/guice/IndexModule.java    |   7 +
 .../persistence/index/guice/QueueProvider.java  | 116 +++++
 .../persistence/index/impl/BatchRequest.java    |  41 ++
 .../persistence/index/impl/BufferQueue.java     |  68 +++
 .../index/impl/BufferQueueInMemoryImpl.java     | 108 +++++
 .../index/impl/BufferQueueSQSImpl.java          | 307 ++++++++++++
 .../persistence/index/impl/DeIndexRequest.java  | 115 +++++
 .../index/impl/EsEntityIndexBatchImpl.java      |  50 +-
 .../index/impl/EsEntityIndexImpl.java           | 252 +++-------
 .../index/impl/EsIndexBufferConsumerImpl.java   | 286 ++++++++----
 .../index/impl/EsIndexBufferProducerImpl.java   |  16 +-
 .../persistence/index/impl/EsIndexCache.java    | 138 +++---
 .../persistence/index/impl/IndexRequest.java    | 125 +++++
 .../index/guice/TestIndexModule.java            |   5 +-
 .../index/impl/BufferQueueSQSImplTest.java      | 169 +++++++
 .../impl/EntityConnectionIndexImplTest.java     |   5 +-
 .../persistence/index/impl/EntityIndexTest.java |  62 ++-
 .../persistence/index/impl/EsTestUtils.java     |  48 --
 .../persistence/queue/QueueManager.java         |   4 +-
 .../usergrid/persistence/queue/QueueScope.java  |   2 +-
 .../persistence/queue/QueueScopeFactory.java    |  34 --
 .../persistence/queue/guice/QueueModule.java    |  17 +-
 .../queue/impl/QueueScopeFactoryImpl.java       |  48 --
 .../persistence/queue/impl/QueueScopeImpl.java  |  27 +-
 .../queue/impl/SQSQueueManagerImpl.java         | 214 +++++----
 .../persistence/queue/NoAWSCredsRule.java       |  98 ++++
 .../persistence/queue/QueueManagerTest.java     |  29 +-
 stack/pom.xml                                   |  43 --
 stack/rest/pom.xml                              |   4 -
 .../org/apache/usergrid/rest/RootResource.java  |   6 -
 stack/services/pom.xml                          |  13 +-
 .../cassandra/ManagementServiceImpl.java        |   9 +-
 .../notifications/NotificationsService.java     |  50 +-
 .../services/notifications/QueueListener.java   |   5 +-
 .../usergrid/services/queues/QueueListener.java |   5 +-
 .../notifications/NotifiersServiceIT.java       |   6 +
 stack/test-utils/pom.xml                        |   5 -
 97 files changed, 3634 insertions(+), 1599 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1087ee67/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
index ed1f03a,1838eec..5a3c8ce
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
@@@ -401,24 -393,15 +397,24 @@@ public class EsEntityIndexImpl implemen
      }
  
  
 +    /**
 +     * Needs REfactor to make clearer what queries and how the information gets used so
we don't need to retraverse
 +     * the query every time we generate some information about it.
 +     * @param indexScope
 +     * @param searchTypes
 +     * @param query
 +     * @return
 +     */
      @Override
-     public CandidateResults search( final IndexScope indexScope, final SearchTypes searchTypes,
+     public CandidateResults search(final IndexScope indexScope, final SearchTypes searchTypes,
              final Query query ) {
  
-         final String context = IndexingUtils.createContextName(indexScope);
+         final String context = IndexingUtils.createContextName( indexScope );
          final String[] entityTypes = searchTypes.getTypeNames();
  
 -        QueryBuilder qb = query.createQueryBuilder(context);
 +        final QueryVisitor queryVisitor = query.getQueryVisitor();
  
 +        QueryBuilder qb = query.createQueryBuilder( context );
  
          SearchResponse searchResponse;
  


Mime
View raw message