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 C92951725C for ; Thu, 2 Oct 2014 05:44:12 +0000 (UTC) Received: (qmail 81778 invoked by uid 500); 2 Oct 2014 05:44:12 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 81722 invoked by uid 500); 2 Oct 2014 05:44:12 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 81537 invoked by uid 99); 2 Oct 2014 05:44:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Oct 2014 05:44:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2FEBFA0B70A; Thu, 2 Oct 2014 05:44:12 +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: Thu, 02 Oct 2014 05:44:21 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/13] git commit: Merge branch 'two-dot-o-rebuildable-index' into two-dot-o Merge branch 'two-dot-o-rebuildable-index' into two-dot-o Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b2b8886e Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b2b8886e Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b2b8886e Branch: refs/heads/esbatching Commit: b2b8886ef3351a24c2ef5d7785c2d3fd09265353 Parents: 1e7da5c 9a670e3 Author: Dave Johnson Authored: Wed Oct 1 23:28:19 2014 -0400 Committer: Dave Johnson Committed: Wed Oct 1 23:28:19 2014 -0400 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 519 +++++++++++++++---- .../corepersistence/CpEntityManagerFactory.java | 495 ++++++++---------- .../corepersistence/CpRelationManager.java | 356 +++++-------- .../usergrid/corepersistence/CpSetup.java | 55 +- .../HybridEntityManagerFactory.java | 18 +- .../persistence/EntityManagerFactory.java | 12 +- .../persistence/cassandra/CassandraService.java | 5 - .../cassandra/EntityManagerFactoryImpl.java | 54 +- .../PerformanceEntityRebuildIndexTest.java | 278 ++++++++++ .../cassandra/EntityManagerFactoryImplIT.java | 10 +- stack/core/src/test/resources/log4j.properties | 13 +- .../usergrid/persistence/index/IndexFig.java | 7 + .../index/impl/EsEntityIndexImpl.java | 18 + .../persistence/index/impl/EsProvider.java | 15 + .../org/apache/usergrid/tools/IndexRebuild.java | 63 ++- stack/tools/src/main/resources/log4j.properties | 18 +- 16 files changed, 1206 insertions(+), 730 deletions(-) ----------------------------------------------------------------------