Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 35919200D2B for ; Thu, 28 Sep 2017 00:10:46 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 33F5D160BCB; Wed, 27 Sep 2017 22:10:46 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5D8111609EB for ; Thu, 28 Sep 2017 00:10:45 +0200 (CEST) Received: (qmail 67482 invoked by uid 500); 27 Sep 2017 22:10:44 -0000 Mailing-List: contact commits-help@predictionio.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@predictionio.incubator.apache.org Delivered-To: mailing list commits@predictionio.incubator.apache.org Received: (qmail 67472 invoked by uid 99); 27 Sep 2017 22:10:44 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Sep 2017 22:10:44 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 1E49E1A022C for ; Wed, 27 Sep 2017 22:10:44 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id kJzsV8RemTwB for ; Wed, 27 Sep 2017 22:10:43 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 83A3261068 for ; Wed, 27 Sep 2017 22:10:41 +0000 (UTC) Received: (qmail 65981 invoked by uid 99); 27 Sep 2017 22:10:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Sep 2017 22:10:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 78314F5BE6; Wed, 27 Sep 2017 22:10:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chanlee@apache.org To: commits@predictionio.incubator.apache.org Date: Wed, 27 Sep 2017 22:10:54 -0000 Message-Id: In-Reply-To: <8f1a420b89dd4398beec5b0a04389340@git.apache.org> References: <8f1a420b89dd4398beec5b0a04389340@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [19/50] [abbrv] incubator-predictionio git commit: [PIO-102] Fix ES5 scroll order archived-at: Wed, 27 Sep 2017 22:10:46 -0000 [PIO-102] Fix ES5 scroll order Closes #406 Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/5813b80d Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/5813b80d Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/5813b80d Branch: refs/heads/master Commit: 5813b80dc79c7a727bbcc73329135c385b71900d Parents: a813021 Author: Mars Hall Authored: Fri Jul 28 11:52:16 2017 -0700 Committer: Donald Szeto Committed: Fri Jul 28 11:52:16 2017 -0700 ---------------------------------------------------------------------- .../apache/predictionio/data/storage/elasticsearch/ESUtils.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/5813b80d/storage/elasticsearch/src/main/scala/org/apache/predictionio/data/storage/elasticsearch/ESUtils.scala ---------------------------------------------------------------------- diff --git a/storage/elasticsearch/src/main/scala/org/apache/predictionio/data/storage/elasticsearch/ESUtils.scala b/storage/elasticsearch/src/main/scala/org/apache/predictionio/data/storage/elasticsearch/ESUtils.scala index 2bf18ef..3f7b058 100644 --- a/storage/elasticsearch/src/main/scala/org/apache/predictionio/data/storage/elasticsearch/ESUtils.scala +++ b/storage/elasticsearch/src/main/scala/org/apache/predictionio/data/storage/elasticsearch/ESUtils.scala @@ -150,7 +150,7 @@ object ESUtils { val responseJValue = parse(EntityUtils.toString(response.getEntity)) scroll((responseJValue \ "_scroll_id").extract[String], (responseJValue \ "hits" \ "hits").extract[Seq[JValue]], - hits.map(h => (h \ "_source").extract[JValue]) ++ results) + results ++ hits.map(h => (h \ "_source").extract[JValue])) } }