You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/05/04 02:03:12 UTC

[5/5] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into feature/GEODE-1255

Merge remote-tracking branch 'origin/develop' into feature/GEODE-1255


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9aba6bf7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9aba6bf7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9aba6bf7

Branch: refs/heads/feature/GEODE-1255
Commit: 9aba6bf74e812b01bb2d1d28d91ea644da4ada8d
Parents: 3cd475d 8dc2d30
Author: Kirk Lund <kl...@apache.org>
Authored: Tue May 3 17:02:31 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue May 3 17:02:31 2016 -0700

----------------------------------------------------------------------
 .../internal/InternalDistributedSystem.java     |  21 +-
 .../internal/distributed/CollectorManager.java  |   3 +-
 .../internal/distributed/LuceneFunction.java    |  31 +-
 .../distributed/TopEntriesCollectorManager.java |   2 +-
 .../TopEntriesFunctionCollector.java            |   9 +-
 .../gemfire/cache/lucene/LuceneQueriesBase.java | 148 +++++++
 .../lucene/LuceneQueriesIntegrationTest.java    |  88 ++++
 .../cache/lucene/LuceneQueriesPRBase.java       |  75 ++++
 .../lucene/LuceneQueriesPeerPRDUnitTest.java    |  36 ++
 .../LuceneQueriesPeerPROverflowDUnitTest.java   |  41 ++
 .../distributed/LuceneFunctionJUnitTest.java    | 406 ++++++-------------
 .../LuceneFunctionReadPathDUnitTest.java        | 237 -----------
 .../TopEntriesFunctionCollectorJUnitTest.java   |   4 +-
 ...neIndexXmlGeneratorIntegrationJUnitTest.java |  10 +-
 14 files changed, 551 insertions(+), 560 deletions(-)
----------------------------------------------------------------------