usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [31/50] [abbrv] incubator-usergrid git commit: merge from 416
Date Thu, 19 Mar 2015 23:26:48 GMT
merge from 416


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

Branch: refs/heads/USERGRID-480
Commit: b6351134e6d9eb0e1def02fe319aeb3b81db29ad
Parents: 0c3b439 673c057
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Mon Mar 9 09:25:03 2015 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Mon Mar 9 09:25:03 2015 -0600

----------------------------------------------------------------------
 .../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 +
 .../corepersistence/CpEntityManager.java        | 109 +++++++++-
 .../corepersistence/CpEntityManagerFactory.java | 151 ++++++--------
 .../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 +
 .../impl/migration/GraphMigrationPlugin.java    |   1 -
 .../persistence/index/IndexBufferProducer.java  |  10 +-
 .../usergrid/persistence/index/IndexFig.java    |  12 +-
 .../index/impl/EsEntityIndexBatchImpl.java      |  15 +-
 .../index/impl/EsEntityIndexFactoryImpl.java    |   9 +-
 .../index/impl/EsEntityIndexImpl.java           | 199 +++++++++++++++----
 .../index/impl/EsIndexBufferConsumerImpl.java   |  39 +++-
 .../index/impl/EsIndexBufferProducerImpl.java   |  30 ++-
 .../persistence/index/impl/IndexingUtils.java   |   7 +-
 .../persistence/index/impl/EntityIndexTest.java |   2 +-
 .../datagenerators/EntityDataGenerator.scala    |  25 +++
 .../datagenerators/FeederGenerator.scala        |  18 +-
 .../usergrid/scenarios/EntityScenarios.scala    |   8 +-
 .../org/apache/usergrid/settings/Settings.scala |   4 +-
 .../simulations/PutCustomEntitySimulation.scala |  75 +++++++
 .../org/apache/usergrid/rest/IndexResource.java |  19 ++
 .../services/notifications/wns/WNSAdapter.java  |  39 ++++
 .../resources/usergrid-services-context.xml     |   8 +-
 35 files changed, 947 insertions(+), 216 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b6351134/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b6351134/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
index 3b39bc9,12504ed..a897ad2
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@@ -41,9 -46,8 +49,10 @@@ import org.apache.usergrid.persistence.
  import org.apache.usergrid.persistence.collection.CollectionScope;
  import org.apache.usergrid.persistence.collection.EntityCollectionManager;
  import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
+ import org.apache.usergrid.persistence.core.metrics.MetricsFactory;
 +import org.apache.usergrid.persistence.collection.serialization.impl.migration.EntityIdScope;
  import org.apache.usergrid.persistence.core.migration.data.DataMigrationManager;
 +import org.apache.usergrid.persistence.core.migration.data.MigrationDataProvider;
  import org.apache.usergrid.persistence.core.scope.ApplicationScope;
  import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
  import org.apache.usergrid.persistence.core.util.Health;
@@@ -106,9 -97,10 +111,12 @@@ public class CpEntityManagerFactory imp
              }
          });
  
+     private final OrgApplicationCache orgApplicationCache;
+ 
+ 
      private ManagerCache managerCache;
 +
 +
      private DataMigrationManager dataMigrationManager;
  
      private CassandraService cassandraService;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b6351134/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/migration/GraphMigrationPlugin.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/migration/GraphMigrationPlugin.java
index 22f34ff,0000000..ed51c27
mode 100644,000000..100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/migration/GraphMigrationPlugin.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/migration/GraphMigrationPlugin.java
@@@ -1,70 -1,0 +1,69 @@@
 +/*
 + *
 + *  *
 + *  * 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.persistence.graph.serialization.impl.migration;
 +
 +
 +import java.util.Set;
 +
 +import org.apache.usergrid.persistence.core.migration.data.MigrationInfoSerialization;
 +import org.apache.usergrid.persistence.core.migration.data.AbstractMigrationPlugin;
 +import org.apache.usergrid.persistence.core.migration.data.DataMigration;
 +import org.apache.usergrid.persistence.core.migration.data.MigrationDataProvider;
 +import org.apache.usergrid.persistence.core.migration.data.PluginPhase;
 +
 +import com.google.inject.Inject;
 +import com.google.inject.Singleton;
 +
- import sun.plugin2.main.server.Plugin;
 +
 +
 +/**
 + * Migration plugin for the collection module
 + */
 +@Singleton
 +public class GraphMigrationPlugin extends AbstractMigrationPlugin<GraphNode> {
 +
 +    public static final String PLUGIN_NAME = "graph-data";
 +
 +
 +
 +    @Inject
 +    public GraphMigrationPlugin(@GraphMigration
 +                                    final Set<DataMigration<GraphNode>> entityDataMigrations,
 +                                      final MigrationDataProvider<GraphNode> entityIdScopeDataMigrationProvider,
 +                                      final MigrationInfoSerialization migrationInfoSerialization
) {
 +        super( entityDataMigrations, entityIdScopeDataMigrationProvider, migrationInfoSerialization
);
 +    }
 +
 +
 +    @Override
 +    public String getName() {
 +        return PLUGIN_NAME;
 +    }
 +
 +
 +    @Override
 +    public PluginPhase getPhase() {
 +        return PluginPhase.MIGRATE;
 +    }
 +}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b6351134/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 b1794f8,c9f5590..caa2fc7
--- 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
@@@ -44,11 -48,9 +48,12 @@@ import org.elasticsearch.action.admin.c
  import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
  import org.elasticsearch.action.admin.cluster.tasks.PendingClusterTasksRequest;
  import org.elasticsearch.action.admin.cluster.tasks.PendingClusterTasksResponse;
 +import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;
 +import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
 +import org.elasticsearch.action.admin.indices.alias.get.GetAliasesResponse;
  import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
  import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
+ import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
  import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateResponse;
  import org.elasticsearch.action.deletebyquery.DeleteByQueryResponse;
  import org.elasticsearch.action.deletebyquery.IndexDeleteByQueryResponse;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b6351134/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java
----------------------------------------------------------------------


Mime
View raw message