Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 36E36183F1 for ; Fri, 30 Oct 2015 23:32:37 +0000 (UTC) Received: (qmail 20701 invoked by uid 500); 30 Oct 2015 23:32:37 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 20652 invoked by uid 500); 30 Oct 2015 23:32:37 -0000 Mailing-List: contact commits-help@usergrid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.apache.org Delivered-To: mailing list commits@usergrid.apache.org Received: (qmail 19492 invoked by uid 99); 30 Oct 2015 23:32:36 -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; Fri, 30 Oct 2015 23:32:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 86846E07E9; Fri, 30 Oct 2015 23:32:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: toddnine@apache.org To: commits@usergrid.apache.org Date: Fri, 30 Oct 2015 23:33:16 -0000 Message-Id: <056885265d23449291d683cbb93a837a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [42/50] [abbrv] usergrid git commit: Merge branch '2.1-release' into multitenant-migration Merge branch '2.1-release' into multitenant-migration Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/b816a188 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/b816a188 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/b816a188 Branch: refs/heads/master Commit: b816a188bade82ec1044e4dfb80220da67182b3c Parents: 8af152e c652171 Author: Dave Johnson Authored: Thu Oct 29 20:24:14 2015 -0400 Committer: Dave Johnson Committed: Thu Oct 29 20:24:14 2015 -0400 ---------------------------------------------------------------------- .../corepersistence/index/IndexServiceImpl.java | 2 +- .../persistence/index/CandidateResult.java | 11 +- .../persistence/index/EntityIndexBatch.java | 2 +- .../usergrid/persistence/index/IndexFig.java | 6 + .../index/impl/DeIndexOperation.java | 5 + .../index/impl/EsEntityIndexBatchImpl.java | 34 ++++- .../index/impl/EsEntityIndexImpl.java | 149 +++++++++++-------- .../persistence/index/impl/IndexingUtils.java | 2 +- .../persistence/index/impl/EntityIndexTest.java | 14 +- 9 files changed, 143 insertions(+), 82 deletions(-) ----------------------------------------------------------------------