usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mru...@apache.org
Subject [15/20] usergrid git commit: Upgrade to ES 1.7.3 Java client and remove incorrect filter on async events.
Date Wed, 23 Mar 2016 17:34:43 GMT
Upgrade to ES 1.7.3 Java client and remove incorrect filter on async events.


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

Branch: refs/heads/release-2.1.1
Commit: 903fd1864465819ea055dab8d41e6d336f582491
Parents: aef26b9
Author: Michael Russo <mrusso@apigee.com>
Authored: Mon Mar 21 12:51:49 2016 -0700
Committer: Michael Russo <mrusso@apigee.com>
Committed: Mon Mar 21 12:51:49 2016 -0700

----------------------------------------------------------------------
 .../corepersistence/asyncevents/AsyncEventServiceImpl.java  | 9 ++++++++-
 stack/corepersistence/pom.xml                               | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/903fd186/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java
b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java
index 1b32b48..3b74daf 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java
@@ -741,6 +741,14 @@ public class AsyncEventServiceImpl implements AsyncEventService {
 
     /**
      * Submit results to index and return the queue messages to be ack'd
+     *
+     *
+     *
+     *
+       *
+     *
+     *
+     *
      * @param indexEventResults
      * @return
      */
@@ -756,7 +764,6 @@ public class AsyncEventServiceImpl implements AsyncEventService {
 
             // filter out messages that are not present, they were not processed and put
into the results
             .filter( result -> result.getQueueMessage().isPresent() )
-            .filter( result -> result.getIndexOperationMessage().isPresent() )
             .map(indexEventResult -> {
 
                 //record the cycle time

http://git-wip-us.apache.org/repos/asf/usergrid/blob/903fd186/stack/corepersistence/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml
index 0d8609b..f2bbbcd 100644
--- a/stack/corepersistence/pom.xml
+++ b/stack/corepersistence/pom.xml
@@ -80,7 +80,7 @@ limitations under the License.
         <commons.collections.version>3.2.1</commons.collections.version>
         <commons.io.version>2.4</commons.io.version>
         <commons.lang.version>3.1</commons.lang.version>
-        <elasticsearch.version>1.4.4</elasticsearch.version>
+        <elasticsearch.version>1.7.3</elasticsearch.version>
         <fasterxml-uuid.version>3.1.3</fasterxml-uuid.version>
         <guava.version>18.0</guava.version>
         <guice.version>4.0-beta5</guice.version>


Mime
View raw message