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 21B5617553 for ; Tue, 3 Mar 2015 00:21:53 +0000 (UTC) Received: (qmail 4405 invoked by uid 500); 3 Mar 2015 00:21:50 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 4319 invoked by uid 500); 3 Mar 2015 00:21:50 -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 4186 invoked by uid 99); 3 Mar 2015 00:21:49 -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; Tue, 03 Mar 2015 00:21:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C3AB6E0FE5; Tue, 3 Mar 2015 00:21:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: grey@apache.org To: commits@usergrid.apache.org Date: Tue, 03 Mar 2015 00:21:55 -0000 Message-Id: <209022500a7140058abe7dd5c6768978@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/27] incubator-usergrid git commit: Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273-indexbuffer Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273-indexbuffer Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5c3a3c56 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5c3a3c56 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5c3a3c56 Branch: refs/heads/USERGRID-280 Commit: 5c3a3c564d2920712edfba0a91b64eb0479c50fd Parents: 6075635 f004f5a Author: Shawn Feldman Authored: Mon Feb 23 08:34:16 2015 -0500 Committer: Shawn Feldman Committed: Mon Feb 23 08:34:16 2015 -0500 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 52 +++-- .../corepersistence/CpEntityManagerFactory.java | 130 ++++++++++--- .../usergrid/corepersistence/CpWalker.java | 98 ++++++---- .../corepersistence/util/CpNamingUtils.java | 3 + .../usergrid/persistence/EntityManager.java | 3 + .../persistence/EntityManagerFactory.java | 14 +- .../cassandra/EntityManagerFactoryImpl.java | 28 ++- .../cassandra/EntityManagerImpl.java | 7 + .../PerformanceEntityRebuildIndexTest.java | 191 +++++++++++++++++-- .../cassandra/EntityManagerFactoryImplIT.java | 66 ++++++- .../impl/EntityCollectionManagerImpl.java | 7 +- stack/pom.xml | 6 +- stack/rest/pom.xml | 43 ++--- .../org/apache/usergrid/rest/IndexResource.java | 95 +++++++-- .../org/apache/usergrid/rest/RootResource.java | 25 ++- .../rest/applications/ApplicationResource.java | 72 ++++--- .../applications/ApplicationsResource.java | 28 +-- .../apache/usergrid/rest/IndexResourceIT.java | 2 +- .../management/importer/ImportCollectionIT.java | 16 +- 19 files changed, 678 insertions(+), 208 deletions(-) ----------------------------------------------------------------------