You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/11/16 19:53:27 UTC
[1/5] usergrid git commit: Removed unused file and unused variable
Repository: usergrid
Updated Branches:
refs/heads/ignores f2cbf1a98 -> 13853662e
Removed unused file and unused variable
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/91a49115
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/91a49115
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/91a49115
Branch: refs/heads/ignores
Commit: 91a49115501e09fbf84d7d529281c0097e980d52
Parents: c3c2818
Author: Todd Nine <tn...@apigee.com>
Authored: Fri Nov 13 14:10:54 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Fri Nov 13 14:10:54 2015 -0700
----------------------------------------------------------------------
.../pipeline/PipelineModule.java | 2 +-
.../pipeline/PipelineOperations.java | 30 --------------------
.../read/search/SearchCollectionFilter.java | 2 --
3 files changed, 1 insertion(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/91a49115/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/PipelineModule.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/PipelineModule.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/PipelineModule.java
index 93df066..66265be 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/PipelineModule.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/PipelineModule.java
@@ -37,7 +37,7 @@ public class PipelineModule extends AbstractModule {
//Use Guice to create the builder since we don't really need to do anything
//other than DI when creating the filters
- install( new FactoryModuleBuilder().build( FilterFactory.class ) );
+ install( new FactoryModuleBuilder().build( FilterFactory.class ) );
install( new FactoryModuleBuilder().build( PipelineBuilderFactory.class ) );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/91a49115/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/PipelineOperations.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/PipelineOperations.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/PipelineOperations.java
deleted file mode 100644
index 3929a97..0000000
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/PipelineOperations.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.corepersistence.pipeline;
-
-
-public interface PipelineOperations {
-
- /**
- * Add the pipeline operation to the set of operations
- * @param po
- */
- void add( PipelineOperation po );
-}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/91a49115/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/SearchCollectionFilter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/SearchCollectionFilter.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/SearchCollectionFilter.java
index f95cb88..4fc6179 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/SearchCollectionFilter.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/search/SearchCollectionFilter.java
@@ -35,7 +35,6 @@ import static org.apache.usergrid.corepersistence.util.CpNamingUtils.createColle
public class SearchCollectionFilter extends AbstractElasticSearchFilter {
- private final IndexLocationStrategyFactory indexLocationStrategyFactory;
private final String collectionName;
private final String entityType;
@@ -55,7 +54,6 @@ public class SearchCollectionFilter extends AbstractElasticSearchFilter {
@Assisted( "collectionName" ) final String collectionName,
@Assisted( "entityType" ) final String entityType ) {
super( entityIndexFactory, metricsFactory, indexLocationStrategyFactory, query );
- this.indexLocationStrategyFactory = indexLocationStrategyFactory;
this.collectionName = collectionName;
this.entityType = entityType;
}
[3/5] usergrid git commit: Cleanup some name changes on the response
import tasks scheduler.
Posted by sn...@apache.org.
Cleanup some name changes on the response import tasks scheduler.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8ed1bc78
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8ed1bc78
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8ed1bc78
Branch: refs/heads/ignores
Commit: 8ed1bc784e386eac14670fbe71d0e4516625559d
Parents: d4d3ed3
Author: Michael Russo <mi...@gmail.com>
Authored: Sun Nov 15 08:11:42 2015 -0800
Committer: Michael Russo <mi...@gmail.com>
Committed: Sun Nov 15 08:11:42 2015 -0800
----------------------------------------------------------------------
.../usergrid/corepersistence/CoreModule.java | 2 +-
.../asyncevents/AsyncEventsSchedulerFig.java | 18 ------------------
2 files changed, 1 insertion(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/8ed1bc78/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
index 5d2d8dc..8e17701 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
@@ -240,7 +240,7 @@ public class CoreModule extends AbstractModule {
@Inject
@ResponseImportTasks
@Singleton
- public RxTaskScheduler getImportRepairScheduler( final ServiceSchedulerFig serviceSchedulerFig ) {
+ public RxTaskScheduler getResponseImportScheduler(final ServiceSchedulerFig serviceSchedulerFig ) {
final String poolName = serviceSchedulerFig.getRepairPoolName();
final int threadCount = serviceSchedulerFig.getImportThreadPoolSize();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/8ed1bc78/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventsSchedulerFig.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventsSchedulerFig.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventsSchedulerFig.java
index 83eb02e..2ed3a04 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventsSchedulerFig.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventsSchedulerFig.java
@@ -55,17 +55,6 @@ public interface AsyncEventsSchedulerFig extends GuicyFig {
String REPAIR_SCHEDULER_NAME = "repair.io.poolName";
- /**
- * Amount of threads to use in async processing
- */
- String IMPORT_SCHEDULER_THREADS = "import.io.threads";
-
-
- /**
- * Name of pool to use when performing scheduling
- */
- String IMPORT_SCHEDULER_NAME = "import.io.poolName";
-
@Default( "100" )
@Key( IO_SCHEDULER_THREADS )
@@ -84,11 +73,4 @@ public interface AsyncEventsSchedulerFig extends GuicyFig {
@Key( REPAIR_SCHEDULER_NAME )
String getRepairPoolName();
- @Default( "100" )
- @Key( IMPORT_SCHEDULER_THREADS )
- int getMaxImportThreads();
-
- @Default( "Usergrid-Import-Pool" )
- @Key( IMPORT_SCHEDULER_NAME )
- String getImportSchedulerName();
}
[2/5] usergrid git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/usergrid
Posted by sn...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/044b1496
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/044b1496
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/044b1496
Branch: refs/heads/ignores
Commit: 044b14963bd00ba02c63447b9658978b98bba1f6
Parents: 91a4911 27de65c
Author: Todd Nine <tn...@apigee.com>
Authored: Fri Nov 13 14:11:25 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Fri Nov 13 14:11:25 2015 -0700
----------------------------------------------------------------------
docs/data-queries/operators-and-types.md | 25 ++++++++++++++++++++-----
docs/push.tgz | Bin 1651449 -> 0 bytes
2 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[4/5] usergrid git commit: Merge branch '2.1-release' of
https://git-wip-us.apache.org/repos/asf/usergrid
Posted by sn...@apache.org.
Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/fdcae67f
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/fdcae67f
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/fdcae67f
Branch: refs/heads/ignores
Commit: fdcae67fa7af349fbbb8266925c66b0a9a802083
Parents: 044b149 8ed1bc7
Author: Michael Russo <mi...@gmail.com>
Authored: Sun Nov 15 08:12:35 2015 -0800
Committer: Michael Russo <mi...@gmail.com>
Committed: Sun Nov 15 08:12:35 2015 -0800
----------------------------------------------------------------------
.../usergrid/corepersistence/CoreModule.java | 2 +-
.../asyncevents/AsyncEventsSchedulerFig.java | 18 ------------------
2 files changed, 1 insertion(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdcae67f/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
----------------------------------------------------------------------
[5/5] usergrid git commit: Merge branch 'master' into ignores
Posted by sn...@apache.org.
Merge branch 'master' into ignores
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/13853662
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/13853662
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/13853662
Branch: refs/heads/ignores
Commit: 13853662ee07ab4ec5b812fd3d5fe42ef8b99d9a
Parents: f2cbf1a fdcae67
Author: Dave Johnson <sn...@apache.org>
Authored: Mon Nov 16 13:53:02 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Mon Nov 16 13:53:02 2015 -0500
----------------------------------------------------------------------
.../usergrid/corepersistence/CoreModule.java | 2 +-
.../asyncevents/AsyncEventsSchedulerFig.java | 18 ------------
.../pipeline/PipelineModule.java | 2 +-
.../pipeline/PipelineOperations.java | 30 --------------------
.../read/search/SearchCollectionFilter.java | 2 --
5 files changed, 2 insertions(+), 52 deletions(-)
----------------------------------------------------------------------