You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by as...@apache.org on 2015/11/11 22:23:33 UTC
[01/50] [abbrv] incubator-geode git commit: Making the analyzer
configurable for PartitionedRepositoryManager
Repository: incubator-geode
Updated Branches:
refs/heads/develop 79aa0be5f -> 05e047caf
Making the analyzer configurable for PartitionedRepositoryManager
This class should accept an analyzer to be used to create the index
writer.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/18e8f416
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/18e8f416
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/18e8f416
Branch: refs/heads/develop
Commit: 18e8f416547ff82ae7a1d7997be3996372a44ddd
Parents: 6bb17b5
Author: Dan Smith <up...@apache.org>
Authored: Tue Sep 22 11:08:02 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Tue Sep 22 11:08:02 2015 -0700
----------------------------------------------------------------------
.../cache/lucene/internal/PartitionedRepositoryManager.java | 8 ++++----
.../internal/PartitionedRepositoryManagerJUnitTest.java | 9 +++++----
2 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/18e8f416/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
index ba89a40..e301482 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
@@ -6,7 +6,6 @@ import java.util.Collection;
import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -46,8 +45,8 @@ public class PartitionedRepositoryManager implements RepositoryManager {
private final PartitionedRegion fileRegion;
private final PartitionedRegion chunkRegion;
-
private final LuceneSerializer serializer;
+ private final Analyzer analyzer;
/**
*
@@ -58,11 +57,13 @@ public class PartitionedRepositoryManager implements RepositoryManager {
*/
public PartitionedRepositoryManager(PartitionedRegion userRegion, PartitionedRegion fileRegion,
PartitionedRegion chunkRegion,
- LuceneSerializer serializer) {
+ LuceneSerializer serializer,
+ Analyzer analyzer) {
this.userRegion = userRegion;
this.fileRegion = fileRegion;
this.chunkRegion = chunkRegion;
this.serializer = serializer;
+ this.analyzer = analyzer;
}
@Override
@@ -103,7 +104,6 @@ public class PartitionedRepositoryManager implements RepositoryManager {
IndexRepository repo = indexRepositories.get(userBucket);
if(repo == null) {
try {
- Analyzer analyzer = new StandardAnalyzer();
RegionDirectory dir = new RegionDirectory(getMatchingBucket(userBucket, fileRegion), getMatchingBucket(userBucket, chunkRegion));
IndexWriterConfig config = new IndexWriterConfig(analyzer);
IndexWriter writer = new IndexWriter(dir, config);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/18e8f416/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
index c7a2362..db1085a 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
@@ -12,6 +12,7 @@ import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.index.IndexWriter;
import org.junit.Before;
import org.junit.Test;
@@ -62,7 +63,7 @@ public class PartitionedRepositoryManagerJUnitTest {
@Test
public void getByKey() throws BucketNotFoundException, IOException {
- PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer);
+ PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer, new StandardAnalyzer());
BucketRegion mockBucket0 = getMockBucket(0);
BucketRegion mockBucket1 = getMockBucket(1);
@@ -86,14 +87,14 @@ public class PartitionedRepositoryManagerJUnitTest {
*/
@Test(expected = BucketNotFoundException.class)
public void getMissingBucketByKey() throws BucketNotFoundException {
- PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer);
+ PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer, new StandardAnalyzer());
repoManager.getRepository(userRegion, 0, null);
}
@Test
public void getByRegion() throws BucketNotFoundException {
- PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer);
+ PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer, new StandardAnalyzer());
BucketRegion mockBucket0 = getMockBucket(0);
BucketRegion mockBucket1 = getMockBucket(1);
@@ -120,7 +121,7 @@ public class PartitionedRepositoryManagerJUnitTest {
*/
@Test(expected = BucketNotFoundException.class)
public void getMissingBucketByRegion() throws BucketNotFoundException {
- PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer);
+ PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer, new StandardAnalyzer());
BucketRegion mockBucket0 = getMockBucket(0);
[18/50] [abbrv] incubator-geode git commit: GEODE-11: Remove
ResultType from LuceneResultStruct
Posted by as...@apache.org.
GEODE-11: Remove ResultType from LuceneResultStruct
This code could have been removed in commit db5db7a1: Removing ResultType from
LuceneQueryFactory.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a387c7c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a387c7c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a387c7c7
Branch: refs/heads/develop
Commit: a387c7c7e5168bff0c2d92162d30c4361b02c9f6
Parents: fe4b341
Author: Ashvin Agrawal <as...@apache.org>
Authored: Mon Sep 28 11:23:16 2015 -0700
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Mon Sep 28 14:32:50 2015 -0700
----------------------------------------------------------------------
.../com/gemstone/gemfire/cache/lucene/LuceneIndex.java | 6 ------
.../gemfire/cache/lucene/LuceneResultStruct.java | 13 -------------
.../cache/lucene/internal/LuceneResultStructImpl.java | 10 ----------
.../distributed/LuceneFunctionReadPathDUnitTest.java | 1 -
4 files changed, 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a387c7c7/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
index 328eed8..fc9752a 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
@@ -8,16 +8,10 @@
package com.gemstone.gemfire.cache.lucene;
-import java.util.Collection;
import java.util.Map;
-import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
-import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
-import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
-import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
-
/**
* An lucene index is built over the data stored in a GemFire Region.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a387c7c7/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java
index 75ac0a1..6ed0b99 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java
@@ -41,18 +41,5 @@ public interface LuceneResultStruct<K, V> {
* @throws IllegalArgumentException If this struct does not contain score
*/
public float getScore();
-
- /**
- * Get the types of values ordered list
- * Item in the list could be either ResultType, or field name
- * @return the array of result types
- */
- public Object[] getNames();
-
- /**
- * Get the values in same order as result types
- * @return the array of values
- */
- public Object[] getResultValues();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a387c7c7/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpl.java
index 6417675..35cf086 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpl.java
@@ -34,16 +34,6 @@ public class LuceneResultStructImpl<K,V> implements LuceneResultStruct<K,V> {
}
@Override
- public Object[] getNames() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Object[] getResultValues() {
- throw new UnsupportedOperationException();
- }
-
- @Override
public int hashCode() {
final int prime = 31;
int result = 1;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a387c7c7/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
index 27407d3..b37be14 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
@@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.lucene.LuceneService;
import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneIndex;
import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl;
-import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
[14/50] [abbrv] incubator-geode git commit: Implementing
LuceneQueryImpl.search
Posted by as...@apache.org.
Implementing LuceneQueryImpl.search
Implementing search by invoking the LuceneFunction from within
LuceneQueryImpl.search and building a result set. Adding unit tests for
the same.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3e743df8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3e743df8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3e743df8
Branch: refs/heads/develop
Commit: 3e743df86ce7487fd1cf094734ca8a5bbe7895cb
Parents: 8fb4ad7
Author: Dan Smith <up...@apache.org>
Authored: Wed Sep 23 15:28:19 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Wed Sep 23 15:53:09 2015 -0700
----------------------------------------------------------------------
.../gemfire/cache/lucene/LuceneQuery.java | 4 +-
.../cache/lucene/LuceneQueryFactory.java | 8 +-
.../lucene/internal/LuceneQueryFactoryImpl.java | 39 ++++-----
.../cache/lucene/internal/LuceneQueryImpl.java | 42 +++++++---
.../lucene/internal/LuceneServiceImpl.java | 2 +-
.../LuceneQueryFactoryImplJUnitTest.java | 32 ++++++++
.../internal/LuceneQueryImplJUnitTest.java | 84 ++++++++++++++++++++
.../LuceneFunctionReadPathDUnitTest.java | 34 +++-----
8 files changed, 177 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e743df8/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
index 548bb00..09d3a07 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
@@ -6,11 +6,11 @@ package com.gemstone.gemfire.cache.lucene;
* {@link LuceneQueryFactory#create}.
*
*/
-public interface LuceneQuery {
+public interface LuceneQuery<K, V> {
/**
* Execute the search and get results.
*/
- public LuceneQueryResults search();
+ public LuceneQueryResults<K, V> search();
/**
* Get page size setting of current query.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e743df8/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
index 55f1b3a..b5598ad 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
@@ -56,10 +56,12 @@ public interface LuceneQueryFactory {
* @param regionName region name
* @param indexName index name
* @param queryString query string in lucene QueryParser's syntax
+ * @param K the key type in the query results
+ * @param V the value type in the query results
* @return LuceneQuery object
* @throws ParseException
*/
- public LuceneQuery create(String indexName, String regionName, String queryString)
+ public <K, V> LuceneQuery<K, V> create(String indexName, String regionName, String queryString)
throws ParseException;
/**
@@ -70,7 +72,9 @@ public interface LuceneQueryFactory {
* @param indexName index name
* @param regionName region name
* @param provider constructs and provides a Lucene Query object
+ * @param K the key type in the query results
+ * @param V the value type in the query results
* @return LuceneQuery object
*/
- public LuceneQuery create(String indexName, String regionName, LuceneQueryProvider provider);
+ public <K, V> LuceneQuery<K, V> create(String indexName, String regionName, LuceneQueryProvider provider);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e743df8/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
index 9210929..2a602a5 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
@@ -3,13 +3,10 @@ package com.gemstone.gemfire.cache.lucene.internal;
import java.util.HashSet;
import java.util.Set;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryparser.classic.ParseException;
-import org.apache.lucene.queryparser.classic.QueryParser;
-import org.apache.lucene.search.Query;
-import com.gemstone.gemfire.cache.lucene.LuceneIndex;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.lucene.LuceneQuery;
import com.gemstone.gemfire.cache.lucene.LuceneQueryFactory;
import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider;
@@ -17,13 +14,13 @@ import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider;
public class LuceneQueryFactoryImpl implements LuceneQueryFactory {
private int limit = DEFAULT_LIMIT;
private int pageSize = DEFAULT_PAGESIZE;
- private Set<String> projectionFields = new HashSet<String>();
+ private String[] projectionFields = null;
+ private Cache cache;
+
+ LuceneQueryFactoryImpl(Cache cache) {
+ this.cache = cache;
+ }
- /* reference to the index. One index could have multiple Queries, but one Query must belong
- * to one index
- */
- private LuceneIndex relatedIndex;
-
@Override
public LuceneQueryFactory setPageSize(int pageSize) {
this.pageSize = pageSize;
@@ -37,28 +34,20 @@ public class LuceneQueryFactoryImpl implements LuceneQueryFactory {
}
@Override
- public LuceneQuery create(String indexName, String regionName,
- String queryString) throws ParseException {
+ public <K, V> LuceneQuery<K, V> create(String indexName, String regionName,
+ String queryString) {
return create(indexName, regionName, new StringQueryProvider(queryString));
}
- public LuceneQuery create(String indexName, String regionName, LuceneQueryProvider provider) {
- LuceneQueryImpl luceneQuery = new LuceneQueryImpl(indexName, regionName, provider, projectionFields, limit, pageSize);
+ public <K, V> LuceneQuery<K, V> create(String indexName, String regionName, LuceneQueryProvider provider) {
+ Region region = cache.getRegion(regionName);
+ LuceneQueryImpl<K, V> luceneQuery = new LuceneQueryImpl<K, V>(indexName, region, provider, projectionFields, limit, pageSize);
return luceneQuery;
}
-
- public LuceneIndex getRelatedIndex() {
- return this.relatedIndex;
- }
-
@Override
public LuceneQueryFactory setProjectionFields(String... fieldNames) {
- if (fieldNames != null) {
- for (String fieldName:fieldNames) {
- this.projectionFields.add(fieldName);
- }
- }
+ projectionFields = fieldNames.clone();
return this;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e743df8/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
index 714df95..a5cbc79 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
@@ -2,29 +2,34 @@ package com.gemstone.gemfire.cache.lucene.internal;
import java.util.Set;
-import org.apache.lucene.search.Query;
-
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.execute.FunctionService;
+import com.gemstone.gemfire.cache.execute.ResultCollector;
import com.gemstone.gemfire.cache.lucene.LuceneQuery;
import com.gemstone.gemfire.cache.lucene.LuceneQueryFactory;
import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider;
import com.gemstone.gemfire.cache.lucene.LuceneQueryResults;
+import com.gemstone.gemfire.cache.lucene.internal.distributed.LuceneFunction;
+import com.gemstone.gemfire.cache.lucene.internal.distributed.LuceneFunctionContext;
+import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntries;
+import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesCollector;
+import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesCollectorManager;
+import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesFunctionCollector;
-public class LuceneQueryImpl implements LuceneQuery {
+public class LuceneQueryImpl<K, V> implements LuceneQuery<K, V> {
private int limit = LuceneQueryFactory.DEFAULT_LIMIT;
private int pageSize = LuceneQueryFactory.DEFAULT_PAGESIZE;
private String indexName;
- private String regionName;
-
// The projected fields are local to a specific index per Query object.
- private Set<String> projectedFieldNames;
-
+ private String[] projectedFieldNames;
/* the lucene Query object to be wrapped here */
private LuceneQueryProvider query;
+ private Region<K, V> region;
- LuceneQueryImpl(String indexName, String regionName, LuceneQueryProvider provider, Set<String> projectionFields,
+ public LuceneQueryImpl(String indexName, Region<K, V> region, LuceneQueryProvider provider, String[] projectionFields,
int limit, int pageSize) {
this.indexName = indexName;
- this.regionName = regionName;
+ this.region = region;
this.limit = limit;
this.pageSize = pageSize;
this.projectedFieldNames = projectionFields;
@@ -32,9 +37,20 @@ public class LuceneQueryImpl implements LuceneQuery {
}
@Override
- public LuceneQueryResults search() {
- // TODO Auto-generated method stub
- return null;
+ public LuceneQueryResults<K, V> search() {
+ LuceneFunctionContext<TopEntriesCollector> context = new LuceneFunctionContext<>(query, indexName,
+ new TopEntriesCollectorManager());
+ TopEntriesFunctionCollector collector = new TopEntriesFunctionCollector();
+
+ ResultCollector<TopEntriesCollector, TopEntries> rc = (ResultCollector<TopEntriesCollector, TopEntries>) FunctionService.onRegion(region)
+ .withArgs(context)
+ .withCollector(collector)
+ .execute(LuceneFunction.ID);
+
+ //TODO provide a timeout to the user?
+ TopEntries entries = rc.getResult();
+
+ return new LuceneQueryResultsImpl<K, V>(entries.getHits(), region, pageSize);
}
@Override
@@ -49,7 +65,7 @@ public class LuceneQueryImpl implements LuceneQuery {
@Override
public String[] getProjectedFieldNames() {
- return (String[])this.projectedFieldNames.toArray();
+ return this.projectedFieldNames;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e743df8/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
index cb6e5fc..b1631d1 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
@@ -142,7 +142,7 @@ public class LuceneServiceImpl implements InternalLuceneService {
@Override
public LuceneQueryFactory createLuceneQueryFactory() {
- return new LuceneQueryFactoryImpl();
+ return new LuceneQueryFactoryImpl(cache);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e743df8/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
new file mode 100644
index 0000000..6cb5368
--- /dev/null
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
@@ -0,0 +1,32 @@
+package com.gemstone.gemfire.cache.lucene.internal;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.Mockito;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.lucene.LuceneQuery;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
+@Category(UnitTest.class)
+public class LuceneQueryFactoryImplJUnitTest {
+
+ @Test
+ public void test() {
+ Cache cache = Mockito.mock(Cache.class);
+ LuceneQueryFactoryImpl f = new LuceneQueryFactoryImpl(cache);
+ f.setPageSize(5);
+ f.setResultLimit(25);
+ String[] projection = new String[] {"a", "b"};
+ f.setProjectionFields(projection);
+ LuceneQuery<Object, Object> query = f.create("index", "region", new StringQueryProvider("test"));
+ assertEquals(25, query.getLimit());
+ assertEquals(5, query.getPageSize());
+ assertArrayEquals(projection, query.getProjectedFieldNames());
+
+ Mockito.verify(cache).getRegion(Mockito.eq("region"));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e743df8/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java
new file mode 100644
index 0000000..d3ffd19
--- /dev/null
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java
@@ -0,0 +1,84 @@
+package com.gemstone.gemfire.cache.lucene.internal;
+
+import static org.junit.Assert.*;
+
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.execute.FunctionAdapter;
+import com.gemstone.gemfire.cache.execute.FunctionContext;
+import com.gemstone.gemfire.cache.execute.FunctionService;
+import com.gemstone.gemfire.cache.lucene.LuceneQueryResults;
+import com.gemstone.gemfire.cache.lucene.internal.distributed.LuceneFunction;
+import com.gemstone.gemfire.cache.lucene.internal.distributed.LuceneFunctionContext;
+import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesCollector;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
+public class LuceneQueryImplJUnitTest {
+
+ private Cache cache;
+ private Region<Object, Object> region;
+ @Before
+ public void createCache() {
+ cache = new CacheFactory().set("mcast-port", "0").create();
+ region = cache.createRegionFactory(RegionShortcut.REPLICATE).create("region");
+ }
+
+ @After
+ public void removeCache() {
+ FunctionService.unregisterFunction(LuceneFunction.ID);
+ cache.close();
+ }
+ @Test
+ public void test() {
+ //Register a fake function to observe the function invocation
+ FunctionService.unregisterFunction(LuceneFunction.ID);
+ TestLuceneFunction function = new TestLuceneFunction();
+ FunctionService.registerFunction(function);
+
+
+ StringQueryProvider provider = new StringQueryProvider();
+ LuceneQueryImpl query = new LuceneQueryImpl("index", region, provider, null, 100, 20);
+ LuceneQueryResults results = query.search();
+ List nextPage = results.getNextPage();
+ assertEquals(3, nextPage.size());
+ assertEquals(.3f, results.getMaxScore(), 0.01);
+ assertTrue(function.wasInvoked);
+
+ LuceneFunctionContext args = (LuceneFunctionContext) function.args;
+ assertEquals(provider.getQueryString(), ((StringQueryProvider) args.getQueryProvider()).getQueryString());
+ assertEquals("index", args.getIndexName());
+ assertEquals(100, args.getLimit());
+ }
+
+ private static class TestLuceneFunction extends FunctionAdapter {
+
+ private boolean wasInvoked;
+ private Object args;
+
+ @Override
+ public void execute(FunctionContext context) {
+ this.args = context.getArguments();
+ wasInvoked = true;
+ TopEntriesCollector lastResult = new TopEntriesCollector();
+ lastResult.collect(3, .3f);
+ lastResult.collect(2, .2f);
+ lastResult.collect(1, .1f);
+ context.getResultSender().lastResult(lastResult);
+ }
+
+ @Override
+ public String getId() {
+ return LuceneFunction.ID;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e743df8/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
index 939790d..3448725 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
@@ -1,7 +1,6 @@
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import java.io.Serializable;
-import java.util.concurrent.TimeUnit;
import org.junit.Assert;
import org.junit.experimental.categories.Category;
@@ -10,14 +9,11 @@ import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.cache.execute.FunctionService;
-import com.gemstone.gemfire.cache.execute.ResultCollector;
-import com.gemstone.gemfire.cache.lucene.LuceneIndex;
-import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider;
+import com.gemstone.gemfire.cache.lucene.LuceneQuery;
+import com.gemstone.gemfire.cache.lucene.LuceneQueryResults;
import com.gemstone.gemfire.cache.lucene.LuceneService;
import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneIndex;
-import com.gemstone.gemfire.cache.lucene.internal.StringQueryProvider;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
@@ -25,7 +21,6 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import dunit.Host;
import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
import dunit.VM;
@Category(DistributedTest.class)
@@ -87,32 +82,21 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
server1.invoke(createPartitionRegion);
server2.invoke(createPartitionRegion);
- SerializableRunnable executeSearch = new SerializableRunnable("executeSearch") {
+ SerializableCallable executeSearch = new SerializableCallable("executeSearch") {
private static final long serialVersionUID = 1L;
- public void run() {
+ public Object call() throws Exception {
Cache cache = getCache();
assertNotNull(cache);
Region<Object, Object> region = cache.getRegion(REGION_NAME);
Assert.assertNotNull(region);
LuceneService service = LuceneServiceProvider.get(cache);
- LuceneIndex index = service.getIndex(INDEX_NAME, REGION_NAME);
- LuceneQueryProvider provider = new StringQueryProvider("text:world");
-
- LuceneFunctionContext<TopEntriesCollector> context = new LuceneFunctionContext<>(provider, index.getName(),
- new TopEntriesCollectorManager());
- TopEntriesFunctionCollector collector = new TopEntriesFunctionCollector();
-
- ResultCollector<TopEntriesCollector, TopEntries> rc = (ResultCollector<TopEntriesCollector, TopEntries>) FunctionService.onRegion(region).withArgs(context).withCollector(collector).execute(LuceneFunction.ID);
- TopEntries entries;
- try {
- entries = rc.getResult(30, TimeUnit.SECONDS);
- assertNotNull(entries);
- assertEquals(2, entries.getHits().size());
- } catch (Exception e) {
- fail("failed", e);
- }
+ LuceneQuery query = service.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "text:world");
+ LuceneQueryResults results = query.search();
+ assertEquals(2, results.size());
+
+ return null;
}
};
[16/50] [abbrv] incubator-geode git commit: Enhancing
ReadPathDUnitTest to include a rebalance
Posted by as...@apache.org.
Enhancing ReadPathDUnitTest to include a rebalance
Adding a rebalance to LuceneFunctionReadPathDUnit test to make sure the
query still works after a rebalance. Adding additional assertions about
the results of the query.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/87e46d82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/87e46d82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/87e46d82
Branch: refs/heads/develop
Commit: 87e46d8238a616fe8693862e3cc7e1e56c7f3959
Parents: 218f705
Author: Dan Smith <up...@apache.org>
Authored: Wed Sep 23 16:56:48 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Wed Sep 23 16:56:48 2015 -0700
----------------------------------------------------------------------
.../LuceneFunctionReadPathDUnitTest.java | 110 +++++++++++++++----
1 file changed, 90 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87e46d82/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
index 3448725..eac66e6 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
@@ -1,6 +1,11 @@
package com.gemstone.gemfire.cache.lucene.internal.distributed;
+import java.io.IOException;
import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CancellationException;
import org.junit.Assert;
import org.junit.experimental.categories.Category;
@@ -9,8 +14,11 @@ import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.control.RebalanceOperation;
+import com.gemstone.gemfire.cache.control.RebalanceResults;
import com.gemstone.gemfire.cache.lucene.LuceneQuery;
import com.gemstone.gemfire.cache.lucene.LuceneQueryResults;
+import com.gemstone.gemfire.cache.lucene.LuceneResultStruct;
import com.gemstone.gemfire.cache.lucene.LuceneService;
import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneIndex;
@@ -54,32 +62,31 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
assertNotNull(cache);
RegionFactory<Object, Object> regionFactory = cache.createRegionFactory(RegionShortcut.PARTITION);
Region<Object, Object> region = regionFactory.create(REGION_NAME);
-
-
LuceneService service = LuceneServiceProvider.get(cache);
InternalLuceneIndex index = (InternalLuceneIndex) service.createIndex(INDEX_NAME, REGION_NAME, "text");
+ return null;
+ }
+ };
+ server1.invoke(createPartitionRegion);
+
+
+ SerializableCallable createSomeData = new SerializableCallable("createRegion") {
+ private static final long serialVersionUID = 1L;
+
+ public Object call() throws Exception {
+ final Cache cache = getCache();
+ Region<Object, Object> region = cache.getRegion(REGION_NAME);
- region.put(1, new TestObject("hello world"));
- region.put(2, new TestObject("goodbye world"));
+ putInRegion(region, 1, new TestObject("hello world"));
+ putInRegion(region, 113, new TestObject("hi world"));
+ putInRegion(region, 2, new TestObject("goodbye world"));
- //TODO - the async event queue hasn't been hooked up, so we'll fake out
- //writing the entry to the repository.
- try {
- IndexRepository repository1 = index.getRepositoryManager().getRepository(region, 1, null);
- repository1.create(1, new TestObject("hello world"));
- repository1.commit();
- IndexRepository repository2 = index.getRepositoryManager().getRepository(region, 2, null);
- repository2.create(2, new TestObject("hello world"));
- repository2.commit();
- } catch(BucketNotFoundException e) {
- //thats ok, one of the data stores does not host these buckets.
- }
return null;
}
};
- server1.invoke(createPartitionRegion);
+ server1.invoke(createSomeData);
server2.invoke(createPartitionRegion);
SerializableCallable executeSearch = new SerializableCallable("executeSearch") {
@@ -92,23 +99,86 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
Assert.assertNotNull(region);
LuceneService service = LuceneServiceProvider.get(cache);
- LuceneQuery query = service.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "text:world");
- LuceneQueryResults results = query.search();
- assertEquals(2, results.size());
+ LuceneQuery<Integer, TestObject> query = service.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "text:world");
+ LuceneQueryResults<Integer, TestObject> results = query.search();
+ assertEquals(3, results.size());
+ List<LuceneResultStruct<Integer, TestObject>> page = results.getNextPage();
+
+ Map<Integer, TestObject> data = new HashMap<Integer, TestObject>();
+ for(LuceneResultStruct<Integer, TestObject> row : page) {
+ data.put(row.getKey(), row.getValue());
+ }
+
+ assertEquals(data, region);
return null;
}
};
+ //Make sure we can search from both members
+ server1.invoke(executeSearch);
+ server2.invoke(executeSearch);
+
+ //Do a rebalance
+ server1.invoke(new SerializableCallable() {
+ @Override
+ public Object call() throws CancellationException, InterruptedException {
+ RebalanceOperation op = getCache().getResourceManager().createRebalanceFactory().start();
+ RebalanceResults results = op.getResults();
+ assertTrue(1 < results.getTotalBucketTransfersCompleted());
+ return null;
+ }
+ });
+
+ //Make sure the search still works
server1.invoke(executeSearch);
+ server2.invoke(executeSearch);
}
+ private static void putInRegion(Region<Object, Object> region, Object key, Object value) throws BucketNotFoundException, IOException {
+ region.put(key, value);
+
+ //TODO - the async event queue hasn't been hooked up, so we'll fake out
+ //writing the entry to the repository.
+ LuceneService service = LuceneServiceProvider.get(region.getCache());
+ InternalLuceneIndex index = (InternalLuceneIndex) service.getIndex(INDEX_NAME, REGION_NAME);
+ IndexRepository repository1 = index.getRepositoryManager().getRepository(region, 1, null);
+ repository1.create(key, value);
+ repository1.commit();
+ }
+
private static class TestObject implements Serializable {
private String text;
public TestObject(String text) {
this.text = text;
}
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((text == null) ? 0 : text.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ TestObject other = (TestObject) obj;
+ if (text == null) {
+ if (other.text != null)
+ return false;
+ } else if (!text.equals(other.text))
+ return false;
+ return true;
+ }
+
}
[19/50] [abbrv] incubator-geode git commit: GEODE-11: Use backward
compatible PriorityQueue init
Posted by as...@apache.org.
GEODE-11: Use backward compatible PriorityQueue init
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8fa82ab5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8fa82ab5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8fa82ab5
Branch: refs/heads/develop
Commit: 8fa82ab50585fbed0324fd999b0db41ef87974b6
Parents: a387c7c
Author: Ashvin Agrawal <as...@apache.org>
Authored: Wed Sep 30 14:57:55 2015 -0700
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Wed Sep 30 14:57:55 2015 -0700
----------------------------------------------------------------------
.../internal/distributed/TopEntriesCollectorManager.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fa82ab5/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
index a5e891d..37631c6 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
@@ -50,6 +50,11 @@ public class TopEntriesCollectorManager implements CollectorManager<TopEntriesCo
@Override
public TopEntriesCollector reduce(Collection<TopEntriesCollector> collectors) throws IOException {
+ TopEntriesCollector mergedResult = new TopEntriesCollector(id, limit);
+ if (collectors.isEmpty()) {
+ return mergedResult;
+ }
+
final EntryScoreComparator scoreComparator = new TopEntries().new EntryScoreComparator();
// orders a entry with higher score above a doc with lower score
@@ -65,8 +70,7 @@ public class TopEntriesCollectorManager implements CollectorManager<TopEntriesCo
// The queue contains iterators for all bucket results. The queue puts the entry with the highest score at the head
// using score comparator.
PriorityQueue<List<EntryScore>> entryListsPriorityQueue;
- entryListsPriorityQueue = new PriorityQueue<List<EntryScore>>(Collections.reverseOrder(entryListComparator));
- TopEntriesCollector mergedResult = new TopEntriesCollector(id, limit);
+ entryListsPriorityQueue = new PriorityQueue<List<EntryScore>>(collectors.size(), Collections.reverseOrder(entryListComparator));
for (IndexResultCollector collector : collectors) {
logger.debug("Number of entries found in collector {} is {}", collector.getName(), collector.size());
[34/50] [abbrv] incubator-geode git commit: Adding a new CacheService
extension point to GemFireCache
Posted by as...@apache.org.
Adding a new CacheService extension point to GemFireCache
I had previously modified the existing Extension mechanism on this
branch to be able to fetch Extensions by key.
However, after digging more, I think those Extensions are mostly just
useful for Xml parsing since they have callbacks specific to
transitioning an object from a *Creation to a real object. In addition,
I was worried the changes I made would break existing extensions. So I
have rolled back those changes.
Instead of that, I've added the concept of a CacheService, which is
loaded by the ServiceLoader during cache initialization and has the same
lifecycle as the cache. Services can be retrieved using
GemfireCacheImpl.getService(SomeService.class).
I've used this new mechanism to install the LuceneService. This is
currently only an internal service, but we may want to make this public,
eg
Cache.getService(SomeService.class)
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/5d7535a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/5d7535a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/5d7535a7
Branch: refs/heads/develop
Commit: 5d7535a7c0eb4126d017a26362ae479ed3d050c0
Parents: 0f78330
Author: Dan Smith <up...@apache.org>
Authored: Thu Oct 15 15:38:59 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Fri Oct 16 12:46:55 2015 -0700
----------------------------------------------------------------------
.../gemfire/internal/cache/CacheService.java | 26 ++++++++++++
.../internal/cache/GemFireCacheImpl.java | 22 ++++++++++
.../gemfire/internal/cache/InternalCache.java | 2 +
.../cache/extension/ExtensionPoint.java | 12 +-----
.../cache/extension/SimpleExtensionPoint.java | 25 +++++-------
.../internal/cache/xmlcache/CacheCreation.java | 6 ++-
.../gemfire/cache30/CacheXml81DUnitTest.java | 6 +--
.../internal/cache/CacheServiceJUnitTest.java | 43 ++++++++++++++++++++
.../internal/cache/MockCacheService.java | 8 ++++
.../internal/cache/MockCacheServiceImpl.java | 23 +++++++++++
.../SimpleExtensionPointJUnitTest.java | 20 ++++-----
.../mock/DestroyMockCacheExtensionFunction.java | 9 +++-
.../extension/mock/MockCacheExtension.java | 2 +-
.../extension/mock/MockExtensionXmlParser.java | 4 +-
.../extension/mock/MockRegionExtension.java | 2 +-
...gemstone.gemfire.internal.cache.CacheService | 1 +
.../cache/lucene/LuceneServiceProvider.java | 15 ++-----
.../lucene/internal/InternalLuceneService.java | 3 +-
.../cache/lucene/internal/LuceneIndexImpl.java | 2 +-
.../lucene/internal/LuceneServiceImpl.java | 13 +++++-
.../internal/xml/LuceneIndexCreation.java | 2 +-
.../lucene/internal/xml/LuceneXmlParser.java | 2 +-
...gemstone.gemfire.internal.cache.CacheService | 1 +
.../internal/LuceneServiceImplJUnitTest.java | 2 +-
.../distributed/LuceneFunctionJUnitTest.java | 4 +-
25 files changed, 187 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheService.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheService.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheService.java
new file mode 100644
index 0000000..e26602d
--- /dev/null
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheService.java
@@ -0,0 +1,26 @@
+package com.gemstone.gemfire.internal.cache;
+
+import com.gemstone.gemfire.cache.Cache;
+
+/**
+ * Interface for a service that is linked to a cache.
+ *
+ * These services are loaded during cache initialization using the java
+ * ServiceLoader and can be retrieved from the cache by calling
+ * Cache.getService(YourInterface.class)
+ */
+public interface CacheService {
+ /**
+ * Initialize the service with a cache.
+ *
+ * Services are initialized in random order, fairly early on in cache
+ * initialization. In particular, the cache.xml has not yet been parsed.
+ */
+ public void init(Cache cache);
+
+ /**
+ * Return the class or interface used to look up
+ * this service.
+ */
+ public Class<? extends CacheService> getInterface();
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
index e73af49..2cce156 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
@@ -39,6 +39,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
+import java.util.ServiceLoader;
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.ArrayBlockingQueue;
@@ -592,6 +593,8 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
private final Set<RegionListener> regionListeners = new ConcurrentHashSet<RegionListener>();
+ private final Map<Class<? extends CacheService>, CacheService> services = new HashMap<Class<? extends CacheService>, CacheService>();
+
public static final int DEFAULT_CLIENT_FUNCTION_TIMEOUT = 0;
private static int clientFunctionTimeout;
@@ -1126,6 +1129,8 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
boolean completedCacheXml = false;
+ initializeServices();
+
try {
//Deploy all the jars from the deploy working dir.
new JarDeployer(this.system.getConfig().getDeployWorkingDir()).loadPreviouslyDeployedJars();
@@ -1160,6 +1165,18 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
return this;
}
+
+ /**
+ * Initialize any services that provided as extensions to the cache using the
+ * service loader mechanism.
+ */
+ private void initializeServices() {
+ ServiceLoader<CacheService> loader = ServiceLoader.load(CacheService.class);
+ for(CacheService service : loader) {
+ service.init(this);
+ this.services.put(service.getInterface(), service);
+ }
+ }
private boolean isNotJmxManager(){
return (this.system.getConfig().getJmxManagerStart() != true);
@@ -3740,6 +3757,11 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
public void removeRegionListener(RegionListener l ) {
this.regionListeners.remove(l);
}
+
+ @SuppressWarnings("unchecked")
+ public <T extends CacheService> T getService(Class<T> clazz) {
+ return (T) services.get(clazz);
+ }
/**
* Creates the single instance of the Transation Manager for this cache. Returns the existing one upon request.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCache.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCache.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCache.java
index cf1a4dc..403e1ce 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCache.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCache.java
@@ -37,4 +37,6 @@ public interface InternalCache extends Cache, Extensible<Cache> {
public CqService getCqService();
public Collection<HDFSStoreImpl> getHDFSStores() ;
+
+ public <T extends CacheService> T getService(Class<T> clazz);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/ExtensionPoint.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/ExtensionPoint.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/ExtensionPoint.java
index dedc50f..8022be5 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/ExtensionPoint.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/ExtensionPoint.java
@@ -24,15 +24,7 @@ public interface ExtensionPoint<T> {
* to add.
* @since 8.1
*/
- void addExtension(Object key, Extension<T> extension);
-
- /**
- * Retrieve an {@link Extension} by key
- *
- * @param key key to retrieve
- * @since 9.0
- */
- Extension<T> getExtension(Object key);
+ void addExtension(Extension<T> extension);
/**
* Remove {@link Extension} from {@link ExtensionPoint}.
@@ -41,7 +33,7 @@ public interface ExtensionPoint<T> {
* to remove.
* @since 8.1
*/
- void removeExtension(Object key);
+ void removeExtension(Extension<T> extension);
/**
* Get {@link Iterable} of {@link Extension}s.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPoint.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPoint.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPoint.java
index 06e855f..66fb8f3 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPoint.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPoint.java
@@ -8,9 +8,9 @@
package com.gemstone.gemfire.internal.cache.extension;
-import java.util.Map;
+import java.util.ArrayList;
-import com.gemstone.gemfire.internal.util.concurrent.CopyOnWriteHashMap;
+import com.gemstone.gemfire.internal.util.CollectionUtils;
/**
* Simple implementation of {@link ExtensionPoint} for easy integration with
@@ -23,7 +23,9 @@ import com.gemstone.gemfire.internal.util.concurrent.CopyOnWriteHashMap;
// UnitTest SimpleExtensionPointJUnitTest
public class SimpleExtensionPoint<T> implements ExtensionPoint<T> {
- protected final Map<Object, Extension<T>> extensions = new CopyOnWriteHashMap<Object, Extension<T>>();
+ protected final ArrayList<Extension<T>> extensions = new ArrayList<Extension<T>>();
+
+ protected final Iterable<Extension<T>> iterable = CollectionUtils.unmodifiableIterable(extensions);
protected final Extensible<T> extensible;
@@ -48,22 +50,17 @@ public class SimpleExtensionPoint<T> implements ExtensionPoint<T> {
@Override
public Iterable<Extension<T>> getExtensions() {
- return extensions.values();
- }
-
- @Override
- public void addExtension(Object key, Extension<T> extension) {
- extensions.put(key, extension);
+ return iterable;
}
@Override
- public Extension<T> getExtension(Object key) {
- return extensions.get(key);
+ public void addExtension(Extension<T> extension) {
+ extensions.add(extension);
}
@Override
- public void removeExtension(Object key) {
- extensions.remove(key);
+ public void removeExtension(Extension<T> extension) {
+ extensions.remove(extension);
}
@Override
@@ -72,7 +69,7 @@ public class SimpleExtensionPoint<T> implements ExtensionPoint<T> {
}
public void fireCreate(final Extensible<T> newTarget) {
- for (final Extension<T> extension : getExtensions()) {
+ for (final Extension<T> extension : extensions) {
extension.onCreate(extensible, newTarget);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
index 31de4e9..c0278cc 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
@@ -91,6 +91,7 @@ import com.gemstone.gemfire.cache.hdfs.internal.HDFSStoreImpl;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.CacheConfig;
import com.gemstone.gemfire.internal.cache.CacheServerLauncher;
+import com.gemstone.gemfire.internal.cache.CacheService;
import com.gemstone.gemfire.internal.cache.DiskStoreFactoryImpl;
import com.gemstone.gemfire.internal.cache.DiskStoreImpl;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@@ -1652,6 +1653,9 @@ public class CacheCreation implements InternalCache {
}
};
-
+ @Override
+ public <T extends CacheService> T getService(Class<T> clazz) {
+ throw new UnsupportedOperationException();
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
index 54f1208..f1cc1f9 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
@@ -56,7 +56,7 @@ public class CacheXml81DUnitTest extends CacheXml80DUnitTest {
public void testCacheExtension() {
final CacheCreation cache = new CacheCreation();
final MockCacheExtension extension = new MockCacheExtension("testCacheExtension");
- cache.getExtensionPoint().addExtension(MockCacheExtension.class, extension);
+ cache.getExtensionPoint().addExtension(extension);
assertEquals(0, extension.onCreateCounter.get());
assertEquals(0, extension.getXmlGeneratorCounter.get());
@@ -91,7 +91,7 @@ public class CacheXml81DUnitTest extends CacheXml80DUnitTest {
Extensible<Region<?, ?>> region = (Extensible<Region<?, ?>>) cache.createRegion(regionName, attrs);
final MockRegionExtension extension = new MockRegionExtension("test");
- region.getExtensionPoint().addExtension(MockRegionExtension.class, extension);
+ region.getExtensionPoint().addExtension(extension);
assertEquals(0, extension.onCreateCounter.get());
assertEquals(0, extension.getXmlGeneratorCounter.get());
@@ -127,7 +127,7 @@ public class CacheXml81DUnitTest extends CacheXml80DUnitTest {
Extensible<Region<?, ?>> region = (Extensible<Region<?, ?>>) cache.createRegion(regionName, attrs);
final MockRegionExtension extension = new MockRegionExtension("exception");
- region.getExtensionPoint().addExtension(MockRegionExtension.class, extension);
+ region.getExtensionPoint().addExtension(extension);
assertEquals(0, extension.onCreateCounter.get());
assertEquals(0, extension.getXmlGeneratorCounter.get());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheServiceJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheServiceJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheServiceJUnitTest.java
new file mode 100644
index 0000000..b3bcc93
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheServiceJUnitTest.java
@@ -0,0 +1,43 @@
+package com.gemstone.gemfire.internal.cache;
+
+import static org.junit.Assert.*;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
+public class CacheServiceJUnitTest {
+
+ private GemFireCacheImpl cache;
+
+ @Before
+ public void setUp() {
+ cache = (GemFireCacheImpl) new CacheFactory().set("mcast-port", "0").create();
+ }
+
+ @After
+ public void tearDown() {
+ if(cache != null) {
+ cache.close();
+ }
+ }
+
+ @Test
+ public void test() {
+ MockCacheService service = cache.getService(MockCacheService.class);
+ assertEquals(cache, service.getCache());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MockCacheService.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MockCacheService.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MockCacheService.java
new file mode 100644
index 0000000..6eb1c37
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MockCacheService.java
@@ -0,0 +1,8 @@
+package com.gemstone.gemfire.internal.cache;
+
+import com.gemstone.gemfire.cache.Cache;
+
+public interface MockCacheService extends CacheService {
+
+ public Cache getCache();
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MockCacheServiceImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MockCacheServiceImpl.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MockCacheServiceImpl.java
new file mode 100644
index 0000000..58b256d
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MockCacheServiceImpl.java
@@ -0,0 +1,23 @@
+package com.gemstone.gemfire.internal.cache;
+
+import com.gemstone.gemfire.cache.Cache;
+
+public class MockCacheServiceImpl implements MockCacheService {
+
+ private Cache cache;
+
+ @Override
+ public void init(Cache cache) {
+ this.cache = cache;
+ }
+
+ @Override
+ public Class<? extends CacheService> getInterface() {
+ return MockCacheService.class;
+ }
+
+ @Override
+ public Cache getCache() {
+ return cache;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPointJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPointJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPointJUnitTest.java
index 35bb7ef..2899669 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPointJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPointJUnitTest.java
@@ -7,11 +7,7 @@
*/
package com.gemstone.gemfire.internal.cache.extension;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -42,7 +38,7 @@ public class SimpleExtensionPointJUnitTest {
final MockImpl m = new MockImpl();
assertSame(m.extensionPoint.extensible, m.extensionPoint.target);
assertNotNull(m.extensionPoint.extensions);
- assertNotNull(m.extensionPoint.extensions);
+ assertNotNull(m.extensionPoint.iterable);
}
/**
@@ -53,7 +49,7 @@ public class SimpleExtensionPointJUnitTest {
final MockImpl m = new MockImpl();
assertEquals(0, m.extensionPoint.extensions.size());
- assertTrue(!m.extensionPoint.extensions.values().iterator().hasNext());
+ assertTrue(!m.extensionPoint.iterable.iterator().hasNext());
final Iterable<Extension<MockInterface>> extensions = m.getExtensionPoint().getExtensions();
assertNotNull(extensions);
@@ -77,7 +73,7 @@ public class SimpleExtensionPointJUnitTest {
final MockImpl m = new MockImpl();
final MockExtension extension = new MockExtension();
- m.getExtensionPoint().addExtension(MockExtension.class, extension);
+ m.getExtensionPoint().addExtension(extension);
assertEquals(1, m.extensionPoint.extensions.size());
final Iterable<Extension<MockInterface>> extensions = m.getExtensionPoint().getExtensions();
@@ -105,7 +101,7 @@ public class SimpleExtensionPointJUnitTest {
public void testRemoveExtension() {
final MockImpl m = new MockImpl();
final MockExtension extension = new MockExtension();
- m.getExtensionPoint().addExtension(MockExtension.class, extension);
+ m.getExtensionPoint().addExtension(extension);
final Iterable<Extension<MockInterface>> extensions = m.getExtensionPoint().getExtensions();
assertNotNull(extensions);
@@ -124,7 +120,7 @@ public class SimpleExtensionPointJUnitTest {
// ignore
}
- m.getExtensionPoint().removeExtension(MockExtension.class);
+ m.getExtensionPoint().removeExtension(extension);
assertEquals(0, m.extensionPoint.extensions.size());
// extensions should be empty
@@ -163,13 +159,13 @@ public class SimpleExtensionPointJUnitTest {
};
counter.set(0);
- m.getExtensionPoint().addExtension(MockExtension.class, extension);
+ m.getExtensionPoint().addExtension(extension);
// fire with itself as the target
m.extensionPoint.fireCreate(m);
assertEquals(1, counter.get());
counter.set(0);
- m.getExtensionPoint().removeExtension(MockExtension.class);
+ m.getExtensionPoint().removeExtension(extension);
// fire with itself as the target
m.extensionPoint.fireCreate(m);
assertEquals(0, counter.get());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
index 29b6acb..61db465 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
@@ -48,7 +48,12 @@ public class DestroyMockCacheExtensionFunction extends FunctionAdapter {
@SuppressWarnings("unchecked")
final Extensible<Cache> extensible = (Extensible<Cache>) cache;
- extensible.getExtensionPoint().removeExtension(MockCacheExtension.class);
+ for (Extension<Cache> extension : extensible.getExtensionPoint().getExtensions()) {
+ if (extension instanceof MockCacheExtension) {
+ extensible.getExtensionPoint().removeExtension(extension);
+ break;
+ }
+ }
final XmlEntity xmlEntity = XmlEntity.builder().withType(ELEMENT_CACHE).withNamespace(PREFIX, NAMESPACE).build();
@@ -72,4 +77,4 @@ public class DestroyMockCacheExtensionFunction extends FunctionAdapter {
public static Object[] toArgs(final String value) {
return new Object[] { value };
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtension.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtension.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtension.java
index b5b9e65..b37a9cf 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtension.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtension.java
@@ -33,7 +33,7 @@ public final class MockCacheExtension extends AbstractMockExtension<Cache> {
@Override
public void onCreate(Extensible<Cache> source, Extensible<Cache> target) {
super.onCreate(source, target);
- target.getExtensionPoint().addExtension(MockCacheExtension.class, this);
+ target.getExtensionPoint().addExtension(this);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockExtensionXmlParser.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockExtensionXmlParser.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockExtensionXmlParser.java
index cf9a2ec..6e9b529 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockExtensionXmlParser.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockExtensionXmlParser.java
@@ -76,13 +76,13 @@ public class MockExtensionXmlParser extends AbstractXmlParser {
case ELEMENT_CACHE: {
MockCacheExtension extension = (MockCacheExtension) stack.pop();
CacheCreation cache = (CacheCreation) stack.peek();
- cache.getExtensionPoint().addExtension(MockCacheExtension.class, extension);
+ cache.getExtensionPoint().addExtension(extension);
break;
}
case ELEMENT_REGION: {
MockRegionExtension extension = (MockRegionExtension) stack.pop();
RegionCreation region = (RegionCreation) stack.peek();
- region.getExtensionPoint().addExtension(MockRegionExtension.class, extension);
+ region.getExtensionPoint().addExtension(extension);
break;
}
default:
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockRegionExtension.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockRegionExtension.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockRegionExtension.java
index 571b5a1..a5d2ce0 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockRegionExtension.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockRegionExtension.java
@@ -27,7 +27,7 @@ public final class MockRegionExtension extends AbstractMockExtension<Region<?, ?
@Override
public void onCreate(Extensible<Region<?, ?>> source, Extensible<Region<?, ?>> target) {
super.onCreate(source, target);
- target.getExtensionPoint().addExtension(MockRegionExtension.class, this);
+ target.getExtensionPoint().addExtension(this);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-core/src/test/resources/META-INF/services/com.gemstone.gemfire.internal.cache.CacheService
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/resources/META-INF/services/com.gemstone.gemfire.internal.cache.CacheService b/gemfire-core/src/test/resources/META-INF/services/com.gemstone.gemfire.internal.cache.CacheService
new file mode 100644
index 0000000..4573990
--- /dev/null
+++ b/gemfire-core/src/test/resources/META-INF/services/com.gemstone.gemfire.internal.cache.CacheService
@@ -0,0 +1 @@
+com.gemstone.gemfire.internal.cache.MockCacheServiceImpl
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java
index 7d90b7d..35427ae 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java
@@ -2,8 +2,7 @@ package com.gemstone.gemfire.cache.lucene;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneService;
-import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl;
-import com.gemstone.gemfire.internal.cache.extension.Extensible;
+import com.gemstone.gemfire.internal.cache.InternalCache;
/**
* Class for retrieving or creating the currently running
@@ -16,16 +15,8 @@ public class LuceneServiceProvider {
* Retrieve or create the lucene service for this cache
*/
public static LuceneService get(Cache cache) {
- synchronized(LuceneService.class) {
- Extensible<Cache> extensible = (Extensible<Cache>) cache;
- InternalLuceneService service = (InternalLuceneService) extensible.getExtensionPoint().getExtension(LuceneService.class);
- if(service == null) {
- service = new LuceneServiceImpl(cache);
- extensible.getExtensionPoint().addExtension(LuceneService.class, service);
- }
-
- return service;
- }
+ InternalCache internalCache = (InternalCache) cache;
+ return internalCache.getService(InternalLuceneService.class);
}
private LuceneServiceProvider() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneService.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneService.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneService.java
index d09ef19..cd78c2c 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneService.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneService.java
@@ -2,8 +2,9 @@ package com.gemstone.gemfire.cache.lucene.internal;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.lucene.LuceneService;
+import com.gemstone.gemfire.internal.cache.CacheService;
import com.gemstone.gemfire.internal.cache.extension.Extension;
-public interface InternalLuceneService extends LuceneService, Extension<Cache> {
+public interface InternalLuceneService extends LuceneService, Extension<Cache>, CacheService {
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
index 257861b..c8d4bb6 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
@@ -88,6 +88,6 @@ public abstract class LuceneIndexImpl implements InternalLuceneIndex {
creation.addFieldNames(this.getFieldNames());
creation.setRegion(dataRegion);
creation.setFieldFieldAnalyzerMap(this.getFieldAnalyzerMap());
- dataRegion.getExtensionPoint().addExtension(creation, creation);
+ dataRegion.getExtensionPoint().addExtension(creation);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
index c4a2047..5efe300 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
@@ -27,6 +27,7 @@ import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
import com.gemstone.gemfire.cache.lucene.internal.xml.LuceneServiceXmlGenerator;
import com.gemstone.gemfire.internal.DSFIDFactory;
import com.gemstone.gemfire.internal.DataSerializableFixedID;
+import com.gemstone.gemfire.internal.cache.CacheService;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.InternalRegionArguments;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
@@ -46,11 +47,14 @@ import com.gemstone.gemfire.internal.logging.LogService;
public class LuceneServiceImpl implements InternalLuceneService {
private static final Logger logger = LogService.getLogger();
- private final GemFireCacheImpl cache;
+ private GemFireCacheImpl cache;
private final HashMap<String, LuceneIndex> indexMap = new HashMap<String, LuceneIndex>();;
+ public LuceneServiceImpl() {
+
+ }
- public LuceneServiceImpl(final Cache cache) {
+ public void init(final Cache cache) {
if (cache == null) {
throw new IllegalStateException(LocalizedStrings.CqService_CACHE_IS_NULL.toLocalizedString());
}
@@ -63,6 +67,11 @@ public class LuceneServiceImpl implements InternalLuceneService {
registerDataSerializables();
}
+ @Override
+ public Class<? extends CacheService> getInterface() {
+ return InternalLuceneService.class;
+ }
+
public static String getUniqueIndexName(String indexName, String regionPath) {
if (!regionPath.startsWith("/")) {
regionPath = "/"+regionPath;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
index 02ecd8f..3609ae8 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
@@ -68,7 +68,7 @@ public class LuceneIndexCreation implements LuceneIndex, Extension<Region<?, ?>>
@Override
public void onCreate(Extensible<Region<?, ?>> source,
Extensible<Region<?, ?>> target) {
- target.getExtensionPoint().addExtension(LuceneIndex.class, this);
+ target.getExtensionPoint().addExtension(this);
Cache cache = target.getExtensionPoint().getTarget().getCache();
LuceneServiceImpl service = (LuceneServiceImpl) LuceneServiceProvider.get(cache);
Region region = target.getExtensionPoint().getTarget();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java
index e11814a..25aac41 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java
@@ -51,7 +51,7 @@ public class LuceneXmlParser extends AbstractXmlParser {
LuceneIndexCreation indexCreation = new LuceneIndexCreation();
indexCreation.setName(name);
indexCreation.setRegion(region);
- region.getExtensionPoint().addExtension(indexCreation, indexCreation);
+ region.getExtensionPoint().addExtension(indexCreation);
stack.push(indexCreation);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.CacheService
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.CacheService b/gemfire-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.CacheService
new file mode 100644
index 0000000..bd05ef7
--- /dev/null
+++ b/gemfire-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.CacheService
@@ -0,0 +1 @@
+com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
index 26487a0..0cfd989 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
@@ -55,7 +55,7 @@ public class LuceneServiceImplJUnitTest {
assertNull(function);
cache = createBasicCache();
- new LuceneServiceImpl(cache);
+ new LuceneServiceImpl().init(cache);
function = FunctionService.getFunction(LuceneFunction.ID);
assertNotNull(function);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5d7535a7/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
index 6c37468..431ed4c 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
@@ -387,9 +387,7 @@ public class LuceneFunctionJUnitTest {
will(returnValue(mockCache));
allowing(mockRegion).getFullPath();
will(returnValue(regionPath));
- allowing(mockCache).getExtensionPoint();
- will(returnValue(mockExtensionPoint));
- allowing(mockExtensionPoint).getExtension(LuceneService.class);
+ allowing(mockCache).getService(InternalLuceneService.class);
will(returnValue(mockService));
allowing(mockService).getIndex(with("indexName"), with(regionPath));
will(returnValue(mockIndex));
[30/50] [abbrv] incubator-geode git commit: Requiring lucene index to
be created before the region
Posted by as...@apache.org.
Requiring lucene index to be created before the region
At the moment, adding an AsyncEventQueue after a region is created has
issues - See GEODE-404.
Therefore, in order to create a lucene index programmatically, the
lucene index needs to be created before the region exists so that we can
create the AEQ ahead of time.
With this change, when an LuceneIndex is created, the actual creation is
deferred in a RegionListener callback. When the region is created, we
add the AEQ to the region attributes and create the colocated regions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/09c9342c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/09c9342c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/09c9342c
Branch: refs/heads/develop
Commit: 09c9342ce034753618e53a93b21171594713b157
Parents: 485ebf9
Author: Dan Smith <up...@apache.org>
Authored: Wed Oct 14 13:15:04 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Thu Oct 15 10:59:17 2015 -0700
----------------------------------------------------------------------
.../gemfire/cache/lucene/LuceneService.java | 4 +-
.../LuceneIndexForPartitionedRegion.java | 7 +-
.../lucene/internal/LuceneServiceImpl.java | 98 ++++++++++++++------
.../internal/xml/LuceneIndexCreation.java | 12 ++-
.../internal/LuceneRebalanceJUnitTest.java | 16 +++-
.../internal/LuceneServiceImplJUnitTest.java | 18 +++-
.../LuceneFunctionReadPathDUnitTest.java | 7 +-
...neIndexXmlGeneratorIntegrationJUnitTest.java | 4 +-
...uceneIndexXmlParserIntegrationJUnitTest.java | 14 ++-
9 files changed, 125 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09c9342c/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
index eed80d9..e1623d6 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
@@ -64,7 +64,7 @@ public interface LuceneService {
* @param fields
* @return LuceneIndex object
*/
- public LuceneIndex createIndex(String indexName, String regionPath, String... fields);
+ public void createIndex(String indexName, String regionPath, String... fields);
/**
* Create a lucene index using specified analyzer per field
@@ -75,7 +75,7 @@ public interface LuceneService {
* @return LuceneIndex object
*
*/
- public LuceneIndex createIndex(String indexName, String regionPath,
+ public void createIndex(String indexName, String regionPath,
Map<String, Analyzer> analyzerPerField);
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09c9342c/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
index 2bf848f..d0bb328 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
@@ -98,12 +98,7 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
LuceneEventListener listener = new LuceneEventListener(repositoryManager);
String aeqId = LuceneServiceImpl.getUniqueIndexName(getName(), regionPath);
AsyncEventQueueImpl aeq = (AsyncEventQueueImpl)cache.getAsyncEventQueue(aeqId);
- if (aeq == null) {
- AsyncEventQueue indexQueue = factory.create(aeqId, listener);
- dataRegion.getAttributesMutator().addAsyncEventQueueId(aeqId);
- } else {
- logger.info("The AEQ "+aeq+" is created at another member");
- }
+ AsyncEventQueue indexQueue = factory.create(aeqId, listener);
addExtension(dataRegion);
hasInitialized = true;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09c9342c/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
index 776d005..c4a2047 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
@@ -9,8 +9,10 @@ import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.cache.lucene.LuceneIndex;
import com.gemstone.gemfire.cache.lucene.LuceneQueryFactory;
@@ -26,7 +28,9 @@ import com.gemstone.gemfire.cache.lucene.internal.xml.LuceneServiceXmlGenerator;
import com.gemstone.gemfire.internal.DSFIDFactory;
import com.gemstone.gemfire.internal.DataSerializableFixedID;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.InternalRegionArguments;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import com.gemstone.gemfire.internal.cache.RegionListener;
import com.gemstone.gemfire.internal.cache.extension.Extensible;
import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
@@ -40,11 +44,11 @@ import com.gemstone.gemfire.internal.logging.LogService;
* @since 8.5
*/
public class LuceneServiceImpl implements InternalLuceneService {
- private final Cache cache;
-
- private final HashMap<String, LuceneIndex> indexMap;
-
private static final Logger logger = LogService.getLogger();
+
+ private final GemFireCacheImpl cache;
+ private final HashMap<String, LuceneIndex> indexMap = new HashMap<String, LuceneIndex>();;
+
public LuceneServiceImpl(final Cache cache) {
if (cache == null) {
@@ -57,9 +61,6 @@ public class LuceneServiceImpl implements InternalLuceneService {
FunctionService.registerFunction(new LuceneFunction());
registerDataSerializables();
-
- // Initialize the Map which maintains indexes
- this.indexMap = new HashMap<String, LuceneIndex>();
}
public static String getUniqueIndexName(String indexName, String regionPath) {
@@ -71,17 +72,72 @@ public class LuceneServiceImpl implements InternalLuceneService {
}
@Override
- public LuceneIndex createIndex(String indexName, String regionPath, String... fields) {
- LuceneIndexImpl index = createIndexRegions(indexName, regionPath);
- if (index == null) {
- return null;
+ public void createIndex(String indexName, String regionPath, String... fields) {
+ StandardAnalyzer analyzer = new StandardAnalyzer();
+
+ createIndex(indexName, regionPath, analyzer, fields);
+ }
+
+ @Override
+ public void createIndex(String indexName, String regionPath, Map<String, Analyzer> analyzerPerField) {
+ Analyzer analyzer = new PerFieldAnalyzerWrapper(new StandardAnalyzer(), analyzerPerField);
+ String[] fields = (String[])analyzerPerField.keySet().toArray(new String[analyzerPerField.keySet().size()]);
+
+ createIndex(indexName, regionPath, analyzer, fields);
+ }
+
+ private void createIndex(final String indexName, String regionPath,
+ final Analyzer analyzer, final String... fields) {
+
+ if(!regionPath.startsWith("/")) {
+ regionPath = "/" + regionPath;
+ }
+ Region region = cache.getRegion(regionPath);
+ if(region != null) {
+ throw new IllegalStateException("The lucene index must be created before region");
}
+
+ final String dataRegionPath = regionPath;
+ cache.addRegionListener(new RegionListener() {
+ @Override
+ public RegionAttributes beforeCreate(Region parent, String regionName,
+ RegionAttributes attrs, InternalRegionArguments internalRegionArgs) {
+ String path = parent == null ? "/" + regionName : parent.getFullPath() + "/" + regionName;
+ if(path.equals(dataRegionPath)) {
+ String aeqId = LuceneServiceImpl.getUniqueIndexName(indexName, dataRegionPath);
+ AttributesFactory af = new AttributesFactory(attrs);
+ af.addAsyncEventQueueId(aeqId);
+ return af.create();
+ } else {
+ return attrs;
+ }
+ }
+
+ @Override
+ public void afterCreate(Region region) {
+ if(region.getFullPath().equals(dataRegionPath)) {
+ afterDataRegionCreated(indexName, analyzer, dataRegionPath, fields);
+ cache.removeRegionListener(this);
+ }
+ }
+ });
+
+ }
+
+ /**
+ * Finish creating the lucene index after the data region is created .
+ *
+ * Public because this is called by the Xml parsing code
+ */
+ public void afterDataRegionCreated(final String indexName,
+ final Analyzer analyzer, final String dataRegionPath,
+ final String... fields) {
+ LuceneIndexImpl index = createIndexRegions(indexName, dataRegionPath);
index.setSearchableFields(fields);
// for this API, set index to use the default StandardAnalyzer for each field
- index.setAnalyzer(null);
+ index.setAnalyzer(analyzer);
index.initialize();
registerIndex(index);
- return index;
}
private LuceneIndexImpl createIndexRegions(String indexName, String regionPath) {
@@ -119,22 +175,6 @@ public class LuceneServiceImpl implements InternalLuceneService {
}
@Override
- public LuceneIndex createIndex(String indexName, String regionPath, Map<String, Analyzer> analyzerPerField) {
- LuceneIndexImpl index = createIndexRegions(indexName, regionPath);
- if (index == null) {
- return null;
- }
-
- Analyzer analyzer = new PerFieldAnalyzerWrapper(new StandardAnalyzer(), analyzerPerField);
- String[] fields = (String[])analyzerPerField.keySet().toArray(new String[analyzerPerField.keySet().size()]);
- index.setSearchableFields(fields);
- index.setAnalyzer(analyzer);
- index.initialize();
- registerIndex(index);
- return index;
- }
-
- @Override
public void destroyIndex(LuceneIndex index) {
LuceneIndexImpl indexImpl = (LuceneIndexImpl) index;
indexMap.remove(getUniqueIndexName(index.getName(), index.getRegionPath()));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09c9342c/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
index 5520f96..02ecd8f 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
@@ -6,12 +6,14 @@ import java.util.Map;
import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.lucene.LuceneIndex;
import com.gemstone.gemfire.cache.lucene.LuceneService;
import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
+import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl;
import com.gemstone.gemfire.internal.cache.extension.Extensible;
import com.gemstone.gemfire.internal.cache.extension.Extension;
import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
@@ -68,9 +70,13 @@ public class LuceneIndexCreation implements LuceneIndex, Extension<Region<?, ?>>
Extensible<Region<?, ?>> target) {
target.getExtensionPoint().addExtension(LuceneIndex.class, this);
Cache cache = target.getExtensionPoint().getTarget().getCache();
- LuceneService service = LuceneServiceProvider.get(cache);
- //TODO - should this be a different method than the public API here?
- service.createIndex(getName(), getRegionPath(), getFieldNames());
+ LuceneServiceImpl service = (LuceneServiceImpl) LuceneServiceProvider.get(cache);
+ Region region = target.getExtensionPoint().getTarget();
+ String aeqId = LuceneServiceImpl.getUniqueIndexName(getName(), getRegionPath());
+ //Here, it is safe to add the aeq with the mutator, because onCreate is
+ //fired in a special place before the region is initialized.
+ region.getAttributesMutator().addAsyncEventQueueId(aeqId);
+ service.afterDataRegionCreated(getName(), new StandardAnalyzer(), getRegionPath(), getFieldNames());
}
public void addField(String name) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09c9342c/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneRebalanceJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneRebalanceJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneRebalanceJUnitTest.java
index 478981f..afddb4a 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneRebalanceJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneRebalanceJUnitTest.java
@@ -1,11 +1,12 @@
package com.gemstone.gemfire.cache.lucene.internal;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
import java.io.IOException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -21,10 +22,11 @@ import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer;
import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-@Category(UnitTest.class)
+@Category(IntegrationTest.class)
public class LuceneRebalanceJUnitTest {
String[] indexedFields = new String[] { "txt" };
HeterogenousLuceneSerializer mapper = new HeterogenousLuceneSerializer(indexedFields);
@@ -37,6 +39,14 @@ public class LuceneRebalanceJUnitTest {
analyzer = new StandardAnalyzer();
LuceneServiceImpl.registerDataSerializables();
}
+
+ @After
+ public void tearDown() {
+ Cache cache = GemFireCacheImpl.getInstance();
+ if(cache != null) {
+ cache.close();
+ }
+ }
/**
* Test what happens when a bucket is destroyed.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09c9342c/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
index eff2813..26487a0 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
@@ -120,12 +120,23 @@ public class LuceneServiceImplJUnitTest {
return region;
}
}
+
+ /**Test that we don't allow the user
+ * to create the region first.
+ */
+ @Test(expected = IllegalStateException.class)
+ public void createRegionFirst() throws IOException, ParseException {
+ getService();
+ LocalRegion userRegion = createPR("PR1", false);
+ service.createIndex("index1", "PR1", "field1", "field2", "field3");
+ }
@Test
public void testCreateIndexForPR() throws IOException, ParseException {
getService();
+ service.createIndex("index1", "PR1", "field1", "field2", "field3");
LocalRegion userRegion = createPR("PR1", false);
- LuceneIndexImpl index1 = (LuceneIndexImpl)service.createIndex("index1", "PR1", "field1", "field2", "field3");
+ LuceneIndexImpl index1 = (LuceneIndexImpl) service.getIndex("index1", "PR1");
assertTrue(index1 instanceof LuceneIndexForPartitionedRegion);
LuceneIndexForPartitionedRegion index1PR = (LuceneIndexForPartitionedRegion)index1;
assertEquals("index1", index1.getName());
@@ -155,7 +166,6 @@ public class LuceneServiceImplJUnitTest {
@Test
public void testCreateIndexForPRWithAnalyzer() throws IOException, ParseException {
getService();
- createPR("PR1", false);
StandardAnalyzer sa = new StandardAnalyzer();
KeywordAnalyzer ka = new KeywordAnalyzer();
Map<String, Analyzer> analyzerPerField = new HashMap<String, Analyzer>();
@@ -165,7 +175,9 @@ public class LuceneServiceImplJUnitTest {
// field2 and field3 will use StandardAnalyzer
PerFieldAnalyzerWrapper analyzer2 = new PerFieldAnalyzerWrapper(sa, analyzerPerField);
- LuceneIndexImpl index1 = (LuceneIndexImpl)service.createIndex("index1", "PR1", analyzerPerField);
+ service.createIndex("index1", "PR1", analyzerPerField);
+ createPR("PR1", false);
+ LuceneIndexImpl index1 = (LuceneIndexImpl)service.getIndex("index1", "PR1");
assertTrue(index1 instanceof LuceneIndexForPartitionedRegion);
LuceneIndexForPartitionedRegion index1PR = (LuceneIndexForPartitionedRegion)index1;
assertEquals("index1", index1.getName());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09c9342c/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
index 6e44b72..e5c1a4e 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
@@ -60,14 +60,11 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
public Object call() throws Exception {
final Cache cache = getCache();
assertNotNull(cache);
- // TODO: we have to workarround it now: specify an AEQ id when creating data region
- String aeqId = LuceneServiceImpl.getUniqueIndexName(INDEX_NAME, REGION_NAME);
+ LuceneService service = LuceneServiceProvider.get(cache);
+ service.createIndex(INDEX_NAME, REGION_NAME, "text");
RegionFactory<Object, Object> regionFactory = cache.createRegionFactory(RegionShortcut.PARTITION);
Region<Object, Object> region = regionFactory.
- addAsyncEventQueueId(aeqId). // TODO: we need it for the time being
create(REGION_NAME);
- LuceneService service = LuceneServiceProvider.get(cache);
- InternalLuceneIndex index = (InternalLuceneIndex) service.createIndex(INDEX_NAME, REGION_NAME, "text");
return null;
}
};
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09c9342c/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
index 65c73f7..e991643 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
@@ -28,10 +28,10 @@ public class LuceneIndexXmlGeneratorIntegrationJUnitTest {
@Test
public void generateWithFields() {
Cache cache = new CacheFactory().set("mcast-port", "0").create();
- cache.createRegionFactory(RegionShortcut.PARTITION).create("region");
LuceneService service = LuceneServiceProvider.get(cache);
-
service.createIndex("index", "region", "a", "b", "c");
+ cache.createRegionFactory(RegionShortcut.PARTITION).create("region");
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintWriter pw = new PrintWriter(baos);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09c9342c/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
index 56a726f..d97e160 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
@@ -8,6 +8,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -18,19 +19,28 @@ import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.lucene.LuceneIndex;
import com.gemstone.gemfire.cache.lucene.LuceneService;
import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.extension.Extension;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlParser;
import com.gemstone.gemfire.internal.cache.xmlcache.RegionCreation;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import com.gemstone.gemfire.util.test.TestUtil;
-@Category(UnitTest.class)
+@Category(IntegrationTest.class)
public class LuceneIndexXmlParserIntegrationJUnitTest {
@Rule
public TestName name = new TestName();
+ @After
+ public void tearDown() {
+ Cache cache = GemFireCacheImpl.getInstance();
+ if(cache != null) {
+ cache.close();
+ }
+ }
+
/**
* Test that we parse the index fields correctly
*/
[39/50] [abbrv] incubator-geode git commit: GEODE-11: Add dunits for
various partition regions
Posted by as...@apache.org.
GEODE-11: Add dunits for various partition regions
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/28a0eb81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/28a0eb81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/28a0eb81
Branch: refs/heads/develop
Commit: 28a0eb81740076278d9471872ced68c1f01183d7
Parents: 1f597bb
Author: Ashvin Agrawal <as...@apache.org>
Authored: Fri Oct 16 15:45:06 2015 -0700
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Fri Oct 16 15:49:06 2015 -0700
----------------------------------------------------------------------
.../LuceneFunctionReadPathDUnitTest.java | 170 ++++++++++++-------
1 file changed, 104 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/28a0eb81/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
index 0bf1842..b3460b7 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
@@ -1,6 +1,5 @@
package com.gemstone.gemfire.cache.lucene.internal.distributed;
-import java.io.IOException;
import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
@@ -11,6 +10,8 @@ import org.junit.Assert;
import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.EvictionAction;
+import com.gemstone.gemfire.cache.EvictionAlgorithm;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
@@ -21,10 +22,10 @@ import com.gemstone.gemfire.cache.lucene.LuceneQueryResults;
import com.gemstone.gemfire.cache.lucene.LuceneResultStruct;
import com.gemstone.gemfire.cache.lucene.LuceneService;
import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
-import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneIndex;
import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl;
import com.gemstone.gemfire.cache30.CacheTestCase;
-import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
+import com.gemstone.gemfire.internal.cache.EvictionAttributesImpl;
+import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import dunit.Host;
@@ -34,7 +35,6 @@ import dunit.VM;
@Category(DistributedTest.class)
public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
private static final String INDEX_NAME = "index";
- private static final String REGION_NAME = "indexedRegion";
private static final long serialVersionUID = 1L;
@@ -54,101 +54,140 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
}
public void testEnd2EndFunctionExecution() {
- SerializableCallable createPartitionRegion = new SerializableCallable("createRegion") {
+ e2eTextSearchForRegionType(RegionShortcut.PARTITION);
+ e2eTextSearchForRegionType(RegionShortcut.PARTITION_PERSISTENT);
+ e2eTextSearchForRegionType(RegionShortcut.PARTITION_OVERFLOW);
+ e2eTextSearchForRegionType(RegionShortcut.PARTITION_PERSISTENT_OVERFLOW);
+ }
+
+ private void e2eTextSearchForRegionType(RegionShortcut type) {
+ final String regionName = type.toString();
+ createPartitionRegionAndIndex(server1, regionName, type);
+ putDataInRegion(server1, regionName);
+ createPartitionRegionAndIndex(server2, regionName, type);
+ // Make sure we can search from both members
+ executeTextSearch(server1, regionName);
+ executeTextSearch(server2, regionName);
+
+ rebalanceRegion(server1);
+ // Make sure the search still works
+ executeTextSearch(server1, regionName);
+ executeTextSearch(server2, regionName);
+ destroyRegion(server2, regionName);
+ }
+
+ private void rebalanceRegion(VM vm) {
+ // Do a rebalance
+ vm.invoke(new SerializableCallable<Object>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Object call() throws CancellationException, InterruptedException {
+ RebalanceOperation op = getCache().getResourceManager().createRebalanceFactory().start();
+ RebalanceResults results = op.getResults();
+ assertTrue(1 < results.getTotalBucketTransfersCompleted());
+ return null;
+ }
+ });
+ }
+
+ private void executeTextSearch(VM vm, final String regionName) {
+ SerializableCallable<Object> executeSearch = new SerializableCallable<Object>("executeSearch") {
private static final long serialVersionUID = 1L;
public Object call() throws Exception {
- final Cache cache = getCache();
+ Cache cache = getCache();
assertNotNull(cache);
+ Region<Object, Object> region = cache.getRegion(regionName);
+ Assert.assertNotNull(region);
+
LuceneService service = LuceneServiceProvider.get(cache);
- service.createIndex(INDEX_NAME, REGION_NAME, "text");
- RegionFactory<Object, Object> regionFactory = cache.createRegionFactory(RegionShortcut.PARTITION);
- Region<Object, Object> region = regionFactory.
- create(REGION_NAME);
+ LuceneQuery<Integer, TestObject> query;
+ query = service.createLuceneQueryFactory().create(INDEX_NAME, regionName, "text:world");
+ LuceneQueryResults<Integer, TestObject> results = query.search();
+ assertEquals(3, results.size());
+ List<LuceneResultStruct<Integer, TestObject>> page = results.getNextPage();
+
+ Map<Integer, TestObject> data = new HashMap<Integer, TestObject>();
+ for (LuceneResultStruct<Integer, TestObject> row : page) {
+ data.put(row.getKey(), row.getValue());
+ }
+
+ assertEquals(data, region);
return null;
}
};
-
- server1.invoke(createPartitionRegion);
-
- SerializableCallable createSomeData = new SerializableCallable("createRegion") {
+ vm.invoke(executeSearch);
+ }
+
+ private void putDataInRegion(VM vm, final String regionName) {
+ SerializableCallable<Object> createSomeData = new SerializableCallable<Object>("putDataInRegion") {
private static final long serialVersionUID = 1L;
public Object call() throws Exception {
final Cache cache = getCache();
- Region<Object, Object> region = cache.getRegion(REGION_NAME);
-
- putInRegion(region, 1, new TestObject("hello world"));
- putInRegion(region, 113, new TestObject("hi world"));
- putInRegion(region, 2, new TestObject("goodbye world"));
-
+ Region<Object, Object> region = cache.getRegion(regionName);
+ assertNotNull(region);
+ region.put(1, new TestObject("hello world"));
+ region.put(113, new TestObject("hi world"));
+ region.put(2, new TestObject("goodbye world"));
+
return null;
}
};
- server1.invoke(createSomeData);
- server2.invoke(createPartitionRegion);
+ vm.invoke(createSomeData);
+ }
- SerializableCallable executeSearch = new SerializableCallable("executeSearch") {
+ private void createPartitionRegionAndIndex(VM vm, final String regionName, final RegionShortcut type) {
+ SerializableCallable<Object> createPartitionRegion = new SerializableCallable<Object>("createRegionAndIndex") {
private static final long serialVersionUID = 1L;
public Object call() throws Exception {
- Cache cache = getCache();
+ final Cache cache = getCache();
assertNotNull(cache);
- Region<Object, Object> region = cache.getRegion(REGION_NAME);
- Assert.assertNotNull(region);
-
LuceneService service = LuceneServiceProvider.get(cache);
- LuceneQuery<Integer, TestObject> query = service.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "text:world");
- LuceneQueryResults<Integer, TestObject> results = query.search();
- assertEquals(3, results.size());
- List<LuceneResultStruct<Integer, TestObject>> page = results.getNextPage();
-
- Map<Integer, TestObject> data = new HashMap<Integer, TestObject>();
- for(LuceneResultStruct<Integer, TestObject> row : page) {
- data.put(row.getKey(), row.getValue());
+ service.createIndex(INDEX_NAME, regionName, "text");
+ RegionFactory<Object, Object> regionFactory = cache.createRegionFactory(type);
+ if (regionName.contains("OVERFLOW")) {
+ System.out.println("yello");
+ EvictionAttributesImpl evicAttr = new EvictionAttributesImpl().setAction(EvictionAction.OVERFLOW_TO_DISK);
+ evicAttr.setAlgorithm(EvictionAlgorithm.LRU_ENTRY).setMaximum(1);
+ regionFactory.setEvictionAttributes(evicAttr);
}
-
- assertEquals(data, region);
-
+ regionFactory.create(regionName);
return null;
}
};
+ vm.invoke(createPartitionRegion);
+ }
- //Make sure we can search from both members
- server1.invoke(executeSearch);
- server2.invoke(executeSearch);
+ private void destroyRegion(VM vm, final String regionName) {
+ SerializableCallable<Object> createPartitionRegion = new SerializableCallable<Object>("destroyRegion") {
+ private static final long serialVersionUID = 1L;
- //Do a rebalance
- server1.invoke(new SerializableCallable() {
- @Override
- public Object call() throws CancellationException, InterruptedException {
- RebalanceOperation op = getCache().getResourceManager().createRebalanceFactory().start();
- RebalanceResults results = op.getResults();
- assertTrue(1 < results.getTotalBucketTransfersCompleted());
+ public Object call() throws Exception {
+ final Cache cache = getCache();
+ assertNotNull(cache);
+ String aeqId = LuceneServiceImpl.getUniqueIndexName(INDEX_NAME, regionName);
+ PartitionedRegion chunkRegion = (PartitionedRegion) cache.getRegion(aeqId + ".chunks");
+ assertNotNull(chunkRegion);
+ chunkRegion.destroyRegion();
+ PartitionedRegion fileRegion = (PartitionedRegion) cache.getRegion(aeqId + ".files");
+ assertNotNull(fileRegion);
+ fileRegion.destroyRegion();
+ Region<Object, Object> region = cache.getRegion(regionName);
+ assertNotNull(region);
+ region.destroyRegion();
return null;
}
- });
-
- //Make sure the search still works
- server1.invoke(executeSearch);
- server2.invoke(executeSearch);
- }
-
- private static void putInRegion(Region<Object, Object> region, Object key, Object value) throws BucketNotFoundException, IOException {
- region.put(key, value);
-
- //TODO - the async event queue hasn't been hooked up, so we'll fake out
- //writing the entry to the repository.
-// LuceneService service = LuceneServiceProvider.get(region.getCache());
-// InternalLuceneIndex index = (InternalLuceneIndex) service.getIndex(INDEX_NAME, REGION_NAME);
-// IndexRepository repository1 = index.getRepositoryManager().getRepository(region, 1, null);
-// repository1.create(key, value);
-// repository1.commit();
+ };
+ vm.invoke(createPartitionRegion);
}
private static class TestObject implements Serializable {
+ private static final long serialVersionUID = 1L;
private String text;
public TestObject(String text) {
@@ -180,5 +219,4 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
return true;
}
}
-
}
[07/50] [abbrv] incubator-geode git commit: Changing the way
LuceneFunctionReadPathDUnitTest uses the collector
Posted by as...@apache.org.
Changing the way LuceneFunctionReadPathDUnitTest uses the collector
The test should call getResult on the returned ResultCollector, not the
one provided to the FunctionService. I saw this test hang on my machine
and I'm not sure if this is the cause or not, but this is the way the
collector is supposed to be used, according to the javadocs.
Also, adding a timeout to the call so that if the test hangs again, it
will fail with a timeout.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/0394f052
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/0394f052
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/0394f052
Branch: refs/heads/develop
Commit: 0394f0527fb613f465e92ad88a1960d1e66e3191
Parents: 74512e5
Author: Dan Smith <up...@apache.org>
Authored: Tue Sep 22 15:35:34 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Tue Sep 22 15:35:34 2015 -0700
----------------------------------------------------------------------
.../LuceneFunctionReadPathDUnitTest.java | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0394f052/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
index 55c20cc..a950c8d 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
@@ -1,11 +1,12 @@
package com.gemstone.gemfire.cache.lucene.internal.distributed;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.concurrent.TimeUnit;
import org.apache.lucene.search.Query;
import org.junit.Assert;
@@ -18,7 +19,9 @@ import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.execute.FunctionException;
import com.gemstone.gemfire.cache.execute.FunctionService;
+import com.gemstone.gemfire.cache.execute.ResultCollector;
import com.gemstone.gemfire.cache.lucene.LuceneIndex;
import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider;
import com.gemstone.gemfire.cache.lucene.LuceneService;
@@ -118,10 +121,15 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
new TopEntriesCollectorManager());
TopEntriesFunctionCollector collector = new TopEntriesFunctionCollector();
- FunctionService.onRegion(region).withArgs(context).withCollector(collector).execute(LuceneFunction.ID);
- TopEntries entries = collector.getResult();
- assertNotNull(entries);
- assertEquals(2, entries.getHits().size());
+ ResultCollector<TopEntriesCollector, TopEntries> rc = (ResultCollector<TopEntriesCollector, TopEntries>) FunctionService.onRegion(region).withArgs(context).withCollector(collector).execute(LuceneFunction.ID);
+ TopEntries entries;
+ try {
+ entries = rc.getResult(30, TimeUnit.SECONDS);
+ assertNotNull(entries);
+ assertEquals(2, entries.getHits().size());
+ } catch (Exception e) {
+ fail("failed", e);
+ }
}
};
[32/50] [abbrv] incubator-geode git commit: Add LuceneIndex
persistence and recovery tests
Posted by as...@apache.org.
Add LuceneIndex persistence and recovery tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/0f783301
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/0f783301
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/0f783301
Branch: refs/heads/develop
Commit: 0f7833016b4767eafa675bdd3ea6633c0b36186e
Parents: 09c9342
Author: Ashvin Agrawal <as...@apache.org>
Authored: Thu Oct 15 22:39:06 2015 -0700
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Thu Oct 15 22:40:57 2015 -0700
----------------------------------------------------------------------
.../LuceneIndexRecoveryHAJUnitTest.java | 182 +++++++++++++++++++
.../internal/LuceneRebalanceJUnitTest.java | 85 ---------
.../LuceneFunctionReadPathDUnitTest.java | 3 -
.../internal/repository/serializer/Type1.java | 23 ++-
4 files changed, 197 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0f783301/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAJUnitTest.java
new file mode 100644
index 0000000..3ee1345
--- /dev/null
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAJUnitTest.java
@@ -0,0 +1,182 @@
+package com.gemstone.gemfire.cache.lucene.internal;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.EvictionAction;
+import com.gemstone.gemfire.cache.EvictionAlgorithm;
+import com.gemstone.gemfire.cache.PartitionAttributes;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionFactory;
+import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.lucene.LuceneQuery;
+import com.gemstone.gemfire.cache.lucene.LuceneQueryResults;
+import com.gemstone.gemfire.cache.lucene.LuceneService;
+import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
+import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
+import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
+import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer;
+import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.Type1;
+import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
+import com.gemstone.gemfire.internal.cache.EvictionAttributesImpl;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
+public class LuceneIndexRecoveryHAJUnitTest {
+ private static final String INDEX = "index";
+ private static final String REGION = "indexedRegion";
+ String[] indexedFields = new String[] { "txt" };
+ HeterogenousLuceneSerializer mapper = new HeterogenousLuceneSerializer(indexedFields);
+ Analyzer analyzer = new StandardAnalyzer();
+
+ Cache cache;
+
+ @Before
+ public void setup() {
+ indexedFields = new String[] { "txt" };
+ mapper = new HeterogenousLuceneSerializer(indexedFields);
+ analyzer = new StandardAnalyzer();
+ LuceneServiceImpl.registerDataSerializables();
+
+ cache = new CacheFactory().set("mcast-port", "0").create();
+ }
+
+ @After
+ public void tearDown() {
+ Cache cache = GemFireCacheImpl.getInstance();
+ if (cache != null) {
+ cache.close();
+ }
+ }
+
+ /**
+ * On rebalance, new repository manager will be created. It will try to read fileRegion and construct index. This test
+ * simulates the same.
+ */
+ @Test
+ public void recoverRepoInANewNode() throws BucketNotFoundException, IOException {
+ PartitionAttributes<String, String> attrs = new PartitionAttributesFactory().setTotalNumBuckets(1).create();
+ RegionFactory<String, String> regionfactory = cache.createRegionFactory(RegionShortcut.PARTITION);
+ regionfactory.setPartitionAttributes(attrs);
+
+ PartitionedRegion userRegion = (PartitionedRegion) regionfactory.create("userRegion");
+ // put an entry to create the bucket
+ userRegion.put("rebalance", "test");
+
+ PartitionedRegion fileRegion = (PartitionedRegion) regionfactory.create("fileRegion");
+ PartitionedRegion chunkRegion = (PartitionedRegion) regionfactory.create("chunkRegion");
+
+ RepositoryManager manager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, mapper, analyzer);
+ IndexRepository repo = manager.getRepository(userRegion, 0, null);
+ assertNotNull(repo);
+
+ repo.create("rebalance", "test");
+ repo.commit();
+
+ // close the region to simulate bucket movement. New node will create repo using data persisted by old region
+ userRegion.close();
+
+ userRegion = (PartitionedRegion) regionfactory.create("userRegion");
+ userRegion.put("rebalance", "test");
+ manager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, mapper, analyzer);
+ IndexRepository newRepo = manager.getRepository(userRegion, 0, null);
+
+ Assert.assertNotEquals(newRepo, repo);
+ }
+
+ @Test
+ public void recoverPersistentIndex() throws Exception {
+ LuceneService service = LuceneServiceProvider.get(cache);
+ service.createIndex(INDEX, REGION, Type1.fields);
+
+ RegionFactory<String, Type1> regionFactory = cache.createRegionFactory(RegionShortcut.PARTITION_PERSISTENT);
+ Region<String, Type1> userRegion = regionFactory.create(REGION);
+
+ Type1 value = new Type1("hello world", 1, 2L, 3.0, 4.0f);
+ userRegion.put("value1", value);
+ value = new Type1("test world", 1, 2L, 3.0, 4.0f);
+ userRegion.put("value2", value);
+ value = new Type1("lucene world", 1, 2L, 3.0, 4.0f);
+ userRegion.put("value3", value);
+
+ // TODO flush queue
+ TimeUnit.MILLISECONDS.sleep(500);
+
+ LuceneQuery<Integer, Type1> query = service.createLuceneQueryFactory().create(INDEX, REGION, "s:world");
+ LuceneQueryResults<Integer, Type1> results = query.search();
+ Assert.assertEquals(3, results.size());
+
+ // close the cache and all the regions
+ cache.close();
+
+ cache = new CacheFactory().set("mcast-port", "0").create();
+ service = LuceneServiceProvider.get(cache);
+ service.createIndex(INDEX, REGION, Type1.fields);
+ regionFactory = cache.createRegionFactory(RegionShortcut.PARTITION_PERSISTENT);
+ userRegion = regionFactory.create(REGION);
+
+ query = service.createLuceneQueryFactory().create(INDEX, REGION, "s:world");
+ results = query.search();
+ Assert.assertEquals(3, results.size());
+
+ String aeqId = LuceneServiceImpl.getUniqueIndexName(INDEX, REGION);
+ PartitionedRegion chunkRegion = (PartitionedRegion) cache.getRegion(aeqId + ".chunks");
+ assertNotNull(chunkRegion);
+ chunkRegion.destroyRegion();
+ PartitionedRegion fileRegion = (PartitionedRegion) cache.getRegion(aeqId + ".files");
+ assertNotNull(fileRegion);
+ fileRegion.destroyRegion();
+ userRegion.destroyRegion();
+ }
+
+ @Test
+ public void overflowRegionIndex() throws Exception {
+ String aeqId = LuceneServiceImpl.getUniqueIndexName(INDEX, REGION);
+
+ LuceneService service = LuceneServiceProvider.get(cache);
+ service.createIndex(INDEX, REGION, Type1.fields);
+
+ RegionFactory<String, Type1> regionFactory = cache.createRegionFactory(RegionShortcut.PARTITION);
+ EvictionAttributesImpl evicAttr = new EvictionAttributesImpl().setAction(EvictionAction.OVERFLOW_TO_DISK);
+ evicAttr.setAlgorithm(EvictionAlgorithm.LRU_ENTRY).setMaximum(1);
+ regionFactory.setEvictionAttributes(evicAttr);
+
+ PartitionedRegion userRegion = (PartitionedRegion) regionFactory.create(REGION);
+ Assert.assertEquals(0, userRegion.getDiskRegionStats().getNumOverflowOnDisk());
+
+ Type1 value = new Type1("hello world", 1, 2L, 3.0, 4.0f);
+ userRegion.put("value1", value);
+ value = new Type1("test world", 1, 2L, 3.0, 4.0f);
+ userRegion.put("value2", value);
+ value = new Type1("lucene world", 1, 2L, 3.0, 4.0f);
+ userRegion.put("value3", value);
+
+ // TODO flush queue
+ TimeUnit.MILLISECONDS.sleep(500);
+
+ PartitionedRegion fileRegion = (PartitionedRegion) cache.getRegion(aeqId + ".files");
+ assertNotNull(fileRegion);
+ PartitionedRegion chunkRegion = (PartitionedRegion) cache.getRegion(aeqId + ".chunks");
+ assertNotNull(chunkRegion);
+ Assert.assertTrue(0 < userRegion.getDiskRegionStats().getNumOverflowOnDisk());
+
+ LuceneQuery<Integer, Type1> query = service.createLuceneQueryFactory().create(INDEX, REGION, "s:world");
+ LuceneQueryResults<Integer, Type1> results = query.search();
+ Assert.assertEquals(3, results.size());
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0f783301/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneRebalanceJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneRebalanceJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneRebalanceJUnitTest.java
deleted file mode 100644
index afddb4a..0000000
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneRebalanceJUnitTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.gemstone.gemfire.cache.lucene.internal;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.PartitionAttributes;
-import com.gemstone.gemfire.cache.PartitionAttributesFactory;
-import com.gemstone.gemfire.cache.RegionFactory;
-import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
-import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
-import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer;
-import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.cache.PartitionedRegion;
-import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-
-@Category(IntegrationTest.class)
-public class LuceneRebalanceJUnitTest {
- String[] indexedFields = new String[] { "txt" };
- HeterogenousLuceneSerializer mapper = new HeterogenousLuceneSerializer(indexedFields);
- Analyzer analyzer = new StandardAnalyzer();
-
- @Before
- public void setup() {
- indexedFields = new String[] { "txt" };
- mapper = new HeterogenousLuceneSerializer(indexedFields);
- analyzer = new StandardAnalyzer();
- LuceneServiceImpl.registerDataSerializables();
- }
-
- @After
- public void tearDown() {
- Cache cache = GemFireCacheImpl.getInstance();
- if(cache != null) {
- cache.close();
- }
- }
-
- /**
- * Test what happens when a bucket is destroyed.
- */
- @Test
- public void recoverRepoInANewNode() throws BucketNotFoundException, IOException {
- Cache cache = new CacheFactory().set("mcast-port", "0").create();
- PartitionAttributes<String, String> attrs = new PartitionAttributesFactory().setTotalNumBuckets(1).create();
- RegionFactory<String, String> regionfactory = cache.createRegionFactory(RegionShortcut.PARTITION);
- regionfactory.setPartitionAttributes(attrs);
-
- PartitionedRegion userRegion = (PartitionedRegion) regionfactory.create("userRegion");
- // put an entry to create the bucket
- userRegion.put("rebalance", "test");
-
- PartitionedRegion fileRegion = (PartitionedRegion) regionfactory.create("fileRegion");
- PartitionedRegion chunkRegion = (PartitionedRegion) regionfactory.create("chunkRegion");
-
- RepositoryManager manager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, mapper, analyzer);
- IndexRepository repo = manager.getRepository(userRegion, 0, null);
- assertNotNull(repo);
-
- repo.create("rebalance", "test");
- repo.commit();
-
- // close the region to simulate bucket movement. New node will create repo using data persisted by old region
- userRegion.close();
-
- userRegion = (PartitionedRegion) regionfactory.create("userRegion");
- userRegion.put("rebalance", "test");
- manager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, mapper, analyzer);
- IndexRepository newRepo = manager.getRepository(userRegion, 0, null);
-
- Assert.assertNotEquals(newRepo, repo);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0f783301/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
index e5c1a4e..0bf1842 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
@@ -179,9 +179,6 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
return false;
return true;
}
-
-
-
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0f783301/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/Type1.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/Type1.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/Type1.java
index c5d2a5b..b82d0be 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/Type1.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/Type1.java
@@ -1,18 +1,25 @@
package com.gemstone.gemfire.cache.lucene.internal.repository.serializer;
+import java.io.Serializable;
+
/**
* A test type to get mapped to a lucene document
*/
-public class Type1 {
- private String s;
- private int i;
- private long l;
- private double d;
- private float f;
- private Object o = new Object();
+public class Type1 implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ public static final String[] fields = new String[] {"s", "i", "l", "d", "f"};
+
+ String s;
+ int i;
+ long l;
+ double d;
+ float f;
+ Serializable o = new Serializable() {
+ private static final long serialVersionUID = 1L;
+ };
public Type1(String s, int i, long l, double d, float f) {
- super();
this.s = s;
this.i = i;
this.l = l;
[10/50] [abbrv] incubator-geode git commit: add analyzer to
luceneIndexImpl add RepositoryManager into luceneIndexImpl
Posted by as...@apache.org.
add analyzer to luceneIndexImpl
add RepositoryManager into luceneIndexImpl
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9ca4e784
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9ca4e784
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9ca4e784
Branch: refs/heads/develop
Commit: 9ca4e784adec71acad6cac299229cfa493737608
Parents: c80e93b
Author: zhouxh <gz...@pivotal.io>
Authored: Mon Sep 21 17:41:22 2015 -0700
Committer: zhouxh <gz...@pivotal.io>
Committed: Wed Sep 23 09:30:01 2015 -0700
----------------------------------------------------------------------
.../gemfire/cache/lucene/LuceneIndex.java | 15 ---
.../LuceneIndexForPartitionedRegion.java | 10 +-
.../LuceneIndexForReplicatedRegion.java | 10 +-
.../cache/lucene/internal/LuceneIndexImpl.java | 42 ++++-----
.../lucene/internal/LuceneServiceImpl.java | 45 +++++++--
.../distributed/TopEntriesCollectorManager.java | 2 +-
.../internal/LuceneIndexImplJUnitTest.java | 93 +-----------------
.../internal/LuceneServiceImplJUnitTest.java | 99 +++++++++++++++++++-
.../TopEntriesFunctionCollectorJUnitTest.java | 2 +-
9 files changed, 162 insertions(+), 156 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ca4e784/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
index 04219ab..328eed8 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
@@ -48,23 +48,8 @@ public interface LuceneIndex {
public String[] getFieldNames();
/**
- * @return the indexed PDX field names in a Set
- */
- public String[] getPDXFieldNames();
-
- /**
* @return the field to analyzer map
*/
public Map<String, Analyzer> getFieldAnalyzerMap();
- /**
- * Returns a collection of {@link IndexRepository} instances hosting index data of the input list of bucket ids. The
- * bucket needs to be present on this member.
- *
- * @param ctx {@link RegionFunctionContext} function context. It's either a replicated region
- * or local buckets of a Partitioned region for which {@link IndexRepository}s needs to be discovered.
- * empty for all primary buckets are not on this member.
- * @return a collection of {@link IndexRepository} instances
- */
- public Collection<IndexRepository> getRepository(RegionFunctionContext ctx);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ca4e784/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
index f648c9a..cbab401 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
@@ -20,6 +20,7 @@ import com.gemstone.gemfire.cache.lucene.LuceneIndex;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
+import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.LuceneSerializer;
import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
@@ -33,9 +34,9 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
this.indexName = indexName;
this.regionPath = regionPath;
this.cache = cache;
- initialize();
}
+ @Override
public void initialize() {
if (!hasInitialized) {
/* create index region */
@@ -93,7 +94,7 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
}
// we will create RegionDirectorys on the fly when data coming
-
+ repositoryManager = new PartitionedRepositoryManager(dataRegion, (PartitionedRegion)fileRegion, (PartitionedRegion)chunkRegion, null, analyzer);
hasInitialized = true;
}
}
@@ -103,9 +104,4 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
}
- @Override
- public Collection<IndexRepository> getRepository(RegionFunctionContext ctx) {
- return null;
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ca4e784/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForReplicatedRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForReplicatedRegion.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForReplicatedRegion.java
index 8f93947..f160a6d 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForReplicatedRegion.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForReplicatedRegion.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -20,8 +21,6 @@ import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
/* wrapper of IndexWriter */
public class LuceneIndexForReplicatedRegion extends LuceneIndexImpl {
- IndexRepository indexRepository = null;
-
public LuceneIndexForReplicatedRegion(String indexName, String regionPath, Cache cache) {
// TODO Auto-generated constructor stub
}
@@ -42,11 +41,4 @@ public class LuceneIndexForReplicatedRegion extends LuceneIndexImpl {
return null;
}
- @Override
- public Collection<IndexRepository> getRepository(RegionFunctionContext ctx) {
- ArrayList<IndexRepository> repositories = new ArrayList<IndexRepository>();
- repositories.add(indexRepository);
- return repositories;
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ca4e784/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
index 9741775..799ef27 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
@@ -1,20 +1,16 @@
package com.gemstone.gemfire.cache.lucene.internal;
-import java.util.Collection;
import java.util.HashSet;
import java.util.Map;
import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
import com.gemstone.gemfire.cache.lucene.LuceneIndex;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
-import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
public abstract class LuceneIndexImpl implements LuceneIndex {
@@ -22,10 +18,9 @@ public abstract class LuceneIndexImpl implements LuceneIndex {
static private final boolean USE_FS = Boolean.getBoolean("lucene.useFileSystem");
protected HashSet<String> searchableFieldNames = new HashSet<String>();
- protected HashSet<String> searchablePDXFieldNames = new HashSet<String>();
+ protected RepositoryManager repositoryManager;
+ protected Analyzer analyzer;
- /* searchable fields should belong to a specific index
- */
Region<String, File> fileRegion;
Region<ChunkKey, byte[]> chunkRegion;
@@ -47,10 +42,6 @@ public abstract class LuceneIndexImpl implements LuceneIndex {
searchableFieldNames.add(field);
}
- protected void addSearchablePDXField(String field) {
- searchablePDXFieldNames.add(field);
- }
-
@Override
public String[] getFieldNames() {
String[] fieldNames = new String[searchableFieldNames.size()];
@@ -58,21 +49,28 @@ public abstract class LuceneIndexImpl implements LuceneIndex {
}
@Override
- public String[] getPDXFieldNames() {
- String[] pdxFieldNames = new String[searchablePDXFieldNames.size()];;
- return searchablePDXFieldNames.toArray(pdxFieldNames);
- }
-
- @Override
public Map<String, Analyzer> getFieldAnalyzerMap() {
// TODO Auto-generated method stub
// Will do that later: Gester
return null;
}
- @Override
- public Collection<IndexRepository> getRepository(RegionFunctionContext ctx) {
- return null;
+ public RepositoryManager getRepositoryManager() {
+ return this.repositoryManager;
+ }
+
+ public void setAnalyzer(Analyzer analyzer) {
+ if (analyzer == null) {
+ this.analyzer = new StandardAnalyzer();
+ } else {
+ this.analyzer = analyzer;
+ }
}
+ public Analyzer getAnalyzer() {
+ return this.analyzer;
+ }
+
+ protected void initialize() {
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ca4e784/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
index 0f10dac..1d7178a 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
@@ -4,7 +4,10 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import org.apache.logging.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
@@ -28,6 +31,7 @@ import com.gemstone.gemfire.internal.cache.extension.Extensible;
import com.gemstone.gemfire.internal.cache.extension.Extension;
import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
/**
* Implementation of LuceneService to create lucene index and query.
@@ -40,6 +44,8 @@ public class LuceneServiceImpl implements LuceneService, Extension<Cache> {
private final Cache cache;
private final HashMap<String, LuceneIndex> indexMap;
+
+ private static final Logger logger = LogService.getLogger();
public LuceneServiceImpl(final Cache cache) {
if (cache == null) {
@@ -64,26 +70,34 @@ public class LuceneServiceImpl implements LuceneService, Extension<Cache> {
@Override
public LuceneIndex createIndex(String indexName, String regionPath, String... fields) {
+ LuceneIndexImpl index = createIndexRegions(indexName, regionPath);
+ if (index == null) {
+ return null;
+ }
+ for (String field:fields) {
+ index.addSearchableField(field);
+ }
+ // for this API, set index to use the default StandardAnalyzer for each field
+ index.setAnalyzer(null);
+ index.initialize();
+ registerIndex(getUniqueIndexName(indexName, regionPath), index);
+ return index;
+ }
+
+ private LuceneIndexImpl createIndexRegions(String indexName, String regionPath) {
Region dataregion = this.cache.getRegion(regionPath);
if (dataregion == null) {
- cache.getLogger().info("Data region "+regionPath+" not found");
+ logger.info("Data region "+regionPath+" not found");
return null;
}
LuceneIndexImpl index = null;
if (dataregion instanceof PartitionedRegion) {
// partitioned region
index = new LuceneIndexForPartitionedRegion(indexName, regionPath, cache);
- for (String field:fields) {
- index.addSearchableField(field);
- index.addSearchablePDXField(field);
- }
- registerIndex(getUniqueIndexName(indexName, regionPath), index);
} else {
// replicated region
index = new LuceneIndexForReplicatedRegion(indexName, regionPath, cache);
- registerIndex(getUniqueIndexName(indexName, regionPath), index);
}
- // TODO add fields
return index;
}
@@ -99,8 +113,19 @@ public class LuceneServiceImpl implements LuceneService, Extension<Cache> {
@Override
public LuceneIndex createIndex(String indexName, String regionPath, Map<String, Analyzer> analyzerPerField) {
- // TODO Auto-generated method stub
- return null;
+ LuceneIndexImpl index = createIndexRegions(indexName, regionPath);
+ if (index == null) {
+ return null;
+ }
+
+ Analyzer analyzer = new PerFieldAnalyzerWrapper(new StandardAnalyzer(), analyzerPerField);
+ for (String field:analyzerPerField.keySet()) {
+ index.addSearchableField(field);
+ }
+ index.setAnalyzer(analyzer);
+ index.initialize();
+ registerIndex(getUniqueIndexName(indexName, regionPath), index);
+ return index;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ca4e784/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
index a0a209a..a5e891d 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
@@ -65,7 +65,7 @@ public class TopEntriesCollectorManager implements CollectorManager<TopEntriesCo
// The queue contains iterators for all bucket results. The queue puts the entry with the highest score at the head
// using score comparator.
PriorityQueue<List<EntryScore>> entryListsPriorityQueue;
- entryListsPriorityQueue = new PriorityQueue<List<EntryScore>>(11, Collections.reverseOrder(entryListComparator));
+ entryListsPriorityQueue = new PriorityQueue<List<EntryScore>>(Collections.reverseOrder(entryListComparator));
TopEntriesCollector mergedResult = new TopEntriesCollector(id, limit);
for (IndexResultCollector collector : collectors) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ca4e784/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImplJUnitTest.java
index 5dcaf9f..789f243 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImplJUnitTest.java
@@ -34,98 +34,11 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
/**
- * Test of the {@link IndexRepository} and everything below
- * it. This tests that we can save gemfire objects or PDXInstance
- * objects into a lucene index and search for those objects later.
+ * Test of the {@link LuceneIndexImpl} and everything below
+ * it. This tests creating lucene index with index regions and specify fields
+ * and analyzer.
*/
@Category(IntegrationTest.class)
public class LuceneIndexImplJUnitTest {
- private LuceneIndexImpl repo;
- private HeterogenousLuceneSerializer mapper;
- private StandardAnalyzer analyzer = new StandardAnalyzer();
- private IndexWriter writer;
-
- Cache cache = null;
- LuceneServiceImpl service = null;
-
- @Before
- public void setUp() throws IOException {
- if (cache == null) {
- getCache();
- }
- if (service == null) {
- service = (LuceneServiceImpl)LuceneServiceProvider.get(cache);
- }
-
- }
-
- private void getCache() {
- try {
- cache = CacheFactory.getAnyInstance();
- } catch (Exception e) {
- //ignore
- }
- if (null == cache) {
- cache = new CacheFactory().set("mcast-port", "0").set("log-level", "error").create();
- cache.getLogger().info("Created cache in test");
- }
- }
-
- private LocalRegion createPR(String regionName, boolean isSubRegion) {
- if (isSubRegion) {
- LocalRegion root = (LocalRegion)cache.createRegionFactory(RegionShortcut.REPLICATE).create("root");
- LocalRegion region = (LocalRegion)cache.createRegionFactory(RegionShortcut.PARTITION_PERSISTENT).
- createSubregion(root, regionName);
- return region;
- } else {
- LocalRegion root = (LocalRegion)cache.createRegionFactory(RegionShortcut.REPLICATE).create("root");
- LocalRegion region = (LocalRegion)cache.createRegionFactory(RegionShortcut.PARTITION_PERSISTENT).
- create(regionName);
- return region;
- }
- }
-
- private LocalRegion createRR(String regionName, boolean isSubRegion) {
- if (isSubRegion) {
- LocalRegion root = (LocalRegion)cache.createRegionFactory(RegionShortcut.REPLICATE).create("root");
- LocalRegion region = (LocalRegion)cache.createRegionFactory(RegionShortcut.REPLICATE_PERSISTENT).
- createSubregion(root, regionName);
- return region;
- } else {
- LocalRegion root = (LocalRegion)cache.createRegionFactory(RegionShortcut.REPLICATE).create("root");
- LocalRegion region = (LocalRegion)cache.createRegionFactory(RegionShortcut.REPLICATE_PERSISTENT).
- create(regionName);
- return region;
- }
- }
-
- @Test
- public void testCreateIndexForPR() throws IOException, ParseException {
- createPR("PR1", false);
- LuceneIndexImpl index1 = (LuceneIndexImpl)service.createIndex("index1", "PR1", "field1", "field2", "field3");
- assertTrue(index1 instanceof LuceneIndexForPartitionedRegion);
- LuceneIndexForPartitionedRegion index1PR = (LuceneIndexForPartitionedRegion)index1;
- assertEquals("index1", index1.getName());
- assertEquals("PR1", index1.getRegionPath());
- String[] fields1 = index1.getFieldNames();
- String[] pdxfields1 = index1.getPDXFieldNames();
- assertEquals(3, fields1.length);
- assertEquals(3, pdxfields1.length);
-
- final String fileRegionName = LuceneServiceImpl.getUniqueIndexName("index1", "PR1")+".files";
- final String chunkRegionName = LuceneServiceImpl.getUniqueIndexName("index1", "PR1")+".chunks";
- PartitionedRegion filePR = (PartitionedRegion)cache.getRegion(fileRegionName);
- PartitionedRegion chunkPR = (PartitionedRegion)cache.getRegion(chunkRegionName);
- assertTrue(filePR != null);
- assertTrue(chunkPR != null);
- }
-
- @Test
- public void testCreateIndexForRR() throws IOException, ParseException {
-// service.createIndex("index1", "RR1", "field1", "field2", "field3");
-
-
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ca4e784/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
index 2b890db..65fad5d 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
@@ -1,24 +1,45 @@
package com.gemstone.gemfire.cache.lucene.internal;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import java.io.IOException;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.queryparser.classic.ParseException;
import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.execute.Function;
import com.gemstone.gemfire.cache.execute.FunctionService;
+import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
import com.gemstone.gemfire.cache.lucene.internal.distributed.LuceneFunction;
+import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class LuceneServiceImplJUnitTest {
Cache cache;
-
+ private LuceneIndexImpl repo;
+ private HeterogenousLuceneSerializer mapper;
+ private StandardAnalyzer analyzer = new StandardAnalyzer();
+ private IndexWriter writer;
+ LuceneServiceImpl service = null;
+ private static final Logger logger = LogService.getLogger();
+
// lucene service will register query execution function on initialization
@Test
public void shouldRegisterQueryFunction() {
@@ -43,4 +64,80 @@ public class LuceneServiceImplJUnitTest {
cache = null;
}
}
+
+ private void getCache() {
+ try {
+ cache = CacheFactory.getAnyInstance();
+ } catch (Exception e) {
+ //ignore
+ }
+ if (null == cache) {
+ cache = createBasicCache();
+ }
+ }
+
+ private void getService() {
+ if (cache == null) {
+ getCache();
+ }
+ if (service == null) {
+ service = (LuceneServiceImpl)LuceneServiceProvider.get(cache);
+ }
+ }
+
+ private LocalRegion createPR(String regionName, boolean isSubRegion) {
+ if (isSubRegion) {
+ LocalRegion root = (LocalRegion)cache.createRegionFactory(RegionShortcut.REPLICATE).create("root");
+ LocalRegion region = (LocalRegion)cache.createRegionFactory(RegionShortcut.PARTITION_PERSISTENT).
+ createSubregion(root, regionName);
+ return region;
+ } else {
+ LocalRegion root = (LocalRegion)cache.createRegionFactory(RegionShortcut.REPLICATE).create("root");
+ LocalRegion region = (LocalRegion)cache.createRegionFactory(RegionShortcut.PARTITION_PERSISTENT).
+ create(regionName);
+ return region;
+ }
+ }
+
+ private LocalRegion createRR(String regionName, boolean isSubRegion) {
+ if (isSubRegion) {
+ LocalRegion root = (LocalRegion)cache.createRegionFactory(RegionShortcut.REPLICATE).create("root");
+ LocalRegion region = (LocalRegion)cache.createRegionFactory(RegionShortcut.REPLICATE_PERSISTENT).
+ createSubregion(root, regionName);
+ return region;
+ } else {
+ LocalRegion root = (LocalRegion)cache.createRegionFactory(RegionShortcut.REPLICATE).create("root");
+ LocalRegion region = (LocalRegion)cache.createRegionFactory(RegionShortcut.REPLICATE_PERSISTENT).
+ create(regionName);
+ return region;
+ }
+ }
+
+ @Test
+ public void testCreateIndexForPR() throws IOException, ParseException {
+ getService();
+ createPR("PR1", false);
+ LuceneIndexImpl index1 = (LuceneIndexImpl)service.createIndex("index1", "PR1", "field1", "field2", "field3");
+ assertTrue(index1 instanceof LuceneIndexForPartitionedRegion);
+ LuceneIndexForPartitionedRegion index1PR = (LuceneIndexForPartitionedRegion)index1;
+ assertEquals("index1", index1.getName());
+ assertEquals("PR1", index1.getRegionPath());
+ String[] fields1 = index1.getFieldNames();
+ assertEquals(3, fields1.length);
+
+ final String fileRegionName = LuceneServiceImpl.getUniqueIndexName("index1", "PR1")+".files";
+ final String chunkRegionName = LuceneServiceImpl.getUniqueIndexName("index1", "PR1")+".chunks";
+ PartitionedRegion filePR = (PartitionedRegion)cache.getRegion(fileRegionName);
+ PartitionedRegion chunkPR = (PartitionedRegion)cache.getRegion(chunkRegionName);
+ assertTrue(filePR != null);
+ assertTrue(chunkPR != null);
+ }
+
+ @Test
+ public void testCreateIndexForRR() throws IOException, ParseException {
+// service.createIndex("index1", "RR1", "field1", "field2", "field3");
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ca4e784/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
index c139e9f..a66f2fc 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
@@ -179,7 +179,7 @@ public class TopEntriesFunctionCollectorJUnitTest {
endGetResult.await(1, TimeUnit.SECONDS);
assertEquals(0, endGetResult.getCount());
- if (exception != null) throw exception.get();
+ throw exception.get();
}
@Test
[28/50] [abbrv] incubator-geode git commit: GEODE-11: Fix index
recovery after rebalance
Posted by as...@apache.org.
GEODE-11: Fix index recovery after rebalance
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/5dadbb4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/5dadbb4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/5dadbb4f
Branch: refs/heads/develop
Commit: 5dadbb4fe3f99980033671c7e1a6e13c3daff30c
Parents: 710aef8
Author: Ashvin Agrawal <as...@apache.org>
Authored: Thu Oct 8 22:00:53 2015 -0700
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Thu Oct 8 22:01:58 2015 -0700
----------------------------------------------------------------------
.../internal/PartitionedRepositoryManager.java | 3 -
.../lucene/internal/filesystem/FileSystem.java | 1 +
.../internal/LuceneRebalanceJUnitTest.java | 75 ++++++++++++++++++++
.../PartitionedRepositoryManagerJUnitTest.java | 27 +++----
.../LuceneFunctionReadPathDUnitTest.java | 5 +-
5 files changed, 92 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5dadbb4f/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
index 91ad82c..e276cff 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
@@ -17,12 +17,9 @@ import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepositoryImpl;
import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.LuceneSerializer;
-import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
import com.gemstone.gemfire.internal.cache.BucketRegion;
-import com.gemstone.gemfire.internal.cache.LocalDataSet;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
-import com.gemstone.gemfire.internal.cache.PartitionedRegionHelper;
import com.gemstone.gemfire.internal.cache.execute.InternalRegionFunctionContext;
import com.gemstone.gemfire.internal.util.concurrent.CopyOnWriteHashMap;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5dadbb4f/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystem.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystem.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystem.java
index 50b9f50..5e29437 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystem.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystem.java
@@ -90,6 +90,7 @@ public class FileSystem {
destFile.length = sourceFile.length;
destFile.modified = sourceFile.modified;
destFile.id = sourceFile.id;
+ updateFile(destFile);
// TODO - What is the state of the system if
// things crash in the middle of moving this file?
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5dadbb4f/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneRebalanceJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneRebalanceJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneRebalanceJUnitTest.java
new file mode 100644
index 0000000..478981f
--- /dev/null
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneRebalanceJUnitTest.java
@@ -0,0 +1,75 @@
+package com.gemstone.gemfire.cache.lucene.internal;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.PartitionAttributes;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.RegionFactory;
+import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
+import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
+import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer;
+import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
+import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
+@Category(UnitTest.class)
+public class LuceneRebalanceJUnitTest {
+ String[] indexedFields = new String[] { "txt" };
+ HeterogenousLuceneSerializer mapper = new HeterogenousLuceneSerializer(indexedFields);
+ Analyzer analyzer = new StandardAnalyzer();
+
+ @Before
+ public void setup() {
+ indexedFields = new String[] { "txt" };
+ mapper = new HeterogenousLuceneSerializer(indexedFields);
+ analyzer = new StandardAnalyzer();
+ LuceneServiceImpl.registerDataSerializables();
+ }
+
+ /**
+ * Test what happens when a bucket is destroyed.
+ */
+ @Test
+ public void recoverRepoInANewNode() throws BucketNotFoundException, IOException {
+ Cache cache = new CacheFactory().set("mcast-port", "0").create();
+ PartitionAttributes<String, String> attrs = new PartitionAttributesFactory().setTotalNumBuckets(1).create();
+ RegionFactory<String, String> regionfactory = cache.createRegionFactory(RegionShortcut.PARTITION);
+ regionfactory.setPartitionAttributes(attrs);
+
+ PartitionedRegion userRegion = (PartitionedRegion) regionfactory.create("userRegion");
+ // put an entry to create the bucket
+ userRegion.put("rebalance", "test");
+
+ PartitionedRegion fileRegion = (PartitionedRegion) regionfactory.create("fileRegion");
+ PartitionedRegion chunkRegion = (PartitionedRegion) regionfactory.create("chunkRegion");
+
+ RepositoryManager manager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, mapper, analyzer);
+ IndexRepository repo = manager.getRepository(userRegion, 0, null);
+ assertNotNull(repo);
+
+ repo.create("rebalance", "test");
+ repo.commit();
+
+ // close the region to simulate bucket movement. New node will create repo using data persisted by old region
+ userRegion.close();
+
+ userRegion = (PartitionedRegion) regionfactory.create("userRegion");
+ userRegion.put("rebalance", "test");
+ manager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, mapper, analyzer);
+ IndexRepository newRepo = manager.getRepository(userRegion, 0, null);
+
+ Assert.assertNotEquals(newRepo, repo);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5dadbb4f/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
index 1225aa1..23518e1 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
@@ -1,8 +1,10 @@
package com.gemstone.gemfire.cache.lucene.internal;
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
import java.io.IOException;
import java.util.Arrays;
@@ -30,7 +32,6 @@ import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.Heteroge
import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.LuceneSerializer;
import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
import com.gemstone.gemfire.internal.cache.BucketRegion;
-import com.gemstone.gemfire.internal.cache.LocalDataSet;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegion.RetryTimeKeeper;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
@@ -71,8 +72,8 @@ public class PartitionedRepositoryManagerJUnitTest {
public void getByKey() throws BucketNotFoundException, IOException {
PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer, new StandardAnalyzer());
- BucketRegion mockBucket0 = getMockBucket(0);
- BucketRegion mockBucket1 = getMockBucket(1);
+ setUpMockBucket(0);
+ setUpMockBucket(1);
IndexRepositoryImpl repo0 = (IndexRepositoryImpl) repoManager.getRepository(userRegion, 0, null);
IndexRepositoryImpl repo1 = (IndexRepositoryImpl) repoManager.getRepository(userRegion, 1, null);
@@ -95,7 +96,7 @@ public class PartitionedRepositoryManagerJUnitTest {
public void destroyBucket() throws BucketNotFoundException, IOException {
PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer, new StandardAnalyzer());
- BucketRegion mockBucket0 = getMockBucket(0);
+ setUpMockBucket(0);
IndexRepositoryImpl repo0 = (IndexRepositoryImpl) repoManager.getRepository(userRegion, 0, null);
@@ -107,7 +108,7 @@ public class PartitionedRepositoryManagerJUnitTest {
//Simulate rebalancing of a bucket by marking the old bucket is destroyed
//and creating a new bucket
Mockito.when(fileBucket0.isDestroyed()).thenReturn(true);
- mockBucket0 = getMockBucket(0);
+ setUpMockBucket(0);
IndexRepositoryImpl newRepo0 = (IndexRepositoryImpl) repoManager.getRepository(userRegion, 0, null);
assertNotEquals(repo0, newRepo0);
@@ -126,7 +127,7 @@ public class PartitionedRepositoryManagerJUnitTest {
@Test
public void createMissingBucket() throws BucketNotFoundException {
PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer, new StandardAnalyzer());
- BucketRegion mockBucket0 = getMockBucket(0);
+ setUpMockBucket(0);
Mockito.when(fileDataStore.getLocalBucketById(eq(0))).thenReturn(null);
@@ -146,8 +147,8 @@ public class PartitionedRepositoryManagerJUnitTest {
PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer, new StandardAnalyzer());
- BucketRegion mockBucket0 = getMockBucket(0);
- BucketRegion mockBucket1 = getMockBucket(1);
+ setUpMockBucket(0);
+ setUpMockBucket(1);
Set<Integer> buckets = new LinkedHashSet<Integer>(Arrays.asList(0, 1));
InternalRegionFunctionContext ctx = Mockito.mock(InternalRegionFunctionContext.class);
@@ -174,7 +175,7 @@ public class PartitionedRepositoryManagerJUnitTest {
public void getMissingBucketByRegion() throws BucketNotFoundException {
PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer, new StandardAnalyzer());
- BucketRegion mockBucket0 = getMockBucket(0);
+ setUpMockBucket(0);
Set<Integer> buckets = new LinkedHashSet<Integer>(Arrays.asList(0, 1));
@@ -191,7 +192,7 @@ public class PartitionedRepositoryManagerJUnitTest {
assertEquals(serializer, repo0.getSerializer());
}
- private BucketRegion getMockBucket(int id) {
+ private BucketRegion setUpMockBucket(int id) {
BucketRegion mockBucket = Mockito.mock(BucketRegion.class);
BucketRegion fileBucket = Mockito.mock(BucketRegion.class);
BucketRegion chunkBucket = Mockito.mock(BucketRegion.class);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5dadbb4f/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
index b78e9d6..6e44b72 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
@@ -135,9 +135,8 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
});
//Make sure the search still works
- // TODO: rebalance is broken when hooked with AEQ, disable the test for the time being
-// server1.invoke(executeSearch);
-// server2.invoke(executeSearch);
+ server1.invoke(executeSearch);
+ server2.invoke(executeSearch);
}
private static void putInRegion(Region<Object, Object> region, Object key, Object value) throws BucketNotFoundException, IOException {
[15/50] [abbrv] incubator-geode git commit: Fixing a bug in
LuceneQueryResultsImpl with pageSize=0
Posted by as...@apache.org.
Fixing a bug in LuceneQueryResultsImpl with pageSize=0
When pageSize=0, the results should be returned as a single page.
Instead it was returning an empty page.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/218f705f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/218f705f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/218f705f
Branch: refs/heads/develop
Commit: 218f705f83d5de94e1928b7183c947bac79dc69e
Parents: 3e743df
Author: Dan Smith <up...@apache.org>
Authored: Wed Sep 23 16:55:57 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Wed Sep 23 16:55:57 2015 -0700
----------------------------------------------------------------------
.../lucene/internal/LuceneQueryResultsImpl.java | 2 +-
.../LuceneQueryResultsImplJUnitTest.java | 43 +++++++++++++-------
2 files changed, 30 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/218f705f/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImpl.java
index 93a7f9d..d77dbc5 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImpl.java
@@ -46,7 +46,7 @@ public class LuceneQueryResultsImpl<K,V> implements LuceneQueryResults<K,V> {
public LuceneQueryResultsImpl(List<EntryScore> hits, Region<K,V> userRegion, int pageSize) {
this.hits = hits;
this.userRegion = userRegion;
- this.pageSize = pageSize;
+ this.pageSize = pageSize == 0 ? Integer.MAX_VALUE : pageSize;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/218f705f/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImplJUnitTest.java
index 000c01e..7009255 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImplJUnitTest.java
@@ -27,6 +27,7 @@ public class LuceneQueryResultsImplJUnitTest {
private List<EntryScore> hits;
private List<LuceneResultStruct> expected = new ArrayList<LuceneResultStruct>();
+ private Region<String, String> userRegion;
@Before
public void setUp() {
@@ -36,21 +37,8 @@ public class LuceneQueryResultsImplJUnitTest {
hits.add(new EntryScore("key_" + i, i));
expected.add(new LuceneResultStructImpl<String, String>("key_" + i, "value_" + i, i));
}
- }
-
- @Test
- public void testMaxStore() {
-
- hits.set(5, new EntryScore("key_5", 502));
- LuceneQueryResultsImpl<String, String> results = new LuceneQueryResultsImpl<String, String>(hits, null, 5);
-
- assertEquals(502, results.getMaxScore(), 0.1f);
- }
-
- @Test
- public void testPagination() {
- Region<String, String> userRegion = Mockito.mock(Region.class);
+ userRegion = Mockito.mock(Region.class);
Mockito.when(userRegion.getAll(Mockito.anyCollection())).thenAnswer(new Answer() {
@@ -65,8 +53,20 @@ public class LuceneQueryResultsImplJUnitTest {
return results;
}
});
+ }
+
+ @Test
+ public void testMaxStore() {
+
+ hits.set(5, new EntryScore("key_5", 502));
+ LuceneQueryResultsImpl<String, String> results = new LuceneQueryResultsImpl<String, String>(hits, null, 5);
+ assertEquals(502, results.getMaxScore(), 0.1f);
+ }
+
+ @Test
+ public void testPagination() {
LuceneQueryResultsImpl<String, String> results = new LuceneQueryResultsImpl<String, String>(hits, userRegion, 10);
assertEquals(23, results.size());
@@ -88,5 +88,20 @@ public class LuceneQueryResultsImplJUnitTest {
assertFalse(results.hasNextPage());
assertNull(results.getNextPage());
}
+
+ @Test
+ public void testNoPagination() {
+ LuceneQueryResultsImpl<String, String> results = new LuceneQueryResultsImpl<String, String>(hits, userRegion, 0);
+
+ assertEquals(23, results.size());
+
+ assertTrue(results.hasNextPage());
+
+ List<LuceneResultStruct<String, String>> next = results.getNextPage();
+ assertEquals(expected, next);
+
+ assertFalse(results.hasNextPage());
+ assertNull(results.getNextPage());
+ }
}
[50/50] [abbrv] incubator-geode git commit: Merge branch
'feature/GEODE-11' into develop
Posted by as...@apache.org.
Merge branch 'feature/GEODE-11' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/05e047ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/05e047ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/05e047ca
Branch: refs/heads/develop
Commit: 05e047cafdfa76100b92ae2239ef1f839552f5ea
Parents: 79aa0be 3af1540
Author: Ashvin Agrawal <as...@apache.org>
Authored: Wed Nov 11 13:22:31 2015 -0800
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Wed Nov 11 13:22:31 2015 -0800
----------------------------------------------------------------------
gemfire-core/build.gradle | 4 -
.../gemstone/gemfire/cache/GemFireCache.java | 7 -
.../internal/AsyncEventQueueFactoryImpl.java | 9 +-
.../internal/AsyncEventQueueImpl.java | 3 +
.../gemfire/cache/lucene/LuceneIndex.java | 59 --
.../gemfire/cache/lucene/LuceneQuery.java | 53 --
.../cache/lucene/LuceneQueryFactory.java | 137 -----
.../cache/lucene/LuceneQueryResults.java | 45 --
.../cache/lucene/LuceneResultStruct.java | 75 ---
.../gemfire/cache/lucene/LuceneService.java | 119 ----
.../cache/lucene/LuceneServiceFactory.java | 30 -
.../cache/lucene/LuceneServiceProvider.java | 52 --
.../cache/lucene/internal/LuceneIndexImpl.java | 70 ---
.../lucene/internal/LuceneQueryFactoryImpl.java | 104 ----
.../cache/lucene/internal/LuceneQueryImpl.java | 78 ---
.../lucene/internal/LuceneQueryResultsImpl.java | 82 ---
.../lucene/internal/LuceneResultStructImpl.java | 61 --
.../internal/LuceneServiceFactoryImpl.java | 32 -
.../lucene/internal/LuceneServiceImpl.java | 106 ----
.../internal/DataSerializableFixedID.java | 9 +
.../gemfire/internal/cache/BucketRegion.java | 2 +-
.../gemfire/internal/cache/CacheService.java | 26 +
.../internal/cache/GemFireCacheImpl.java | 79 ++-
.../gemfire/internal/cache/InternalCache.java | 5 +-
.../gemfire/internal/cache/LocalRegion.java | 8 +-
.../cache/PartitionedRegionDataStore.java | 2 +-
.../gemfire/internal/cache/RegionListener.java | 30 +
.../cache/extension/SimpleExtensionPoint.java | 2 +-
.../cache/wan/AbstractGatewaySender.java | 7 +
.../cache/wan/GatewaySenderAttributes.java | 5 +
.../internal/cache/xmlcache/CacheCreation.java | 14 +-
.../cache/xmlcache/DefaultEntityResolver2.java | 2 +-
.../cache/xmlcache/GeodeEntityResolver.java | 49 ++
.../cache/xmlcache/PivotalEntityResolver.java | 2 +-
.../util/concurrent/CopyOnWriteHashMap.java | 46 +-
.../util/concurrent/CopyOnWriteWeakHashMap.java | 12 +
.../services/org.xml.sax.ext.EntityResolver2 | 1 +
.../internal/cache/CacheServiceJUnitTest.java | 43 ++
.../internal/cache/MockCacheService.java | 8 +
.../internal/cache/MockCacheServiceImpl.java | 23 +
.../internal/cache/RegionListenerJUnitTest.java | 47 ++
.../mock/DestroyMockCacheExtensionFunction.java | 2 +-
.../concurrent/CopyOnWriteHashMapJUnitTest.java | 496 ++++++++++++++++
...gemstone.gemfire.internal.cache.CacheService | 1 +
.../codeAnalysis/sanctionedSerializables.txt | 2 +-
gemfire-lucene/build.gradle | 29 +
.../gemfire/cache/lucene/LuceneIndex.java | 60 ++
.../gemfire/cache/lucene/LuceneQuery.java | 48 ++
.../cache/lucene/LuceneQueryFactory.java | 101 ++++
.../cache/lucene/LuceneQueryProvider.java | 45 ++
.../cache/lucene/LuceneQueryResults.java | 58 ++
.../cache/lucene/LuceneResultStruct.java | 62 ++
.../gemfire/cache/lucene/LuceneService.java | 125 ++++
.../cache/lucene/LuceneServiceProvider.java | 46 ++
.../lucene/internal/InternalLuceneIndex.java | 29 +
.../lucene/internal/InternalLuceneService.java | 29 +
.../lucene/internal/LuceneEventListener.java | 99 ++++
.../LuceneIndexForPartitionedRegion.java | 136 +++++
.../LuceneIndexForReplicatedRegion.java | 48 ++
.../cache/lucene/internal/LuceneIndexImpl.java | 107 ++++
.../lucene/internal/LuceneQueryFactoryImpl.java | 67 +++
.../cache/lucene/internal/LuceneQueryImpl.java | 87 +++
.../lucene/internal/LuceneQueryResultsImpl.java | 120 ++++
.../lucene/internal/LuceneResultStructImpl.java | 94 +++
.../lucene/internal/LuceneServiceImpl.java | 273 +++++++++
.../internal/PartitionedRepositoryManager.java | 163 ++++++
.../lucene/internal/StringQueryProvider.java | 106 ++++
.../internal/directory/FileIndexInput.java | 131 +++++
.../internal/directory/RegionDirectory.java | 119 ++++
.../internal/distributed/CollectorManager.java | 55 ++
.../lucene/internal/distributed/EntryScore.java | 82 +++
.../internal/distributed/LuceneFunction.java | 137 +++++
.../distributed/LuceneFunctionContext.java | 115 ++++
.../lucene/internal/distributed/TopEntries.java | 133 +++++
.../distributed/TopEntriesCollector.java | 102 ++++
.../distributed/TopEntriesCollectorManager.java | 178 ++++++
.../TopEntriesFunctionCollector.java | 163 ++++++
.../lucene/internal/filesystem/ChunkKey.java | 123 ++++
.../cache/lucene/internal/filesystem/File.java | 155 +++++
.../internal/filesystem/FileInputStream.java | 166 ++++++
.../internal/filesystem/FileOutputStream.java | 103 ++++
.../lucene/internal/filesystem/FileSystem.java | 156 +++++
.../filesystem/SeekableInputStream.java | 43 ++
.../internal/repository/IndexRepository.java | 74 +++
.../repository/IndexRepositoryImpl.java | 113 ++++
.../repository/IndexResultCollector.java | 47 ++
.../internal/repository/RepositoryManager.java | 45 ++
.../HeterogenousLuceneSerializer.java | 83 +++
.../repository/serializer/LuceneSerializer.java | 35 ++
.../serializer/PdxLuceneSerializer.java | 47 ++
.../serializer/ReflectionLuceneSerializer.java | 74 +++
.../repository/serializer/SerializerUtil.java | 168 ++++++
.../internal/xml/LuceneIndexCreation.java | 111 ++++
.../internal/xml/LuceneIndexXmlGenerator.java | 65 +++
.../internal/xml/LuceneServiceXmlGenerator.java | 39 ++
.../lucene/internal/xml/LuceneXmlConstants.java | 31 +
.../lucene/internal/xml/LuceneXmlParser.java | 97 ++++
.../lucene/lucene-1.0.xsd | 42 ++
...gemstone.gemfire.internal.cache.CacheService | 1 +
...ne.gemfire.internal.cache.xmlcache.XmlParser | 1 +
.../internal/LuceneEventListenerJUnitTest.java | 109 ++++
.../LuceneIndexRecoveryHAJUnitTest.java | 201 +++++++
.../LuceneQueryFactoryImplJUnitTest.java | 50 ++
.../internal/LuceneQueryImplJUnitTest.java | 123 ++++
.../LuceneQueryResultsImplJUnitTest.java | 126 ++++
.../LuceneResultStructImpJUnitTest.java | 51 ++
.../internal/LuceneServiceImplJUnitTest.java | 226 ++++++++
.../PartitionedRepositoryManagerJUnitTest.java | 230 ++++++++
.../internal/StringQueryProviderJUnitTest.java | 90 +++
.../directory/RegionDirectoryJUnitTest.java | 56 ++
.../DistributedScoringJUnitTest.java | 155 +++++
.../distributed/EntryScoreJUnitTest.java | 40 ++
.../LuceneFunctionContextJUnitTest.java | 64 ++
.../distributed/LuceneFunctionJUnitTest.java | 423 ++++++++++++++
.../LuceneFunctionReadPathDUnitTest.java | 241 ++++++++
.../TopEntriesCollectorJUnitTest.java | 139 +++++
.../TopEntriesFunctionCollectorJUnitTest.java | 323 +++++++++++
.../distributed/TopEntriesJUnitTest.java | 146 +++++
.../internal/filesystem/ChunkKeyJUnitTest.java | 48 ++
.../internal/filesystem/FileJUnitTest.java | 53 ++
.../filesystem/FileSystemJUnitTest.java | 578 +++++++++++++++++++
...IndexRepositoryImplJUnitPerformanceTest.java | 437 ++++++++++++++
.../IndexRepositoryImplJUnitTest.java | 208 +++++++
.../HeterogenousLuceneSerializerJUnitTest.java | 90 +++
.../serializer/PdxFieldMapperJUnitTest.java | 85 +++
.../ReflectionFieldMapperJUnitTest.java | 85 +++
.../internal/repository/serializer/Type1.java | 48 ++
.../internal/repository/serializer/Type2.java | 34 ++
...neIndexXmlGeneratorIntegrationJUnitTest.java | 78 +++
.../xml/LuceneIndexXmlGeneratorJUnitTest.java | 80 +++
...uceneIndexXmlParserIntegrationJUnitTest.java | 107 ++++
.../xml/LuceneIndexXmlParserJUnitTest.java | 72 +++
...erIntegrationJUnitTest.createIndex.cache.xml | 24 +
...serIntegrationJUnitTest.parseIndex.cache.xml | 24 +
gradle/dependency-versions.properties | 2 +-
settings.gradle | 1 +
136 files changed, 10705 insertions(+), 1157 deletions(-)
----------------------------------------------------------------------
[11/50] [abbrv] incubator-geode git commit: Removing ResultType from
LuceneQueryFactory
Posted by as...@apache.org.
Removing ResultType from LuceneQueryFactory
ResultType is not necessary since there is no performance gain to be had
by not including the key or score, and the presence of the value is
controlled by setProjectionFields.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/db5db7a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/db5db7a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/db5db7a1
Branch: refs/heads/develop
Commit: db5db7a17c2c301ab35a8bc0c23fe6be8cc0741c
Parents: 9ca4e78
Author: Dan Smith <up...@apache.org>
Authored: Wed Sep 23 11:10:11 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Wed Sep 23 11:10:11 2015 -0700
----------------------------------------------------------------------
.../gemfire/cache/lucene/LuceneQuery.java | 7 ------
.../cache/lucene/LuceneQueryFactory.java | 26 --------------------
.../lucene/internal/LuceneQueryFactoryImpl.java | 14 +----------
.../cache/lucene/internal/LuceneQueryImpl.java | 10 +-------
4 files changed, 2 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/db5db7a1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
index 57ce386..548bb00 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
@@ -1,7 +1,5 @@
package com.gemstone.gemfire.cache.lucene;
-import com.gemstone.gemfire.cache.lucene.LuceneQueryFactory.ResultType;
-
/**
* Provides wrapper object of Lucene's Query object and execute the search.
* <p>Instances of this interface are created using
@@ -25,11 +23,6 @@ public interface LuceneQuery {
public int getLimit();
/**
- * Get result types setting of current query.
- */
- public ResultType[] getResultTypes();
-
- /**
* Get projected fields setting of current query.
*/
public String[] getProjectedFieldNames();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/db5db7a1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
index 4bb8180..1775b40 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
@@ -25,24 +25,6 @@ public interface LuceneQueryFactory {
*/
public static final int DEFAULT_PAGESIZE = 0;
- public enum ResultType {
- /**
- * Query results only contain value, which is the default setting.
- * If field projection is specified, use projected fields' values instead of whole domain object
- */
- VALUE,
-
- /**
- * Query results contain score
- */
- SCORE,
-
- /**
- * Query results contain key
- */
- KEY
- };
-
/**
* Set page size for a query result. The default page size is 0 which means no pagination.
* If specified negative value, throw IllegalArgumentException
@@ -60,14 +42,6 @@ public interface LuceneQueryFactory {
LuceneQueryFactory setResultLimit(int limit);
/**
- * set weather to include SCORE, KEY in result
- *
- * @param resultTypes
- * @return itself
- */
- LuceneQueryFactory setResultTypes(ResultType... resultTypes);
-
- /**
* Set a list of fields for result projection.
*
* @param fieldNames
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/db5db7a1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
index 8bb18e8..f5d38bc 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
@@ -17,7 +17,6 @@ import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider;
public class LuceneQueryFactoryImpl implements LuceneQueryFactory {
private int limit_attr = DEFAULT_LIMIT;
private int pageSize_attr = DEFAULT_PAGESIZE;
- private Set<ResultType> resultType_attr = new HashSet<ResultType>();
private Set<String> projection_fields_attr = new HashSet<String>();
/* reference to the index. One index could have multiple Queries, but one Query must belong
@@ -38,22 +37,11 @@ public class LuceneQueryFactoryImpl implements LuceneQueryFactory {
}
@Override
- public LuceneQueryFactory setResultTypes(ResultType... resultTypes) {
- if (resultTypes != null) {
- for (ResultType resultType:resultTypes) {
- this.resultType_attr.add(resultType);
- }
- }
- return this;
- }
-
- @Override
public LuceneQuery create(String indexName, String regionName,
String queryString, Analyzer analyzer) throws ParseException {
QueryParser parser = new QueryParser(null, analyzer);
Query query = parser.parse(queryString);
- LuceneQueryImpl luceneQuery = new LuceneQueryImpl(indexName, regionName, limit_attr, pageSize_attr,
- resultType_attr, projection_fields_attr, query);
+ LuceneQueryImpl luceneQuery = new LuceneQueryImpl(indexName, regionName, limit_attr, pageSize_attr, projection_fields_attr, query);
return luceneQuery;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/db5db7a1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
index 27f0ea6..e93692f 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
@@ -6,7 +6,6 @@ import org.apache.lucene.search.Query;
import com.gemstone.gemfire.cache.lucene.LuceneQuery;
import com.gemstone.gemfire.cache.lucene.LuceneQueryFactory;
-import com.gemstone.gemfire.cache.lucene.LuceneQueryFactory.ResultType;
import com.gemstone.gemfire.cache.lucene.LuceneQueryResults;
public class LuceneQueryImpl implements LuceneQuery {
@@ -14,7 +13,6 @@ public class LuceneQueryImpl implements LuceneQuery {
private int pageSize = LuceneQueryFactory.DEFAULT_PAGESIZE;
private String indexName;
private String regionName;
- private Set<ResultType> resultTypes;
// The projected fields are local to a specific index per Query object.
private Set<String> projectedFieldNames;
@@ -22,13 +20,12 @@ public class LuceneQueryImpl implements LuceneQuery {
/* the lucene Query object to be wrapped here */
private Query query;
- LuceneQueryImpl(String indexName, String regionName, int limit, int pageSize, Set<ResultType> resultTypes,
+ LuceneQueryImpl(String indexName, String regionName, int limit, int pageSize,
Set<String> projectionFieldNames, Query query) {
this.indexName = indexName;
this.regionName = regionName;
this.limit = limit;
this.pageSize = pageSize;
- this.resultTypes = resultTypes;
this.projectedFieldNames = projectionFieldNames;
this.query = query;
}
@@ -50,11 +47,6 @@ public class LuceneQueryImpl implements LuceneQuery {
}
@Override
- public ResultType[] getResultTypes() {
- return (ResultType[])this.resultTypes.toArray();
- }
-
- @Override
public String[] getProjectedFieldNames() {
return (String[])this.projectedFieldNames.toArray();
}
[42/50] [abbrv] incubator-geode git commit: Merge remote-tracking
branch 'origin/develop' into feature/GEODE-11
Posted by as...@apache.org.
Merge remote-tracking branch 'origin/develop' into feature/GEODE-11
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f189ff52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f189ff52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f189ff52
Branch: refs/heads/develop
Commit: f189ff52dbf61c0f718a33aaa0ea92471309842c
Parents: b59c57d dc5d343
Author: Ashvin Agrawal <as...@apache.org>
Authored: Thu Nov 5 22:46:47 2015 -0800
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Thu Nov 5 22:46:47 2015 -0800
----------------------------------------------------------------------
README.md | 9 +
build.gradle | 68 +-
dev-tools/docker/base/Dockerfile | 54 +
dev-tools/docker/base/build-base-docker.sh | 30 +
dev-tools/docker/compile/Dockerfile | 21 +
.../docker/compile/start-compile-docker.sh | 62 +
docker/Dockerfile | 56 +-
docker/README.md | 6 +-
docker/build-runtime-docker.sh | 32 +
gemfire-assembly/build.gradle | 19 +-
gemfire-assembly/src/main/dist/bin/gfsh | 2 +-
gemfire-assembly/src/main/dist/bin/gfsh.bat | 2 +-
gemfire-common/build.gradle | 3 +
.../gemfire/annotations/Experimental.java | 40 +
.../annotations/ExperimentalJUnitTest.java | 183 ++
.../ClassInExperimentalPackage.java | 11 +
.../experimentalpackage/package-info.java | 11 +
.../ClassInNonExperimentalPackage.java | 11 +
.../nonexperimentalpackage/package-info.java | 8 +
gemfire-core/build.gradle | 122 +-
.../internal/ra/GFConnectionFactoryImpl.java | 21 +-
.../gemfire/internal/ra/GFConnectionImpl.java | 21 +-
.../internal/ra/spi/JCALocalTransaction.java | 21 +-
.../internal/ra/spi/JCAManagedConnection.java | 21 +-
.../ra/spi/JCAManagedConnectionFactory.java | 21 +-
.../ra/spi/JCAManagedConnectionMetaData.java | 21 +-
gemfire-core/src/jca/ra.xml | 2 +-
.../com/gemstone/gemfire/CancelCriterion.java | 21 +-
.../com/gemstone/gemfire/CancelException.java | 21 +-
.../gemstone/gemfire/CanonicalInstantiator.java | 21 +-
.../com/gemstone/gemfire/CopyException.java | 21 +-
.../java/com/gemstone/gemfire/CopyHelper.java | 21 +-
.../com/gemstone/gemfire/DataSerializable.java | 21 +-
.../com/gemstone/gemfire/DataSerializer.java | 21 +-
.../main/java/com/gemstone/gemfire/Delta.java | 21 +-
.../gemfire/DeltaSerializationException.java | 21 +-
.../gemfire/ForcedDisconnectException.java | 21 +-
.../gemstone/gemfire/GemFireCacheException.java | 21 +-
.../gemfire/GemFireCheckedException.java | 21 +-
.../gemfire/GemFireConfigException.java | 21 +-
.../com/gemstone/gemfire/GemFireException.java | 21 +-
.../gemstone/gemfire/GemFireIOException.java | 21 +-
.../gemstone/gemfire/GemFireRethrowable.java | 21 +-
.../gemfire/IncompatibleSystemException.java | 21 +-
.../java/com/gemstone/gemfire/Instantiator.java | 21 +-
.../gemstone/gemfire/InternalGemFireError.java | 21 +-
.../gemfire/InternalGemFireException.java | 21 +-
.../gemstone/gemfire/InvalidDeltaException.java | 21 +-
.../gemstone/gemfire/InvalidValueException.java | 21 +-
.../gemfire/InvalidVersionException.java | 16 +
.../com/gemstone/gemfire/LicenseException.java | 21 +-
.../java/com/gemstone/gemfire/LogWriter.java | 21 +-
.../com/gemstone/gemfire/NoSystemException.java | 21 +-
.../gemfire/OutOfOffHeapMemoryException.java | 21 +-
.../gemfire/SerializationException.java | 21 +-
.../gemstone/gemfire/StatisticDescriptor.java | 21 +-
.../java/com/gemstone/gemfire/Statistics.java | 21 +-
.../com/gemstone/gemfire/StatisticsFactory.java | 21 +-
.../com/gemstone/gemfire/StatisticsType.java | 21 +-
.../gemstone/gemfire/StatisticsTypeFactory.java | 21 +-
.../gemfire/SystemConnectException.java | 21 +-
.../com/gemstone/gemfire/SystemFailure.java | 21 +-
.../gemfire/SystemIsRunningException.java | 21 +-
.../gemfire/ThreadInterruptedException.java | 18 +-
.../com/gemstone/gemfire/ToDataException.java | 21 +-
.../gemfire/UncreatedSystemException.java | 21 +-
.../gemstone/gemfire/UnmodifiableException.java | 21 +-
.../gemfire/UnstartedSystemException.java | 21 +-
.../com/gemstone/gemfire/admin/AdminConfig.java | 21 +-
.../gemfire/admin/AdminDistributedSystem.java | 21 +-
.../admin/AdminDistributedSystemFactory.java | 21 +-
.../gemstone/gemfire/admin/AdminException.java | 21 +-
.../gemfire/admin/AdminXmlException.java | 21 +-
.../java/com/gemstone/gemfire/admin/Alert.java | 21 +-
.../com/gemstone/gemfire/admin/AlertLevel.java | 21 +-
.../gemstone/gemfire/admin/AlertListener.java | 21 +-
.../gemstone/gemfire/admin/BackupStatus.java | 21 +-
.../admin/CacheDoesNotExistException.java | 21 +-
.../gemfire/admin/CacheHealthConfig.java | 21 +-
.../com/gemstone/gemfire/admin/CacheServer.java | 21 +-
.../gemfire/admin/CacheServerConfig.java | 21 +-
.../com/gemstone/gemfire/admin/CacheVm.java | 21 +-
.../gemstone/gemfire/admin/CacheVmConfig.java | 21 +-
.../gemfire/admin/ConfigurationParameter.java | 21 +-
.../gemfire/admin/DistributedSystemConfig.java | 21 +-
.../admin/DistributedSystemHealthConfig.java | 21 +-
.../gemfire/admin/DistributionLocator.java | 21 +-
.../admin/DistributionLocatorConfig.java | 21 +-
.../gemstone/gemfire/admin/GemFireHealth.java | 21 +-
.../gemfire/admin/GemFireHealthConfig.java | 21 +-
.../gemfire/admin/GemFireMemberStatus.java | 21 +-
.../gemstone/gemfire/admin/ManagedEntity.java | 21 +-
.../gemfire/admin/ManagedEntityConfig.java | 21 +-
.../gemfire/admin/MemberHealthConfig.java | 21 +-
.../admin/OperationCancelledException.java | 21 +-
.../gemfire/admin/RegionNotFoundException.java | 21 +-
.../gemfire/admin/RegionSubRegionSnapshot.java | 21 +-
.../gemfire/admin/RuntimeAdminException.java | 21 +-
.../com/gemstone/gemfire/admin/Statistic.java | 21 +-
.../gemfire/admin/StatisticResource.java | 21 +-
.../gemstone/gemfire/admin/SystemMember.java | 21 +-
.../gemfire/admin/SystemMemberBridgeServer.java | 21 +-
.../gemfire/admin/SystemMemberCache.java | 21 +-
.../gemfire/admin/SystemMemberCacheEvent.java | 16 +
.../admin/SystemMemberCacheListener.java | 21 +-
.../gemfire/admin/SystemMemberCacheServer.java | 21 +-
.../gemfire/admin/SystemMemberRegion.java | 21 +-
.../gemfire/admin/SystemMemberRegionEvent.java | 16 +
.../gemfire/admin/SystemMemberType.java | 21 +-
.../gemfire/admin/SystemMembershipEvent.java | 21 +-
.../gemfire/admin/SystemMembershipListener.java | 21 +-
.../UnmodifiableConfigurationException.java | 21 +-
.../admin/internal/AbstractHealthEvaluator.java | 21 +-
.../internal/AdminDistributedSystemImpl.java | 21 +-
.../admin/internal/BackupStatusImpl.java | 21 +-
.../admin/internal/CacheHealthConfigImpl.java | 21 +-
.../admin/internal/CacheHealthEvaluator.java | 21 +-
.../admin/internal/CacheServerConfigImpl.java | 21 +-
.../gemfire/admin/internal/CacheServerImpl.java | 21 +-
.../internal/ConfigurationParameterImpl.java | 21 +-
.../ConfigurationParameterListener.java | 21 +-
.../DisabledManagedEntityController.java | 21 +-
.../internal/DistributedSystemConfigImpl.java | 21 +-
.../DistributedSystemHealthConfigImpl.java | 21 +-
.../DistributedSystemHealthEvaluator.java | 21 +-
.../DistributedSystemHealthMonitor.java | 21 +-
.../internal/DistributionLocatorConfigImpl.java | 21 +-
.../admin/internal/DistributionLocatorImpl.java | 21 +-
.../EnabledManagedEntityController.java | 21 +-
.../admin/internal/FinishBackupRequest.java | 21 +-
.../admin/internal/FinishBackupResponse.java | 21 +-
.../admin/internal/FlushToDiskRequest.java | 21 +-
.../admin/internal/FlushToDiskResponse.java | 21 +-
.../admin/internal/GemFireHealthConfigImpl.java | 21 +-
.../admin/internal/GemFireHealthEvaluator.java | 21 +-
.../admin/internal/GemFireHealthImpl.java | 21 +-
.../gemfire/admin/internal/InetAddressUtil.java | 21 +-
.../admin/internal/InternalManagedEntity.java | 21 +-
.../gemfire/admin/internal/LogCollator.java | 21 +-
.../admin/internal/ManagedEntityConfigImpl.java | 21 +-
.../admin/internal/ManagedEntityConfigXml.java | 21 +-
.../ManagedEntityConfigXmlGenerator.java | 21 +-
.../internal/ManagedEntityConfigXmlParser.java | 21 +-
.../admin/internal/ManagedEntityController.java | 21 +-
.../ManagedEntityControllerFactory.java | 21 +-
.../admin/internal/ManagedSystemMemberImpl.java | 21 +-
.../admin/internal/MemberHealthConfigImpl.java | 21 +-
.../admin/internal/MemberHealthEvaluator.java | 21 +-
.../admin/internal/PrepareBackupRequest.java | 21 +-
.../admin/internal/PrepareBackupResponse.java | 21 +-
.../gemfire/admin/internal/StatisticImpl.java | 21 +-
.../admin/internal/StatisticResourceImpl.java | 20 +-
.../internal/SystemMemberBridgeServerImpl.java | 21 +-
.../internal/SystemMemberCacheEventImpl.java | 21 +-
.../SystemMemberCacheEventProcessor.java | 21 +-
.../admin/internal/SystemMemberCacheImpl.java | 21 +-
.../admin/internal/SystemMemberImpl.java | 21 +-
.../internal/SystemMemberRegionEventImpl.java | 21 +-
.../admin/internal/SystemMemberRegionImpl.java | 21 +-
.../internal/SystemMembershipEventImpl.java | 21 +-
.../com/gemstone/gemfire/admin/jmx/Agent.java | 21 +-
.../gemstone/gemfire/admin/jmx/AgentConfig.java | 21 +-
.../gemfire/admin/jmx/AgentFactory.java | 21 +-
.../internal/AdminDistributedSystemJmxImpl.java | 21 +-
.../admin/jmx/internal/AgentConfigImpl.java | 21 +-
.../gemfire/admin/jmx/internal/AgentImpl.java | 20 +-
.../admin/jmx/internal/AgentLauncher.java | 21 +-
.../admin/jmx/internal/CacheServerJmxImpl.java | 21 +-
.../admin/jmx/internal/ConfigAttributeInfo.java | 20 +-
.../internal/ConfigurationParameterJmxImpl.java | 21 +-
.../DistributedSystemHealthConfigJmxImpl.java | 21 +-
.../internal/DistributionLocatorJmxImpl.java | 22 +-
.../admin/jmx/internal/DynamicManagedBean.java | 20 +-
.../internal/GemFireHealthConfigJmxImpl.java | 21 +-
.../jmx/internal/GemFireHealthJmxImpl.java | 21 +-
.../admin/jmx/internal/GenerateMBeanHTML.java | 21 +-
.../gemfire/admin/jmx/internal/MBeanUtil.java | 20 +-
.../admin/jmx/internal/MX4JModelMBean.java | 21 +-
.../jmx/internal/MX4JServerSocketFactory.java | 22 +-
.../gemfire/admin/jmx/internal/MailManager.java | 21 +-
.../admin/jmx/internal/ManagedResource.java | 21 +-
.../admin/jmx/internal/ManagedResourceType.java | 21 +-
.../jmx/internal/MemberInfoWithStatsMBean.java | 21 +-
.../admin/jmx/internal/RMIRegistryService.java | 20 +-
.../jmx/internal/RMIRegistryServiceMBean.java | 20 +-
.../jmx/internal/RefreshNotificationType.java | 21 +-
.../jmx/internal/StatAlertNotification.java | 21 +-
.../jmx/internal/StatAlertsAggregator.java | 21 +-
.../jmx/internal/StatisticAttributeInfo.java | 20 +-
.../jmx/internal/StatisticResourceJmxImpl.java | 21 +-
.../SystemMemberBridgeServerJmxImpl.java | 21 +-
.../jmx/internal/SystemMemberCacheJmxImpl.java | 21 +-
.../admin/jmx/internal/SystemMemberJmx.java | 21 +-
.../admin/jmx/internal/SystemMemberJmxImpl.java | 21 +-
.../jmx/internal/SystemMemberRegionJmxImpl.java | 21 +-
.../gemfire/cache/AttributesFactory.java | 70 +-
.../gemfire/cache/AttributesMutator.java | 21 +-
.../java/com/gemstone/gemfire/cache/Cache.java | 23 +-
.../gemstone/gemfire/cache/CacheCallback.java | 21 +-
.../gemfire/cache/CacheClosedException.java | 21 +-
.../com/gemstone/gemfire/cache/CacheEvent.java | 21 +-
.../gemstone/gemfire/cache/CacheException.java | 21 +-
.../gemfire/cache/CacheExistsException.java | 21 +-
.../gemstone/gemfire/cache/CacheFactory.java | 21 +-
.../gemstone/gemfire/cache/CacheListener.java | 21 +-
.../com/gemstone/gemfire/cache/CacheLoader.java | 21 +-
.../gemfire/cache/CacheLoaderException.java | 21 +-
.../gemfire/cache/CacheRuntimeException.java | 21 +-
.../gemstone/gemfire/cache/CacheStatistics.java | 21 +-
.../gemfire/cache/CacheTransactionManager.java | 21 +-
.../com/gemstone/gemfire/cache/CacheWriter.java | 21 +-
.../gemfire/cache/CacheWriterException.java | 21 +-
.../gemfire/cache/CacheXmlException.java | 21 +-
.../gemstone/gemfire/cache/ClientSession.java | 21 +-
.../gemfire/cache/CommitConflictException.java | 21 +-
.../cache/CommitDistributionException.java | 21 +-
.../cache/CommitIncompleteException.java | 16 +
.../gemfire/cache/CustomEvictionAttributes.java | 22 +-
.../gemstone/gemfire/cache/CustomExpiry.java | 21 +-
.../com/gemstone/gemfire/cache/DataPolicy.java | 40 +-
.../com/gemstone/gemfire/cache/Declarable.java | 21 +-
.../gemfire/cache/DiskAccessException.java | 21 +-
.../com/gemstone/gemfire/cache/DiskStore.java | 21 +-
.../gemfire/cache/DiskStoreFactory.java | 21 +-
.../gemfire/cache/DiskWriteAttributes.java | 21 +-
.../cache/DiskWriteAttributesFactory.java | 21 +-
.../DuplicatePrimaryPartitionException.java | 21 +-
.../gemfire/cache/DynamicRegionFactory.java | 21 +-
.../gemfire/cache/DynamicRegionListener.java | 21 +-
.../gemfire/cache/EntryDestroyedException.java | 21 +-
.../com/gemstone/gemfire/cache/EntryEvent.java | 21 +-
.../gemfire/cache/EntryExistsException.java | 21 +-
.../gemfire/cache/EntryNotFoundException.java | 21 +-
.../gemfire/cache/EntryNotFoundInRegion.java | 21 +-
.../gemstone/gemfire/cache/EntryOperation.java | 23 +-
.../gemstone/gemfire/cache/EvictionAction.java | 23 +-
.../gemfire/cache/EvictionAlgorithm.java | 23 +-
.../gemfire/cache/EvictionAttributes.java | 20 +-
.../cache/EvictionAttributesMutator.java | 23 +-
.../gemfire/cache/EvictionCriteria.java | 22 +-
.../gemfire/cache/ExpirationAction.java | 21 +-
.../gemfire/cache/ExpirationAttributes.java | 21 +-
.../cache/FailedSynchronizationException.java | 21 +-
.../gemfire/cache/FixedPartitionAttributes.java | 21 +-
.../gemfire/cache/FixedPartitionResolver.java | 20 +-
.../cache/GatewayConfigurationException.java | 21 +-
.../gemfire/cache/GatewayException.java | 21 +-
.../gemstone/gemfire/cache/GemFireCache.java | 39 +-
.../cache/IncompatibleVersionException.java | 21 +-
.../gemstone/gemfire/cache/InterestPolicy.java | 21 +-
.../cache/InterestRegistrationEvent.java | 21 +-
.../cache/InterestRegistrationListener.java | 21 +-
.../gemfire/cache/InterestResultPolicy.java | 21 +-
.../gemstone/gemfire/cache/LoaderHelper.java | 21 +-
.../com/gemstone/gemfire/cache/LossAction.java | 21 +-
.../gemfire/cache/LowMemoryException.java | 21 +-
.../gemfire/cache/MembershipAttributes.java | 21 +-
.../com/gemstone/gemfire/cache/MirrorType.java | 21 +-
.../cache/NoQueueServersAvailableException.java | 21 +-
...NoSubscriptionServersAvailableException.java | 21 +-
.../com/gemstone/gemfire/cache/Operation.java | 21 +-
.../cache/OperationAbortedException.java | 21 +-
.../gemfire/cache/PartitionAttributes.java | 21 +-
.../cache/PartitionAttributesFactory.java | 20 +-
.../gemfire/cache/PartitionResolver.java | 20 +-
.../PartitionedRegionDistributionException.java | 21 +-
.../PartitionedRegionStorageException.java | 21 +-
.../java/com/gemstone/gemfire/cache/Region.java | 21 +-
.../gemfire/cache/RegionAccessException.java | 21 +-
.../gemfire/cache/RegionAttributes.java | 21 +-
.../gemfire/cache/RegionDestroyedException.java | 21 +-
.../cache/RegionDistributionException.java | 21 +-
.../com/gemstone/gemfire/cache/RegionEvent.java | 21 +-
.../gemfire/cache/RegionExistsException.java | 21 +-
.../gemstone/gemfire/cache/RegionFactory.java | 46 +-
.../gemfire/cache/RegionMembershipListener.java | 21 +-
.../cache/RegionReinitializedException.java | 21 +-
.../gemfire/cache/RegionRoleException.java | 21 +-
.../gemfire/cache/RegionRoleListener.java | 21 +-
.../gemstone/gemfire/cache/RegionService.java | 23 +-
.../gemstone/gemfire/cache/RegionShortcut.java | 71 +-
.../cache/RemoteTransactionException.java | 21 +-
.../gemstone/gemfire/cache/RequiredRoles.java | 21 +-
.../gemfire/cache/ResourceException.java | 21 +-
.../gemfire/cache/ResumptionAction.java | 21 +-
.../com/gemstone/gemfire/cache/RoleEvent.java | 21 +-
.../gemstone/gemfire/cache/RoleException.java | 21 +-
.../java/com/gemstone/gemfire/cache/Scope.java | 21 +-
.../gemfire/cache/SerializedCacheValue.java | 21 +-
.../cache/StatisticsDisabledException.java | 21 +-
.../gemfire/cache/SubscriptionAttributes.java | 21 +-
.../SynchronizationCommitConflictException.java | 21 +-
.../gemfire/cache/TimeoutException.java | 21 +-
...TransactionDataNodeHasDepartedException.java | 21 +-
.../TransactionDataNotColocatedException.java | 21 +-
.../TransactionDataRebalancedException.java | 21 +-
.../gemfire/cache/TransactionEvent.java | 21 +-
.../gemfire/cache/TransactionException.java | 21 +-
.../gemstone/gemfire/cache/TransactionId.java | 21 +-
.../cache/TransactionInDoubtException.java | 21 +-
.../gemfire/cache/TransactionListener.java | 21 +-
.../gemfire/cache/TransactionWriter.java | 21 +-
.../cache/TransactionWriterException.java | 21 +-
...upportedOperationInTransactionException.java | 21 +-
.../cache/UnsupportedVersionException.java | 21 +-
.../gemfire/cache/VersionException.java | 21 +-
.../gemfire/cache/asyncqueue/AsyncEvent.java | 21 +-
.../cache/asyncqueue/AsyncEventListener.java | 21 +-
.../cache/asyncqueue/AsyncEventQueue.java | 21 +-
.../asyncqueue/AsyncEventQueueFactory.java | 23 +-
.../internal/AsyncEventQueueFactoryImpl.java | 21 +-
.../internal/AsyncEventQueueImpl.java | 21 +-
.../internal/AsyncEventQueueStats.java | 21 +-
.../internal/ParallelAsyncEventQueueImpl.java | 16 +
.../internal/SerialAsyncEventQueueImpl.java | 16 +
.../client/AllConnectionsInUseException.java | 21 +-
.../gemfire/cache/client/ClientCache.java | 21 +-
.../cache/client/ClientCacheFactory.java | 21 +-
.../cache/client/ClientNotReadyException.java | 21 +-
.../cache/client/ClientRegionFactory.java | 21 +-
.../cache/client/ClientRegionShortcut.java | 23 +-
.../client/NoAvailableLocatorsException.java | 21 +-
.../client/NoAvailableServersException.java | 21 +-
.../com/gemstone/gemfire/cache/client/Pool.java | 21 +-
.../gemfire/cache/client/PoolFactory.java | 21 +-
.../gemfire/cache/client/PoolManager.java | 21 +-
.../client/ServerConnectivityException.java | 21 +-
.../cache/client/ServerOperationException.java | 21 +-
.../ServerRefusedConnectionException.java | 21 +-
.../client/SubscriptionNotEnabledException.java | 21 +-
.../cache/client/internal/AbstractOp.java | 21 +-
.../cache/client/internal/AddPDXEnumOp.java | 21 +-
.../cache/client/internal/AddPDXTypeOp.java | 21 +-
.../client/internal/AuthenticateUserOp.java | 21 +-
.../internal/AutoConnectionSourceImpl.java | 21 +-
.../client/internal/CacheServerLoadMessage.java | 21 +-
.../gemfire/cache/client/internal/ClearOp.java | 21 +-
.../client/internal/ClientMetadataService.java | 20 +-
.../client/internal/ClientPartitionAdvisor.java | 21 +-
.../internal/ClientRegionFactoryImpl.java | 21 +-
.../cache/client/internal/ClientUpdater.java | 21 +-
.../client/internal/CloseConnectionOp.java | 21 +-
.../gemfire/cache/client/internal/CommitOp.java | 21 +-
.../cache/client/internal/Connection.java | 21 +-
.../client/internal/ConnectionFactory.java | 21 +-
.../client/internal/ConnectionFactoryImpl.java | 45 +-
.../cache/client/internal/ConnectionImpl.java | 49 +-
.../cache/client/internal/ConnectionSource.java | 21 +-
.../cache/client/internal/ConnectionStats.java | 21 +-
.../cache/client/internal/ContainsKeyOp.java | 21 +-
.../DataSerializerRecoveryListener.java | 21 +-
.../cache/client/internal/DestroyOp.java | 21 +-
.../cache/client/internal/DestroyRegionOp.java | 21 +-
.../gemfire/cache/client/internal/Endpoint.java | 21 +-
.../cache/client/internal/EndpointManager.java | 21 +-
.../client/internal/EndpointManagerImpl.java | 21 +-
.../cache/client/internal/ExecutablePool.java | 21 +-
.../client/internal/ExecuteFunctionHelper.java | 21 +-
.../client/internal/ExecuteFunctionNoAckOp.java | 21 +-
.../client/internal/ExecuteFunctionOp.java | 21 +-
.../internal/ExecuteRegionFunctionNoAckOp.java | 21 +-
.../internal/ExecuteRegionFunctionOp.java | 21 +-
.../ExecuteRegionFunctionSingleHopOp.java | 21 +-
.../internal/ExplicitConnectionSourceImpl.java | 21 +-
.../gemfire/cache/client/internal/GetAllOp.java | 21 +-
.../client/internal/GetClientPRMetaDataOp.java | 20 +-
.../GetClientPartitionAttributesOp.java | 20 +-
.../cache/client/internal/GetEntryOp.java | 21 +-
.../cache/client/internal/GetEventValueOp.java | 20 +-
.../client/internal/GetFunctionAttributeOp.java | 21 +-
.../gemfire/cache/client/internal/GetOp.java | 21 +-
.../cache/client/internal/GetPDXEnumByIdOp.java | 21 +-
.../cache/client/internal/GetPDXEnumsOp.java | 21 +-
.../client/internal/GetPDXIdForEnumOp.java | 21 +-
.../client/internal/GetPDXIdForTypeOp.java | 21 +-
.../cache/client/internal/GetPDXTypeByIdOp.java | 21 +-
.../cache/client/internal/GetPDXTypesOp.java | 21 +-
.../internal/InstantiatorRecoveryListener.java | 21 +-
.../cache/client/internal/InternalPool.java | 21 +-
.../cache/client/internal/InvalidateOp.java | 21 +-
.../gemfire/cache/client/internal/KeySetOp.java | 21 +-
.../cache/client/internal/LiveServerPinger.java | 21 +-
.../internal/LocatorDiscoveryCallback.java | 21 +-
.../LocatorDiscoveryCallbackAdapter.java | 21 +-
.../cache/client/internal/MakePrimaryOp.java | 21 +-
.../gemfire/cache/client/internal/Op.java | 23 +-
.../cache/client/internal/OpExecutorImpl.java | 21 +-
.../internal/PdxRegistryRecoveryListener.java | 21 +-
.../gemfire/cache/client/internal/PingOp.java | 21 +-
.../gemfire/cache/client/internal/PoolImpl.java | 21 +-
.../cache/client/internal/PrimaryAckOp.java | 21 +-
.../cache/client/internal/ProxyCache.java | 21 +-
.../client/internal/ProxyCacheCloseOp.java | 21 +-
.../cache/client/internal/ProxyRegion.java | 21 +-
.../gemfire/cache/client/internal/PutAllOp.java | 21 +-
.../gemfire/cache/client/internal/PutOp.java | 21 +-
.../gemfire/cache/client/internal/QueryOp.java | 21 +-
.../client/internal/QueueConnectionImpl.java | 21 +-
.../cache/client/internal/QueueManager.java | 21 +-
.../cache/client/internal/QueueManagerImpl.java | 21 +-
.../cache/client/internal/QueueState.java | 16 +
.../cache/client/internal/QueueStateImpl.java | 21 +-
.../cache/client/internal/ReadyForEventsOp.java | 21 +-
.../internal/RegisterDataSerializersOp.java | 21 +-
.../internal/RegisterInstantiatorsOp.java | 21 +-
.../client/internal/RegisterInterestListOp.java | 21 +-
.../client/internal/RegisterInterestOp.java | 21 +-
.../internal/RegisterInterestTracker.java | 21 +-
.../cache/client/internal/RemoveAllOp.java | 21 +-
.../cache/client/internal/RollbackOp.java | 21 +-
.../cache/client/internal/ServerBlackList.java | 21 +-
.../cache/client/internal/ServerProxy.java | 21 +-
.../client/internal/ServerRegionDataAccess.java | 23 +-
.../client/internal/ServerRegionProxy.java | 21 +-
.../internal/SingleHopClientExecutor.java | 21 +-
.../internal/SingleHopOperationCallable.java | 21 +-
.../gemfire/cache/client/internal/SizeOp.java | 21 +-
.../cache/client/internal/TXFailoverOp.java | 21 +-
.../client/internal/TXSynchronizationOp.java | 21 +-
.../internal/UnregisterInterestListOp.java | 21 +-
.../client/internal/UnregisterInterestOp.java | 21 +-
.../cache/client/internal/UserAttributes.java | 21 +-
.../locator/ClientConnectionRequest.java | 21 +-
.../locator/ClientConnectionResponse.java | 21 +-
.../locator/ClientReplacementRequest.java | 21 +-
.../internal/locator/GetAllServersRequest.java | 20 +-
.../internal/locator/GetAllServersResponse.java | 20 +-
.../internal/locator/LocatorListRequest.java | 21 +-
.../internal/locator/LocatorListResponse.java | 21 +-
.../internal/locator/LocatorStatusRequest.java | 20 +-
.../internal/locator/LocatorStatusResponse.java | 20 +-
.../locator/QueueConnectionRequest.java | 21 +-
.../locator/QueueConnectionResponse.java | 21 +-
.../internal/locator/SerializationHelper.java | 21 +-
.../internal/locator/ServerLocationRequest.java | 23 +-
.../locator/ServerLocationResponse.java | 23 +-
.../locator/wan/LocatorMembershipListener.java | 21 +-
.../pooling/ConnectionDestroyedException.java | 21 +-
.../internal/pooling/ConnectionManager.java | 21 +-
.../internal/pooling/ConnectionManagerImpl.java | 26 +-
.../internal/pooling/PooledConnection.java | 21 +-
.../gemfire/cache/control/RebalanceFactory.java | 21 +-
.../cache/control/RebalanceOperation.java | 21 +-
.../gemfire/cache/control/RebalanceResults.java | 21 +-
.../gemfire/cache/control/ResourceManager.java | 21 +-
.../execute/EmtpyRegionFunctionException.java | 21 +-
.../gemfire/cache/execute/Execution.java | 20 +-
.../gemfire/cache/execute/Function.java | 20 +-
.../gemfire/cache/execute/FunctionAdapter.java | 20 +-
.../gemfire/cache/execute/FunctionContext.java | 20 +-
.../cache/execute/FunctionException.java | 20 +-
.../FunctionInvocationTargetException.java | 20 +-
.../gemfire/cache/execute/FunctionService.java | 20 +-
.../cache/execute/RegionFunctionContext.java | 21 +-
.../gemfire/cache/execute/ResultCollector.java | 20 +-
.../gemfire/cache/execute/ResultSender.java | 20 +-
.../internal/FunctionServiceManager.java | 24 +-
.../gemfire/cache/hdfs/HDFSIOException.java | 21 +-
.../gemstone/gemfire/cache/hdfs/HDFSStore.java | 21 +-
.../gemfire/cache/hdfs/HDFSStoreFactory.java | 21 +-
.../gemfire/cache/hdfs/HDFSStoreMutator.java | 21 +-
.../cache/hdfs/StoreExistsException.java | 21 +-
.../cache/hdfs/internal/FailureTracker.java | 21 +-
.../cache/hdfs/internal/FlushObserver.java | 16 +
.../hdfs/internal/HDFSBucketRegionQueue.java | 21 +-
.../cache/hdfs/internal/HDFSEntriesSet.java | 21 +-
.../cache/hdfs/internal/HDFSEventListener.java | 21 +-
.../hdfs/internal/HDFSEventQueueFilter.java | 21 +-
.../hdfs/internal/HDFSGatewayEventImpl.java | 22 +-
.../hdfs/internal/HDFSIntegrationUtil.java | 21 +-
.../HDFSParallelGatewaySenderQueue.java | 21 +-
.../hdfs/internal/HDFSStoreConfigHolder.java | 23 +-
.../cache/hdfs/internal/HDFSStoreCreation.java | 23 +-
.../hdfs/internal/HDFSStoreFactoryImpl.java | 21 +-
.../cache/hdfs/internal/HDFSStoreImpl.java | 21 +-
.../hdfs/internal/HDFSStoreMutatorImpl.java | 23 +-
.../HDFSWriteOnlyStoreEventListener.java | 21 +-
.../hdfs/internal/HoplogListenerForRegion.java | 21 +-
.../cache/hdfs/internal/PersistedEventImpl.java | 21 +-
.../hdfs/internal/QueuedPersistentEvent.java | 16 +
.../hdfs/internal/SignalledFlushObserver.java | 16 +
.../internal/SortedHDFSQueuePersistedEvent.java | 21 +-
.../internal/SortedHoplogPersistedEvent.java | 21 +-
.../UnsortedHDFSQueuePersistedEvent.java | 21 +-
.../internal/UnsortedHoplogPersistedEvent.java | 21 +-
.../cache/hdfs/internal/cardinality/Bits.java | 21 +-
.../cardinality/CardinalityMergeException.java | 21 +-
.../hdfs/internal/cardinality/HyperLogLog.java | 21 +-
.../hdfs/internal/cardinality/IBuilder.java | 21 +-
.../hdfs/internal/cardinality/ICardinality.java | 21 +-
.../hdfs/internal/cardinality/MurmurHash.java | 21 +-
.../hdfs/internal/cardinality/RegisterSet.java | 21 +-
.../hdfs/internal/hoplog/AbstractHoplog.java | 21 +-
.../hoplog/AbstractHoplogOrganizer.java | 21 +-
.../cache/hdfs/internal/hoplog/BloomFilter.java | 21 +-
.../hoplog/CloseTmpHoplogsTimerTask.java | 21 +-
.../hdfs/internal/hoplog/CompactionStatus.java | 21 +-
.../cache/hdfs/internal/hoplog/FlushStatus.java | 16 +
.../internal/hoplog/HDFSCompactionManager.java | 21 +-
.../internal/hoplog/HDFSFlushQueueArgs.java | 16 +
.../internal/hoplog/HDFSFlushQueueFunction.java | 16 +
.../hoplog/HDFSForceCompactionArgs.java | 21 +-
.../hoplog/HDFSForceCompactionFunction.java | 21 +-
.../HDFSForceCompactionResultCollector.java | 21 +-
.../hoplog/HDFSLastCompactionTimeFunction.java | 21 +-
.../internal/hoplog/HDFSRegionDirector.java | 21 +-
.../hdfs/internal/hoplog/HDFSStoreDirector.java | 21 +-
.../hoplog/HDFSUnsortedHoplogOrganizer.java | 21 +-
.../hdfs/internal/hoplog/HFileSortedOplog.java | 21 +-
.../hoplog/HdfsSortedOplogOrganizer.java | 21 +-
.../cache/hdfs/internal/hoplog/Hoplog.java | 21 +-
.../hdfs/internal/hoplog/HoplogConfig.java | 21 +-
.../hdfs/internal/hoplog/HoplogListener.java | 21 +-
.../hdfs/internal/hoplog/HoplogOrganizer.java | 21 +-
.../hdfs/internal/hoplog/HoplogSetIterator.java | 21 +-
.../hdfs/internal/hoplog/HoplogSetReader.java | 21 +-
.../internal/hoplog/SequenceFileHoplog.java | 21 +-
.../hoplog/mapred/AbstractGFRecordReader.java | 21 +-
.../internal/hoplog/mapred/GFInputFormat.java | 21 +-
.../internal/hoplog/mapred/GFOutputFormat.java | 21 +-
.../mapreduce/AbstractGFRecordReader.java | 21 +-
.../hoplog/mapreduce/GFInputFormat.java | 21 +-
.../hdfs/internal/hoplog/mapreduce/GFKey.java | 21 +-
.../hoplog/mapreduce/GFOutputFormat.java | 21 +-
.../hoplog/mapreduce/HDFSSplitIterator.java | 21 +-
.../internal/hoplog/mapreduce/HoplogUtil.java | 21 +-
.../hoplog/mapreduce/RWSplitIterator.java | 21 +-
.../hoplog/mapreduce/StreamSplitIterator.java | 21 +-
.../org/apache/hadoop/io/SequenceFile.java | 21 +-
.../operations/CloseCQOperationContext.java | 21 +-
.../operations/DestroyOperationContext.java | 21 +-
.../operations/ExecuteCQOperationContext.java | 21 +-
.../ExecuteFunctionOperationContext.java | 21 +-
.../GetDurableCQsOperationContext.java | 21 +-
.../cache/operations/GetOperationContext.java | 21 +-
.../operations/InterestOperationContext.java | 21 +-
.../gemfire/cache/operations/InterestType.java | 21 +-
.../operations/InvalidateOperationContext.java | 21 +-
.../cache/operations/KeyOperationContext.java | 21 +-
.../operations/KeySetOperationContext.java | 21 +-
.../operations/KeyValueOperationContext.java | 21 +-
.../cache/operations/OperationContext.java | 21 +-
.../operations/PutAllOperationContext.java | 21 +-
.../cache/operations/PutOperationContext.java | 21 +-
.../cache/operations/QueryOperationContext.java | 21 +-
.../operations/RegionClearOperationContext.java | 21 +-
.../RegionCreateOperationContext.java | 21 +-
.../RegionDestroyOperationContext.java | 21 +-
.../operations/RegionOperationContext.java | 21 +-
.../RegisterInterestOperationContext.java | 21 +-
.../operations/RemoveAllOperationContext.java | 21 +-
.../operations/StopCQOperationContext.java | 21 +-
.../UnregisterInterestOperationContext.java | 21 +-
.../internal/GetOperationContextImpl.java | 16 +
.../cache/partition/PartitionListener.java | 20 +-
.../partition/PartitionListenerAdapter.java | 23 +-
.../cache/partition/PartitionManager.java | 20 +-
.../cache/partition/PartitionMemberInfo.java | 21 +-
.../PartitionNotAvailableException.java | 21 +-
.../cache/partition/PartitionRebalanceInfo.java | 21 +-
.../cache/partition/PartitionRegionHelper.java | 20 +-
.../cache/partition/PartitionRegionInfo.java | 21 +-
.../ConflictingPersistentDataException.java | 21 +-
.../persistence/PartitionOfflineException.java | 21 +-
.../gemfire/cache/persistence/PersistentID.java | 23 +-
.../PersistentReplicatesOfflineException.java | 21 +-
.../persistence/RevokeFailedException.java | 21 +-
.../RevokedPersistentDataException.java | 21 +-
.../gemfire/cache/query/Aggregator.java | 16 +
.../cache/query/AmbiguousNameException.java | 21 +-
.../gemfire/cache/query/CqAttributes.java | 21 +-
.../cache/query/CqAttributesFactory.java | 21 +-
.../cache/query/CqAttributesMutator.java | 21 +-
.../gemfire/cache/query/CqClosedException.java | 21 +-
.../gemstone/gemfire/cache/query/CqEvent.java | 21 +-
.../gemfire/cache/query/CqException.java | 21 +-
.../gemfire/cache/query/CqExistsException.java | 21 +-
.../gemfire/cache/query/CqListener.java | 21 +-
.../gemstone/gemfire/cache/query/CqQuery.java | 21 +-
.../gemstone/gemfire/cache/query/CqResults.java | 21 +-
.../cache/query/CqServiceStatistics.java | 21 +-
.../gemstone/gemfire/cache/query/CqState.java | 21 +-
.../gemfire/cache/query/CqStatistics.java | 21 +-
.../gemfire/cache/query/CqStatusListener.java | 21 +-
.../cache/query/FunctionDomainException.java | 21 +-
.../com/gemstone/gemfire/cache/query/Index.java | 21 +-
.../cache/query/IndexCreationException.java | 21 +-
.../cache/query/IndexExistsException.java | 21 +-
.../cache/query/IndexInvalidException.java | 21 +-
.../cache/query/IndexMaintenanceException.java | 21 +-
.../cache/query/IndexNameConflictException.java | 21 +-
.../gemfire/cache/query/IndexStatistics.java | 21 +-
.../gemstone/gemfire/cache/query/IndexType.java | 21 +-
.../query/MultiIndexCreationException.java | 16 +
.../cache/query/NameNotFoundException.java | 21 +-
.../cache/query/NameResolutionException.java | 21 +-
.../query/ParameterCountInvalidException.java | 21 +-
.../com/gemstone/gemfire/cache/query/Query.java | 21 +-
.../gemfire/cache/query/QueryException.java | 21 +-
.../query/QueryExecutionLowMemoryException.java | 21 +-
.../query/QueryExecutionTimeoutException.java | 21 +-
.../cache/query/QueryInvalidException.java | 21 +-
.../query/QueryInvocationTargetException.java | 21 +-
.../gemfire/cache/query/QueryService.java | 21 +-
.../gemfire/cache/query/QueryStatistics.java | 21 +-
.../cache/query/RegionNotFoundException.java | 21 +-
.../gemfire/cache/query/SelectResults.java | 21 +-
.../gemstone/gemfire/cache/query/Struct.java | 21 +-
.../cache/query/TypeMismatchException.java | 21 +-
.../query/internal/AbstractCompiledValue.java | 22 +-
.../internal/AbstractGroupOrRangeJunction.java | 21 +-
.../cache/query/internal/AllGroupJunction.java | 21 +-
.../query/internal/AttributeDescriptor.java | 22 +-
.../gemfire/cache/query/internal/Bag.java | 21 +-
.../internal/CompiledAggregateFunction.java | 16 +
.../query/internal/CompiledBindArgument.java | 22 +-
.../query/internal/CompiledComparison.java | 22 +-
.../query/internal/CompiledConstruction.java | 22 +-
.../cache/query/internal/CompiledFunction.java | 22 +-
.../query/internal/CompiledGroupBySelect.java | 16 +
.../cache/query/internal/CompiledID.java | 22 +-
.../cache/query/internal/CompiledIn.java | 22 +-
.../query/internal/CompiledIndexOperation.java | 22 +-
.../query/internal/CompiledIteratorDef.java | 21 +-
.../cache/query/internal/CompiledJunction.java | 22 +-
.../cache/query/internal/CompiledLike.java | 21 +-
.../cache/query/internal/CompiledLiteral.java | 22 +-
.../cache/query/internal/CompiledNegation.java | 22 +-
.../cache/query/internal/CompiledOperation.java | 22 +-
.../cache/query/internal/CompiledPath.java | 22 +-
.../cache/query/internal/CompiledRegion.java | 22 +-
.../cache/query/internal/CompiledSelect.java | 22 +-
.../query/internal/CompiledSortCriterion.java | 21 +-
.../query/internal/CompiledUnaryMinus.java | 21 +-
.../cache/query/internal/CompiledUndefined.java | 22 +-
.../cache/query/internal/CompiledValue.java | 22 +-
.../query/internal/CompositeGroupJunction.java | 21 +-
.../gemfire/cache/query/internal/CqEntry.java | 21 +-
.../cache/query/internal/CqQueryVsdStats.java | 21 +-
.../cache/query/internal/CqStateImpl.java | 22 +-
.../internal/CumulativeNonDistinctResults.java | 16 +
.../cache/query/internal/DefaultQuery.java | 22 +-
.../query/internal/DefaultQueryService.java | 22 +-
.../cache/query/internal/ExecutionContext.java | 22 +-
.../gemfire/cache/query/internal/Filter.java | 22 +-
.../gemfire/cache/query/internal/Functions.java | 22 +-
.../cache/query/internal/GroupJunction.java | 21 +-
.../cache/query/internal/HashingStrategy.java | 21 +-
.../gemfire/cache/query/internal/IndexInfo.java | 21 +-
.../internal/IndexTrackingQueryObserver.java | 28 +-
.../cache/query/internal/IndexUpdater.java | 21 +-
.../gemfire/cache/query/internal/Indexable.java | 21 +-
.../cache/query/internal/LinkedResultSet.java | 21 +-
.../cache/query/internal/LinkedStructSet.java | 21 +-
.../cache/query/internal/MapIndexable.java | 16 +
.../cache/query/internal/MethodDispatch.java | 22 +-
.../cache/query/internal/NWayMergeResults.java | 16 +
.../gemfire/cache/query/internal/Negatable.java | 22 +-
.../gemfire/cache/query/internal/NullToken.java | 23 +-
.../cache/query/internal/ObjectIntHashMap.java | 21 +-
.../cache/query/internal/OrderByComparator.java | 18 +-
.../internal/OrderByComparatorUnmapped.java | 16 +
.../gemfire/cache/query/internal/Ordered.java | 16 +
.../cache/query/internal/OrganizedOperands.java | 21 +-
.../cache/query/internal/PRQueryTraceInfo.java | 22 +-
.../gemfire/cache/query/internal/PathUtils.java | 22 +-
.../gemfire/cache/query/internal/PlanInfo.java | 22 +-
.../cache/query/internal/ProxyQueryService.java | 21 +-
.../gemfire/cache/query/internal/QCompiler.java | 22 +-
.../gemfire/cache/query/internal/QRegion.java | 21 +-
.../gemfire/cache/query/internal/QScope.java | 22 +-
.../QueryExecutionCanceledException.java | 21 +-
.../query/internal/QueryExecutionContext.java | 24 +-
.../cache/query/internal/QueryExecutor.java | 21 +-
.../cache/query/internal/QueryMonitor.java | 21 +-
.../cache/query/internal/QueryObserver.java | 22 +-
.../query/internal/QueryObserverAdapter.java | 22 +-
.../query/internal/QueryObserverHolder.java | 22 +-
.../cache/query/internal/QueryUtils.java | 21 +-
.../cache/query/internal/RangeJunction.java | 21 +-
.../cache/query/internal/ResultsBag.java | 16 +
.../ResultsCollectionCopyOnReadWrapper.java | 21 +-
...ResultsCollectionPdxDeserializerWrapper.java | 21 +-
.../internal/ResultsCollectionWrapper.java | 21 +-
.../cache/query/internal/ResultsSet.java | 21 +-
.../cache/query/internal/RuntimeIterator.java | 22 +-
.../query/internal/SelectResultsComparator.java | 21 +-
.../cache/query/internal/SortedResultSet.java | 21 +-
.../cache/query/internal/SortedResultsBag.java | 16 +
.../cache/query/internal/SortedStructBag.java | 16 +
.../cache/query/internal/SortedStructSet.java | 21 +-
.../gemfire/cache/query/internal/StructBag.java | 21 +-
.../cache/query/internal/StructFields.java | 16 +
.../cache/query/internal/StructImpl.java | 21 +-
.../gemfire/cache/query/internal/StructSet.java | 21 +-
.../gemfire/cache/query/internal/Support.java | 22 +-
.../gemfire/cache/query/internal/Undefined.java | 22 +-
.../internal/aggregate/AbstractAggregator.java | 16 +
.../cache/query/internal/aggregate/Avg.java | 16 +
.../query/internal/aggregate/AvgBucketNode.java | 16 +
.../query/internal/aggregate/AvgDistinct.java | 16 +
.../aggregate/AvgDistinctPRQueryNode.java | 16 +
.../internal/aggregate/AvgPRQueryNode.java | 16 +
.../cache/query/internal/aggregate/Count.java | 16 +
.../query/internal/aggregate/CountDistinct.java | 16 +
.../aggregate/CountDistinctPRQueryNode.java | 16 +
.../internal/aggregate/CountPRQueryNode.java | 16 +
.../internal/aggregate/DistinctAggregator.java | 16 +
.../cache/query/internal/aggregate/MaxMin.java | 16 +
.../cache/query/internal/aggregate/Sum.java | 16 +
.../query/internal/aggregate/SumDistinct.java | 16 +
.../aggregate/SumDistinctPRQueryNode.java | 16 +
.../cache/query/internal/cq/ClientCQ.java | 16 +
.../cache/query/internal/cq/CqService.java | 16 +
.../query/internal/cq/CqServiceProvider.java | 16 +
.../query/internal/cq/InternalCqQuery.java | 16 +
.../query/internal/cq/MissingCqService.java | 16 +
.../internal/cq/MissingCqServiceStatistics.java | 16 +
.../cache/query/internal/cq/ServerCQ.java | 16 +
.../query/internal/cq/spi/CqServiceFactory.java | 16 +
.../query/internal/index/AbstractIndex.java | 44 +-
.../query/internal/index/AbstractMapIndex.java | 21 +-
.../internal/index/CompactMapRangeIndex.java | 21 +-
.../query/internal/index/CompactRangeIndex.java | 21 +-
.../query/internal/index/DummyQRegion.java | 21 +-
.../index/FunctionalIndexCreationHelper.java | 21 +-
.../cache/query/internal/index/HashIndex.java | 21 +-
.../query/internal/index/HashIndexSet.java | 21 +-
.../query/internal/index/HashIndexStrategy.java | 21 +-
.../query/internal/index/IMQException.java | 21 +-
.../internal/index/IndexConcurrentHashSet.java | 21 +-
.../query/internal/index/IndexCreationData.java | 21 +-
.../internal/index/IndexCreationHelper.java | 21 +-
.../cache/query/internal/index/IndexData.java | 21 +-
.../query/internal/index/IndexElemArray.java | 21 +-
.../query/internal/index/IndexManager.java | 24 +-
.../query/internal/index/IndexProtocol.java | 20 +-
.../cache/query/internal/index/IndexStats.java | 21 +-
.../cache/query/internal/index/IndexStore.java | 23 +-
.../cache/query/internal/index/IndexUtils.java | 21 +-
.../index/IndexedExpressionEvaluator.java | 21 +-
.../query/internal/index/MapIndexStore.java | 21 +-
.../query/internal/index/MapRangeIndex.java | 21 +-
.../query/internal/index/MemoryIndexStore.java | 21 +-
.../query/internal/index/PartitionedIndex.java | 21 +-
.../query/internal/index/PrimaryKeyIndex.java | 21 +-
.../index/PrimaryKeyIndexCreationHelper.java | 21 +-
.../cache/query/internal/index/RangeIndex.java | 21 +-
.../query/internal/parse/ASTAggregateFunc.java | 16 +
.../cache/query/internal/parse/ASTAnd.java | 21 +-
.../query/internal/parse/ASTCombination.java | 21 +-
.../query/internal/parse/ASTCompareOp.java | 21 +-
.../query/internal/parse/ASTConstruction.java | 21 +-
.../query/internal/parse/ASTConversionExpr.java | 21 +-
.../cache/query/internal/parse/ASTDummy.java | 16 +
.../cache/query/internal/parse/ASTGroupBy.java | 21 +-
.../cache/query/internal/parse/ASTHint.java | 21 +-
.../query/internal/parse/ASTHintIdentifier.java | 21 +-
.../query/internal/parse/ASTIdentifier.java | 21 +-
.../cache/query/internal/parse/ASTImport.java | 21 +-
.../cache/query/internal/parse/ASTIn.java | 21 +-
.../query/internal/parse/ASTIteratorDef.java | 21 +-
.../cache/query/internal/parse/ASTLike.java | 21 +-
.../cache/query/internal/parse/ASTLimit.java | 23 +-
.../cache/query/internal/parse/ASTLiteral.java | 21 +-
.../internal/parse/ASTMethodInvocation.java | 21 +-
.../cache/query/internal/parse/ASTOr.java | 21 +-
.../cache/query/internal/parse/ASTOrderBy.java | 21 +-
.../query/internal/parse/ASTParameter.java | 21 +-
.../cache/query/internal/parse/ASTPostfix.java | 21 +-
.../query/internal/parse/ASTProjection.java | 21 +-
.../query/internal/parse/ASTRegionPath.java | 21 +-
.../cache/query/internal/parse/ASTSelect.java | 21 +-
.../query/internal/parse/ASTSortCriterion.java | 21 +-
.../cache/query/internal/parse/ASTTrace.java | 21 +-
.../cache/query/internal/parse/ASTType.java | 21 +-
.../cache/query/internal/parse/ASTTypeCast.java | 21 +-
.../cache/query/internal/parse/ASTUnary.java | 21 +-
.../query/internal/parse/ASTUndefinedExpr.java | 21 +-
.../query/internal/parse/ASTUnsupported.java | 21 +-
.../cache/query/internal/parse/GemFireAST.java | 21 +-
.../cache/query/internal/parse/UtilParser.java | 21 +-
.../internal/types/CollectionTypeImpl.java | 21 +-
.../types/ExtendedNumericComparator.java | 22 +-
.../cache/query/internal/types/MapTypeImpl.java | 21 +-
.../query/internal/types/NumericComparator.java | 22 +-
.../query/internal/types/ObjectTypeImpl.java | 21 +-
.../query/internal/types/StructTypeImpl.java | 21 +-
.../internal/types/TemporalComparator.java | 22 +-
.../cache/query/internal/types/TypeUtils.java | 22 +-
.../query/internal/utils/LimitIterator.java | 16 +
.../cache/query/internal/utils/PDXUtils.java | 16 +
.../cache/query/types/CollectionType.java | 21 +-
.../gemfire/cache/query/types/MapType.java | 21 +-
.../gemfire/cache/query/types/ObjectType.java | 21 +-
.../gemfire/cache/query/types/StructType.java | 21 +-
.../gemfire/cache/server/CacheServer.java | 21 +-
.../cache/server/ClientSubscriptionConfig.java | 21 +-
.../gemfire/cache/server/ServerLoad.java | 21 +-
.../gemfire/cache/server/ServerLoadProbe.java | 21 +-
.../cache/server/ServerLoadProbeAdapter.java | 21 +-
.../gemfire/cache/server/ServerMetrics.java | 21 +-
.../server/internal/ConnectionCountProbe.java | 21 +-
.../cache/server/internal/LoadMonitor.java | 21 +-
.../server/internal/ServerMetricsImpl.java | 21 +-
.../cache/snapshot/CacheSnapshotService.java | 21 +-
.../cache/snapshot/RegionSnapshotService.java | 21 +-
.../gemfire/cache/snapshot/SnapshotFilter.java | 21 +-
.../cache/snapshot/SnapshotIterator.java | 21 +-
.../gemfire/cache/snapshot/SnapshotOptions.java | 21 +-
.../gemfire/cache/snapshot/SnapshotReader.java | 21 +-
.../cache/util/BoundedLinkedHashMap.java | 21 +-
.../cache/util/CacheListenerAdapter.java | 21 +-
.../gemfire/cache/util/CacheWriterAdapter.java | 21 +-
.../gemfire/cache/util/CqListenerAdapter.java | 21 +-
.../gemstone/gemfire/cache/util/Gateway.java | 16 +
.../cache/util/GatewayConflictHelper.java | 21 +-
.../cache/util/GatewayConflictResolver.java | 21 +-
.../gemfire/cache/util/GatewayEvent.java | 21 +-
.../gemfire/cache/util/ObjectSizer.java | 21 +-
.../gemfire/cache/util/ObjectSizerImpl.java | 16 +
.../util/RegionMembershipListenerAdapter.java | 21 +-
.../cache/util/RegionRoleListenerAdapter.java | 21 +-
.../cache/util/TimestampedEntryEvent.java | 21 +-
.../cache/util/TransactionListenerAdapter.java | 21 +-
.../gemfire/cache/wan/EventSequenceID.java | 21 +-
.../gemfire/cache/wan/GatewayEventFilter.java | 20 +-
.../wan/GatewayEventSubstitutionFilter.java | 21 +-
.../gemfire/cache/wan/GatewayQueueEvent.java | 21 +-
.../gemfire/cache/wan/GatewayReceiver.java | 20 +-
.../cache/wan/GatewayReceiverFactory.java | 20 +-
.../gemfire/cache/wan/GatewaySender.java | 20 +-
.../gemfire/cache/wan/GatewaySenderFactory.java | 20 +-
.../cache/wan/GatewayTransportFilter.java | 20 +-
.../compression/CompressionException.java | 23 +-
.../gemfire/compression/Compressor.java | 23 +-
.../gemfire/compression/SnappyCompressor.java | 21 +-
.../gemfire/distributed/AbstractLauncher.java | 20 +-
.../distributed/ClientSocketFactory.java | 21 +-
.../distributed/DistributedLockService.java | 21 +-
.../gemfire/distributed/DistributedMember.java | 21 +-
.../gemfire/distributed/DistributedSystem.java | 21 +-
.../DistributedSystemDisconnectedException.java | 23 +-
.../distributed/DurableClientAttributes.java | 21 +-
.../distributed/FutureCancelledException.java | 21 +-
.../distributed/GatewayCancelledException.java | 23 +-
.../distributed/LeaseExpiredException.java | 21 +-
.../gemstone/gemfire/distributed/Locator.java | 21 +-
.../gemfire/distributed/LocatorLauncher.java | 22 +-
.../distributed/LockNotHeldException.java | 21 +-
.../LockServiceDestroyedException.java | 21 +-
.../distributed/OplogCancelledException.java | 23 +-
.../distributed/PoolCancelledException.java | 23 +-
.../com/gemstone/gemfire/distributed/Role.java | 21 +-
.../gemfire/distributed/ServerLauncher.java | 22 +-
.../TXManagerCancelledException.java | 23 +-
.../internal/AbstractDistributionConfig.java | 21 +-
.../distributed/internal/AdminMessageType.java | 16 +
.../internal/AtomicLongWithTerminalState.java | 21 +-
.../internal/CollectingReplyProcessor.java | 21 +-
.../distributed/internal/ConflationKey.java | 21 +-
.../gemfire/distributed/internal/DM.java | 21 +-
.../gemfire/distributed/internal/DMStats.java | 21 +-
.../gemfire/distributed/internal/DSClock.java | 18 +-
.../internal/DirectReplyProcessor.java | 21 +-
.../distributed/internal/DistributedState.java | 21 +-
.../internal/DistributionAdvisee.java | 21 +-
.../internal/DistributionAdvisor.java | 21 +-
.../internal/DistributionChannel.java | 21 +-
.../internal/DistributionConfig.java | 21 +-
.../internal/DistributionConfigImpl.java | 21 +-
.../internal/DistributionConfigSnapshot.java | 21 +-
.../internal/DistributionException.java | 21 +-
.../internal/DistributionManager.java | 63 +-
.../internal/DistributionManagerConfig.java | 21 +-
.../internal/DistributionMessage.java | 21 +-
.../internal/DistributionMessageObserver.java | 23 +-
.../distributed/internal/DistributionStats.java | 21 +-
.../distributed/internal/FlowControlParams.java | 21 +-
.../internal/ForceDisconnectOperation.java | 21 +-
.../FunctionExecutionPooledExecutor.java | 21 +-
.../distributed/internal/HealthMonitor.java | 21 +-
.../distributed/internal/HealthMonitorImpl.java | 21 +-
.../internal/HighPriorityAckedMessage.java | 21 +-
.../HighPriorityDistributionMessage.java | 21 +-
.../distributed/internal/IgnoredByManager.java | 16 +
.../internal/InternalDistributedSystem.java | 19 +-
.../distributed/internal/InternalLocator.java | 21 +-
.../internal/LocatorLoadSnapshot.java | 20 +-
.../distributed/internal/LocatorStats.java | 21 +-
.../internal/LonerDistributionManager.java | 21 +-
.../gemfire/distributed/internal/MQueue.java | 16 +
.../internal/MembershipListener.java | 21 +-
.../distributed/internal/MessageFactory.java | 21 +-
.../distributed/internal/MessageWithReply.java | 21 +-
.../internal/OverflowQueueWithDMStats.java | 21 +-
.../distributed/internal/PoolStatHelper.java | 21 +-
.../internal/PooledDistributionMessage.java | 21 +-
.../internal/PooledExecutorWithDMStats.java | 21 +-
.../distributed/internal/ProcessorKeeper21.java | 21 +-
.../distributed/internal/ProductUseLog.java | 21 +-
.../distributed/internal/ProfileListener.java | 21 +-
.../distributed/internal/QueueStatHelper.java | 21 +-
.../internal/ReliableReplyException.java | 21 +-
.../internal/ReliableReplyProcessor21.java | 21 +-
.../distributed/internal/ReplyException.java | 21 +-
.../distributed/internal/ReplyMessage.java | 21 +-
.../distributed/internal/ReplyProcessor21.java | 21 +-
.../distributed/internal/ReplySender.java | 21 +-
.../distributed/internal/ResourceEvent.java | 20 +-
.../internal/ResourceEventsListener.java | 20 +-
.../internal/RuntimeDistributionConfigImpl.java | 21 +-
.../internal/SerialAckedMessage.java | 21 +-
.../internal/SerialDistributionMessage.java | 21 +-
.../SerialQueuedExecutorWithDMStats.java | 21 +-
.../distributed/internal/ServerLocation.java | 21 +-
.../distributed/internal/ServerLocator.java | 21 +-
.../internal/SharedConfiguration.java | 21 +-
.../distributed/internal/ShutdownMessage.java | 21 +-
.../gemfire/distributed/internal/Sizeable.java | 16 +
.../distributed/internal/SizeableRunnable.java | 21 +-
.../distributed/internal/StartupMessage.java | 21 +-
.../internal/StartupMessageData.java | 21 +-
.../internal/StartupMessageReplyProcessor.java | 21 +-
.../distributed/internal/StartupOperation.java | 21 +-
.../internal/StartupResponseMessage.java | 21 +-
.../StartupResponseWithVersionMessage.java | 23 +-
.../internal/ThrottledMemQueueStatHelper.java | 21 +-
.../internal/ThrottledQueueStatHelper.java | 21 +-
.../ThrottlingMemLinkedQueueWithDMStats.java | 21 +-
.../internal/WaitForViewInstallation.java | 21 +-
.../internal/WanLocatorDiscoverer.java | 16 +
.../deadlock/DLockDependencyMonitor.java | 21 +-
.../internal/deadlock/DeadlockDetector.java | 21 +-
.../internal/deadlock/Dependency.java | 21 +-
.../internal/deadlock/DependencyGraph.java | 21 +-
.../internal/deadlock/DependencyMonitor.java | 21 +-
.../deadlock/DependencyMonitorManager.java | 21 +-
.../deadlock/GemFireDeadlockDetector.java | 21 +-
.../internal/deadlock/LocalLockInfo.java | 23 +-
.../internal/deadlock/LocalThread.java | 23 +-
.../deadlock/MessageDependencyMonitor.java | 21 +-
.../internal/deadlock/ThreadReference.java | 21 +-
.../internal/deadlock/UnsafeThreadLocal.java | 21 +-
.../internal/direct/DirectChannel.java | 21 +-
.../internal/direct/MissingStubException.java | 21 +-
.../internal/locks/Collaboration.java | 21 +-
.../distributed/internal/locks/DLockBatch.java | 21 +-
.../internal/locks/DLockBatchId.java | 21 +-
.../internal/locks/DLockGrantor.java | 21 +-
.../locks/DLockLessorDepartureHandler.java | 21 +-
.../internal/locks/DLockQueryProcessor.java | 21 +-
.../locks/DLockRecoverGrantorProcessor.java | 21 +-
.../internal/locks/DLockReleaseProcessor.java | 21 +-
.../internal/locks/DLockRemoteToken.java | 21 +-
.../internal/locks/DLockRequestProcessor.java | 21 +-
.../internal/locks/DLockService.java | 21 +-
.../distributed/internal/locks/DLockStats.java | 21 +-
.../distributed/internal/locks/DLockToken.java | 21 +-
.../internal/locks/DeposeGrantorProcessor.java | 21 +-
.../internal/locks/DistributedLockStats.java | 21 +-
.../internal/locks/DistributedMemberLock.java | 21 +-
.../internal/locks/DummyDLockStats.java | 21 +-
.../internal/locks/ElderInitProcessor.java | 21 +-
.../distributed/internal/locks/ElderState.java | 21 +-
.../distributed/internal/locks/GrantorInfo.java | 21 +-
.../internal/locks/GrantorRequestProcessor.java | 21 +-
.../locks/LockGrantorDestroyedException.java | 21 +-
.../internal/locks/LockGrantorId.java | 21 +-
.../locks/NonGrantorDestroyedProcessor.java | 21 +-
.../internal/locks/RemoteThread.java | 21 +-
.../DistributedMembershipListener.java | 21 +-
.../membership/InternalDistributedMember.java | 21 +-
.../internal/membership/InternalRole.java | 21 +-
.../internal/membership/MemberAttributes.java | 21 +-
.../internal/membership/MemberFactory.java | 21 +-
.../internal/membership/MemberServices.java | 21 +-
.../internal/membership/MembershipManager.java | 21 +-
.../internal/membership/MembershipTestHook.java | 21 +-
.../internal/membership/NetMember.java | 21 +-
.../internal/membership/NetView.java | 21 +-
.../internal/membership/QuorumChecker.java | 21 +-
.../membership/jgroup/GFJGBasicAdapter.java | 16 +
.../membership/jgroup/GFJGPeerAdapter.java | 16 +
.../membership/jgroup/JGroupMember.java | 21 +-
.../membership/jgroup/JGroupMemberFactory.java | 21 +-
.../jgroup/JGroupMembershipManager.java | 21 +-
.../internal/membership/jgroup/LocatorImpl.java | 16 +
.../membership/jgroup/QuorumCheckerImpl.java | 21 +-
.../internal/membership/jgroup/ViewMessage.java | 21 +-
.../internal/streaming/StreamingOperation.java | 21 +-
.../internal/tcpserver/InfoRequest.java | 20 +-
.../internal/tcpserver/InfoResponse.java | 20 +-
.../internal/tcpserver/ShutdownRequest.java | 20 +-
.../internal/tcpserver/ShutdownResponse.java | 20 +-
.../internal/tcpserver/TcpClient.java | 16 +
.../internal/tcpserver/TcpHandler.java | 16 +
.../internal/tcpserver/TcpServer.java | 16 +
.../internal/tcpserver/VersionRequest.java | 16 +
.../internal/tcpserver/VersionResponse.java | 16 +
.../unsafe/RegisterSignalHandlerSupport.java | 20 +-
.../gemstone/gemfire/i18n/LogWriterI18n.java | 21 +-
.../com/gemstone/gemfire/i18n/StringIdImpl.java | 21 +-
.../gemfire/internal/AbstractConfig.java | 27 +-
.../internal/AbstractStatisticsFactory.java | 21 +-
.../gemfire/internal/ArchiveSplitter.java | 21 +-
.../com/gemstone/gemfire/internal/Assert.java | 21 +-
.../gemfire/internal/AvailablePort.java | 21 +-
.../com/gemstone/gemfire/internal/Banner.java | 49 +-
.../gemfire/internal/ByteArrayDataInput.java | 21 +-
.../internal/ByteBufferOutputStream.java | 21 +-
.../gemfire/internal/ByteBufferWriter.java | 16 +
.../gemfire/internal/ClassLoadUtil.java | 21 +-
.../gemfire/internal/ClassPathLoader.java | 21 +-
.../com/gemstone/gemfire/internal/Config.java | 21 +-
.../gemstone/gemfire/internal/ConfigSource.java | 21 +-
.../gemfire/internal/CopyOnWriteHashSet.java | 21 +-
.../com/gemstone/gemfire/internal/DSCODE.java | 21 +-
.../gemstone/gemfire/internal/DSFIDFactory.java | 21 +-
.../internal/DSFIDNotFoundException.java | 21 +-
.../internal/DataSerializableFixedID.java | 21 +-
.../gemfire/internal/DistributionLocator.java | 21 +-
.../internal/DummyStatisticsFactory.java | 21 +-
.../gemfire/internal/DummyStatisticsImpl.java | 21 +-
.../gemfire/internal/ExternalizableDSFID.java | 21 +-
.../com/gemstone/gemfire/internal/FileUtil.java | 21 +-
.../gemfire/internal/GemFireStatSampler.java | 21 +-
.../gemfire/internal/GemFireUtilLauncher.java | 21 +-
.../gemfire/internal/GemFireVersion.java | 21 +-
.../internal/GfeConsoleReaderFactory.java | 20 +-
.../gemfire/internal/HeapDataOutputStream.java | 21 +-
.../gemfire/internal/HistogramStats.java | 21 +-
.../gemfire/internal/HostStatHelper.java | 21 +-
.../gemfire/internal/HostStatSampler.java | 25 +-
.../InsufficientDiskSpaceException.java | 21 +-
.../internal/InternalDataSerializer.java | 32 +-
.../gemfire/internal/InternalEntity.java | 16 +
.../gemfire/internal/InternalInstantiator.java | 21 +-
.../InternalStatisticsDisabledException.java | 21 +-
.../gemfire/internal/JarClassLoader.java | 20 +-
.../gemstone/gemfire/internal/JarDeployer.java | 20 +-
.../gemfire/internal/LinuxProcFsStatistics.java | 21 +-
.../gemfire/internal/LinuxProcessStats.java | 21 +-
.../gemfire/internal/LinuxSystemStats.java | 21 +-
.../gemfire/internal/LocalStatListener.java | 21 +-
.../internal/LocalStatisticsFactory.java | 21 +-
.../gemfire/internal/LocalStatisticsImpl.java | 21 +-
.../gemstone/gemfire/internal/ManagerInfo.java | 20 +-
.../gemfire/internal/MigrationClient.java | 21 +-
.../gemfire/internal/MigrationServer.java | 21 +-
.../gemstone/gemfire/internal/NanoTimer.java | 21 +-
.../gemfire/internal/NullDataOutputStream.java | 21 +-
.../gemstone/gemfire/internal/OSProcess.java | 19 +-
.../gemfire/internal/OSXProcessStats.java | 21 +-
.../gemfire/internal/OSXSystemStats.java | 21 +-
.../gemfire/internal/ObjIdConcurrentMap.java | 21 +-
.../com/gemstone/gemfire/internal/ObjIdMap.java | 21 +-
.../internal/ObjToByteArraySerializer.java | 21 +-
.../gemfire/internal/OneTaskOnlyExecutor.java | 21 +-
.../gemfire/internal/OsStatisticsFactory.java | 21 +-
.../gemfire/internal/PdxSerializerObject.java | 21 +-
.../gemfire/internal/ProcessOutputReader.java | 21 +-
.../gemstone/gemfire/internal/ProcessStats.java | 21 +-
.../gemstone/gemfire/internal/PureJavaMode.java | 21 +-
...cheduledThreadPoolExecutorWithKeepAlive.java | 21 +-
.../com/gemstone/gemfire/internal/Sendable.java | 18 +-
.../gemfire/internal/SerializationVersions.java | 21 +-
.../com/gemstone/gemfire/internal/SetUtils.java | 20 +-
.../gemfire/internal/SharedLibrary.java | 21 +-
.../gemfire/internal/SimpleStatSampler.java | 21 +-
.../com/gemstone/gemfire/internal/SmHelper.java | 21 +-
.../gemstone/gemfire/internal/SocketCloser.java | 16 +
.../gemfire/internal/SocketCreator.java | 61 +-
.../gemfire/internal/SolarisProcessStats.java | 21 +-
.../gemfire/internal/SolarisSystemStats.java | 21 +-
.../gemfire/internal/StatArchiveFormat.java | 21 +-
.../gemfire/internal/StatArchiveReader.java | 21 +-
.../gemfire/internal/StatArchiveWriter.java | 21 +-
.../gemfire/internal/StatSamplerStats.java | 21 +-
.../internal/StatisticDescriptorImpl.java | 21 +-
.../gemfire/internal/StatisticsImpl.java | 21 +-
.../gemfire/internal/StatisticsManager.java | 21 +-
.../internal/StatisticsTypeFactoryImpl.java | 21 +-
.../gemfire/internal/StatisticsTypeImpl.java | 21 +-
.../gemfire/internal/StatisticsTypeXml.java | 21 +-
.../gemstone/gemfire/internal/SystemAdmin.java | 21 +-
.../gemfire/internal/SystemFailureTestHook.java | 21 +-
.../gemstone/gemfire/internal/SystemTimer.java | 21 +-
.../gemfire/internal/UniqueIdGenerator.java | 21 +-
.../com/gemstone/gemfire/internal/VMStats.java | 21 +-
.../gemfire/internal/VMStatsContract.java | 21 +-
.../internal/VMStatsContractFactory.java | 21 +-
.../com/gemstone/gemfire/internal/Version.java | 21 +-
.../internal/VersionedDataInputStream.java | 21 +-
.../internal/VersionedDataOutputStream.java | 21 +-
.../internal/VersionedDataSerializable.java | 16 +
.../gemfire/internal/VersionedDataStream.java | 21 +-
.../gemfire/internal/VersionedObjectInput.java | 21 +-
.../gemfire/internal/VersionedObjectOutput.java | 21 +-
.../gemfire/internal/WindowsProcessStats.java | 21 +-
.../gemfire/internal/WindowsSystemStats.java | 21 +-
.../internal/admin/AdminBridgeServer.java | 16 +
.../gemstone/gemfire/internal/admin/Alert.java | 21 +-
.../gemfire/internal/admin/AlertListener.java | 21 +-
.../gemfire/internal/admin/ApplicationVM.java | 21 +-
.../gemfire/internal/admin/CacheCollector.java | 21 +-
.../gemfire/internal/admin/CacheInfo.java | 21 +-
.../gemfire/internal/admin/CacheSnapshot.java | 21 +-
.../admin/ClientHealthMonitoringRegion.java | 21 +-
.../internal/admin/ClientMembershipMessage.java | 21 +-
.../internal/admin/ClientStatsManager.java | 21 +-
.../internal/admin/CompoundEntrySnapshot.java | 21 +-
.../internal/admin/CompoundRegionSnapshot.java | 21 +-
.../gemfire/internal/admin/DLockInfo.java | 21 +-
.../gemfire/internal/admin/EntrySnapshot.java | 21 +-
.../gemfire/internal/admin/EntryValueNode.java | 23 +-
.../gemfire/internal/admin/GemFireVM.java | 21 +-
.../gemfire/internal/admin/GfManagerAgent.java | 21 +-
.../internal/admin/GfManagerAgentConfig.java | 21 +-
.../internal/admin/GfManagerAgentFactory.java | 21 +-
.../gemfire/internal/admin/GfObject.java | 21 +-
.../gemfire/internal/admin/HealthListener.java | 21 +-
.../internal/admin/JoinLeaveListener.java | 21 +-
.../gemfire/internal/admin/ListenerIdMap.java | 21 +-
.../gemfire/internal/admin/RegionSnapshot.java | 21 +-
.../gemfire/internal/admin/SSLConfig.java | 21 +-
.../gemfire/internal/admin/SnapshotClient.java | 21 +-
.../gemstone/gemfire/internal/admin/Stat.java | 21 +-
.../gemfire/internal/admin/StatAlert.java | 21 +-
.../internal/admin/StatAlertDefinition.java | 21 +-
.../internal/admin/StatAlertsManager.java | 21 +-
.../gemfire/internal/admin/StatListener.java | 21 +-
.../gemfire/internal/admin/StatResource.java | 21 +-
.../gemfire/internal/admin/TransportConfig.java | 21 +-
.../admin/remote/AddHealthListenerRequest.java | 21 +-
.../admin/remote/AddHealthListenerResponse.java | 21 +-
.../admin/remote/AddStatListenerRequest.java | 21 +-
.../admin/remote/AddStatListenerResponse.java | 21 +-
.../remote/AdminConsoleDisconnectMessage.java | 21 +-
.../admin/remote/AdminConsoleMessage.java | 21 +-
.../admin/remote/AdminFailureResponse.java | 21 +-
.../remote/AdminMultipleReplyProcessor.java | 21 +-
.../internal/admin/remote/AdminRegion.java | 21 +-
.../admin/remote/AdminReplyProcessor.java | 21 +-
.../internal/admin/remote/AdminRequest.java | 21 +-
.../internal/admin/remote/AdminResponse.java | 21 +-
.../internal/admin/remote/AdminWaiters.java | 21 +-
.../admin/remote/AlertLevelChangeMessage.java | 21 +-
.../admin/remote/AlertListenerMessage.java | 21 +-
.../admin/remote/AlertsNotificationMessage.java | 21 +-
.../admin/remote/AppCacheSnapshotMessage.java | 21 +-
.../admin/remote/BridgeServerRequest.java | 21 +-
.../admin/remote/BridgeServerResponse.java | 21 +-
.../admin/remote/CacheConfigRequest.java | 21 +-
.../admin/remote/CacheConfigResponse.java | 21 +-
.../internal/admin/remote/CacheDisplay.java | 21 +-
.../internal/admin/remote/CacheInfoRequest.java | 21 +-
.../admin/remote/CacheInfoResponse.java | 21 +-
.../admin/remote/CancelStatListenerRequest.java | 21 +-
.../remote/CancelStatListenerResponse.java | 21 +-
.../internal/admin/remote/Cancellable.java | 21 +-
.../admin/remote/CancellationMessage.java | 23 +-
.../admin/remote/CancellationRegistry.java | 23 +-
.../remote/ChangeRefreshIntervalMessage.java | 21 +-
.../internal/admin/remote/CliLegacyMessage.java | 16 +
.../admin/remote/ClientHealthStats.java | 21 +-
.../internal/admin/remote/CompactRequest.java | 21 +-
.../internal/admin/remote/CompactResponse.java | 21 +-
.../admin/remote/DestroyEntryMessage.java | 23 +-
.../admin/remote/DestroyRegionMessage.java | 23 +-
.../admin/remote/DistributionLocatorId.java | 21 +-
.../internal/admin/remote/DummyEntry.java | 21 +-
.../admin/remote/DurableClientInfoRequest.java | 20 +-
.../admin/remote/DurableClientInfoResponse.java | 20 +-
.../admin/remote/EntryValueNodeImpl.java | 23 +-
.../admin/remote/FetchDistLockInfoRequest.java | 21 +-
.../admin/remote/FetchDistLockInfoResponse.java | 21 +-
.../remote/FetchHealthDiagnosisRequest.java | 21 +-
.../remote/FetchHealthDiagnosisResponse.java | 21 +-
.../internal/admin/remote/FetchHostRequest.java | 21 +-
.../admin/remote/FetchHostResponse.java | 21 +-
.../remote/FetchResourceAttributesRequest.java | 21 +-
.../remote/FetchResourceAttributesResponse.java | 21 +-
.../admin/remote/FetchStatsRequest.java | 21 +-
.../admin/remote/FetchStatsResponse.java | 20 +-
.../admin/remote/FetchSysCfgRequest.java | 21 +-
.../admin/remote/FetchSysCfgResponse.java | 21 +-
.../remote/FlushAppCacheSnapshotMessage.java | 21 +-
.../admin/remote/HealthListenerMessage.java | 21 +-
.../remote/InspectionClasspathManager.java | 21 +-
.../admin/remote/LicenseInfoRequest.java | 21 +-
.../admin/remote/LicenseInfoResponse.java | 21 +-
.../remote/MissingPersistentIDsRequest.java | 21 +-
.../remote/MissingPersistentIDsResponse.java | 21 +-
.../admin/remote/ObjectDetailsRequest.java | 21 +-
.../admin/remote/ObjectDetailsResponse.java | 21 +-
.../admin/remote/ObjectNamesRequest.java | 21 +-
.../admin/remote/ObjectNamesResponse.java | 21 +-
.../PrepareRevokePersistentIDRequest.java | 21 +-
.../remote/RefreshMemberSnapshotRequest.java | 21 +-
.../remote/RefreshMemberSnapshotResponse.java | 21 +-
.../admin/remote/RegionAdminMessage.java | 21 +-
.../admin/remote/RegionAdminRequest.java | 21 +-
.../admin/remote/RegionAttributesRequest.java | 21 +-
.../admin/remote/RegionAttributesResponse.java | 21 +-
.../internal/admin/remote/RegionRequest.java | 21 +-
.../internal/admin/remote/RegionResponse.java | 21 +-
.../admin/remote/RegionSizeRequest.java | 21 +-
.../admin/remote/RegionSizeResponse.java | 21 +-
.../admin/remote/RegionStatisticsRequest.java | 21 +-
.../admin/remote/RegionStatisticsResponse.java | 21 +-
.../remote/RegionSubRegionSizeRequest.java | 20 +-
.../remote/RegionSubRegionsSizeResponse.java | 20 +-
.../internal/admin/remote/RemoteAlert.java | 21 +-
.../admin/remote/RemoteApplicationVM.java | 21 +-
.../admin/remote/RemoteBridgeServer.java | 21 +-
.../internal/admin/remote/RemoteCacheInfo.java | 21 +-
.../admin/remote/RemoteCacheStatistics.java | 21 +-
.../internal/admin/remote/RemoteDLockInfo.java | 21 +-
.../admin/remote/RemoteEntrySnapshot.java | 21 +-
.../internal/admin/remote/RemoteGemFireVM.java | 21 +-
.../admin/remote/RemoteGfManagerAgent.java | 21 +-
.../internal/admin/remote/RemoteObjectName.java | 21 +-
.../admin/remote/RemoteRegionAttributes.java | 23 +-
.../admin/remote/RemoteRegionSnapshot.java | 21 +-
.../internal/admin/remote/RemoteStat.java | 21 +-
.../admin/remote/RemoteStatResource.java | 21 +-
.../admin/remote/RemoteTransportConfig.java | 21 +-
.../remote/RemoveHealthListenerRequest.java | 21 +-
.../remote/RemoveHealthListenerResponse.java | 21 +-
.../admin/remote/ResetHealthStatusRequest.java | 21 +-
.../admin/remote/ResetHealthStatusResponse.java | 21 +-
.../admin/remote/RevokePersistentIDRequest.java | 21 +-
.../remote/RevokePersistentIDResponse.java | 21 +-
.../admin/remote/RootRegionRequest.java | 21 +-
.../admin/remote/RootRegionResponse.java | 21 +-
.../remote/ShutdownAllGatewayHubsRequest.java | 16 +
.../admin/remote/ShutdownAllRequest.java | 21 +-
.../admin/remote/ShutdownAllResponse.java | 21 +-
.../admin/remote/SnapshotResultMessage.java | 21 +-
.../remote/StatAlertsManagerAssignMessage.java | 21 +-
.../admin/remote/StatListenerMessage.java | 21 +-
.../admin/remote/StoreSysCfgRequest.java | 21 +-
.../admin/remote/StoreSysCfgResponse.java | 21 +-
.../internal/admin/remote/SubRegionRequest.java | 21 +-
.../admin/remote/SubRegionResponse.java | 21 +-
.../internal/admin/remote/TailLogRequest.java | 21 +-
.../internal/admin/remote/TailLogResponse.java | 21 +-
.../remote/UpdateAlertDefinitionMessage.java | 21 +-
.../admin/remote/VersionInfoRequest.java | 21 +-
.../admin/remote/VersionInfoResponse.java | 21 +-
.../admin/remote/VersionMismatchAlert.java | 21 +-
.../admin/statalerts/BaseDecoratorImpl.java | 21 +-
.../statalerts/DummyStatisticInfoImpl.java | 21 +-
.../admin/statalerts/FunctionDecoratorImpl.java | 21 +-
.../admin/statalerts/FunctionHelper.java | 20 +-
.../statalerts/GaugeThresholdDecoratorImpl.java | 21 +-
.../statalerts/MultiAttrDefinitionImpl.java | 21 +-
.../NumberThresholdDecoratorImpl.java | 21 +-
.../statalerts/SingleAttrDefinitionImpl.java | 21 +-
.../admin/statalerts/StatisticInfo.java | 21 +-
.../admin/statalerts/StatisticInfoImpl.java | 21 +-
.../cache/AbstractBucketRegionQueue.java | 21 +-
.../internal/cache/AbstractCacheServer.java | 21 +-
.../cache/AbstractDiskLRURegionEntry.java | 21 +-
.../internal/cache/AbstractDiskRegion.java | 21 +-
.../internal/cache/AbstractDiskRegionEntry.java | 21 +-
.../internal/cache/AbstractLRURegionEntry.java | 21 +-
.../internal/cache/AbstractLRURegionMap.java | 21 +-
.../cache/AbstractOplogDiskRegionEntry.java | 21 +-
.../gemfire/internal/cache/AbstractRegion.java | 46 +-
.../internal/cache/AbstractRegionEntry.java | 21 +-
.../internal/cache/AbstractRegionMap.java | 21 +-
.../internal/cache/AbstractUpdateOperation.java | 21 +-
.../gemfire/internal/cache/AcceptHelper.java | 21 +-
.../cache/AddCacheServerProfileMessage.java | 21 +-
.../gemfire/internal/cache/BackupLock.java | 21 +-
.../gemfire/internal/cache/BucketAdvisor.java | 21 +-
.../gemfire/internal/cache/BucketDump.java | 21 +-
.../internal/cache/BucketNotFoundException.java | 21 +-
.../cache/BucketPersistenceAdvisor.java | 21 +-
.../gemfire/internal/cache/BucketRegion.java | 21 +-
.../internal/cache/BucketRegionEvictior.java | 21 +-
.../internal/cache/BucketRegionQueue.java | 21 +-
.../internal/cache/BucketServerLocation.java | 20 +-
.../internal/cache/BucketServerLocation66.java | 20 +-
.../cache/BytesAndBitsForCompactor.java | 21 +-
.../internal/cache/CacheClientStatus.java | 21 +-
.../gemfire/internal/cache/CacheConfig.java | 21 +-
.../cache/CacheDistributionAdvisee.java | 21 +-
.../cache/CacheDistributionAdvisor.java | 21 +-
.../internal/cache/CacheLifecycleListener.java | 21 +-
.../gemfire/internal/cache/CacheObserver.java | 21 +-
.../internal/cache/CacheObserverAdapter.java | 21 +-
.../internal/cache/CacheObserverHolder.java | 21 +-
.../gemfire/internal/cache/CachePerfStats.java | 21 +-
.../internal/cache/CacheServerAdvisor.java | 21 +-
.../gemfire/internal/cache/CacheServerImpl.java | 21 +-
.../internal/cache/CacheServerLauncher.java | 21 +-
.../internal/cache/CacheStatisticsImpl.java | 21 +-
.../internal/cache/CachedDeserializable.java | 21 +-
.../cache/CachedDeserializableFactory.java | 21 +-
.../internal/cache/ClientRegionEventImpl.java | 21 +-
.../internal/cache/ClientServerObserver.java | 21 +-
.../cache/ClientServerObserverAdapter.java | 21 +-
.../cache/ClientServerObserverHolder.java | 21 +-
.../cache/ClientSubscriptionConfigImpl.java | 21 +-
.../internal/cache/CloseCacheMessage.java | 21 +-
.../cache/ClusterConfigurationLoader.java | 16 +
.../internal/cache/ColocationHelper.java | 20 +-
.../internal/cache/CommitReplyException.java | 21 +-
.../internal/cache/CompactableOplog.java | 21 +-
.../gemfire/internal/cache/Conflatable.java | 21 +-
.../internal/cache/ControllerAdvisor.java | 21 +-
.../internal/cache/CountingDataInputStream.java | 21 +-
.../internal/cache/CreateRegionProcessor.java | 21 +-
.../internal/cache/CustomEntryExpiryTask.java | 16 +
.../cache/CustomEvictionAttributesImpl.java | 21 +-
.../internal/cache/DataLocationException.java | 21 +-
.../internal/cache/DestroyOperation.java | 21 +-
.../cache/DestroyPartitionedRegionMessage.java | 21 +-
.../internal/cache/DestroyRegionOperation.java | 21 +-
.../gemfire/internal/cache/DestroyedEntry.java | 21 +-
.../internal/cache/DirectReplyMessage.java | 21 +-
.../gemfire/internal/cache/DirectoryHolder.java | 21 +-
.../internal/cache/DiskDirectoryStats.java | 21 +-
.../gemfire/internal/cache/DiskEntry.java | 21 +-
.../gemstone/gemfire/internal/cache/DiskId.java | 21 +-
.../gemfire/internal/cache/DiskInitFile.java | 21 +-
.../gemfire/internal/cache/DiskRegion.java | 21 +-
.../gemfire/internal/cache/DiskRegionStats.java | 21 +-
.../internal/cache/DiskStoreAttributes.java | 21 +-
.../gemfire/internal/cache/DiskStoreBackup.java | 21 +-
.../internal/cache/DiskStoreFactoryImpl.java | 21 +-
.../gemfire/internal/cache/DiskStoreImpl.java | 21 +-
.../internal/cache/DiskStoreMonitor.java | 21 +-
.../internal/cache/DiskStoreObserver.java | 21 +-
.../gemfire/internal/cache/DiskStoreStats.java | 21 +-
.../gemfire/internal/cache/DiskStoreTask.java | 21 +-
.../internal/cache/DiskWriteAttributesImpl.java | 21 +-
.../internal/cache/DistPeerTXStateStub.java | 16 +
.../cache/DistTXAdjunctCommitMessage.java | 16 +
.../internal/cache/DistTXCommitMessage.java | 17 +-
.../cache/DistTXCoordinatorInterface.java | 21 +-
.../internal/cache/DistTXPrecommitMessage.java | 17 +-
.../internal/cache/DistTXRollbackMessage.java | 17 +-
.../gemfire/internal/cache/DistTXState.java | 16 +
.../cache/DistTXStateOnCoordinator.java | 16 +
.../internal/cache/DistTXStateProxyImpl.java | 16 +
.../DistTXStateProxyImplOnCoordinator.java | 18 +-
.../cache/DistTXStateProxyImplOnDatanode.java | 16 +
.../cache/DistributedCacheOperation.java | 20 +-
.../cache/DistributedClearOperation.java | 21 +-
.../cache/DistributedPutAllOperation.java | 21 +-
.../internal/cache/DistributedRegion.java | 21 +-
...stributedRegionFunctionStreamingMessage.java | 21 +-
.../cache/DistributedRemoveAllOperation.java | 21 +-
.../cache/DistributedTombstoneOperation.java | 21 +-
.../internal/cache/DummyCachePerfStats.java | 21 +-
.../internal/cache/DynamicRegionAttributes.java | 21 +-
.../cache/DynamicRegionFactoryImpl.java | 21 +-
.../gemfire/internal/cache/EntriesMap.java | 21 +-
.../gemfire/internal/cache/EntriesSet.java | 21 +-
.../gemfire/internal/cache/EntryBits.java | 21 +-
.../gemfire/internal/cache/EntryEventImpl.java | 21 +-
.../gemfire/internal/cache/EntryExpiryTask.java | 24 +-
.../internal/cache/EntryOperationImpl.java | 23 +-
.../gemfire/internal/cache/EntrySnapshot.java | 23 +-
.../internal/cache/EnumListenerEvent.java | 20 +-
.../gemfire/internal/cache/EventID.java | 21 +-
.../internal/cache/EventStateHelper.java | 21 +-
.../gemfire/internal/cache/EventTracker.java | 21 +-
.../internal/cache/EvictionAttributesImpl.java | 23 +-
.../gemfire/internal/cache/EvictorService.java | 21 +-
.../internal/cache/ExpirationScheduler.java | 21 +-
.../gemfire/internal/cache/ExpiryTask.java | 45 +-
.../internal/cache/ExportDiskRegion.java | 16 +
.../gemfire/internal/cache/FilterProfile.java | 21 +-
.../internal/cache/FilterRoutingInfo.java | 21 +-
.../cache/FindDurableQueueProcessor.java | 21 +-
.../internal/cache/FindRemoteTXMessage.java | 21 +-
.../internal/cache/FindVersionTagOperation.java | 21 +-
.../cache/FixedPartitionAttributesImpl.java | 21 +-
.../internal/cache/ForceReattemptException.java | 21 +-
.../cache/ForceableLinkedBlockingQueue.java | 21 +-
.../FunctionStreamingOrderedReplyMessage.java | 21 +-
.../cache/FunctionStreamingReplyMessage.java | 21 +-
.../internal/cache/GatewayEventFilter.java | 16 +
.../internal/cache/GemFireCacheImpl.java | 69 +-
.../internal/cache/GemfireCacheHelper.java | 23 +-
.../gemfire/internal/cache/GridAdvisor.java | 21 +-
.../gemfire/internal/cache/HARegion.java | 21 +-
.../internal/cache/HDFSLRURegionMap.java | 21 +-
.../gemfire/internal/cache/HDFSRegionMap.java | 16 +
.../internal/cache/HDFSRegionMapDelegate.java | 21 +-
.../internal/cache/HDFSRegionMapImpl.java | 21 +-
.../internal/cache/HasCachePerfStats.java | 16 +
.../gemfire/internal/cache/ImageState.java | 21 +-
.../cache/InMemoryPersistentMemberView.java | 21 +-
.../internal/cache/IncomingGatewayStatus.java | 21 +-
.../internal/cache/InitialImageFlowControl.java | 21 +-
.../internal/cache/InitialImageOperation.java | 21 +-
.../gemfire/internal/cache/InlineKeyHelper.java | 21 +-
.../gemfire/internal/cache/InterestEvent.java | 21 +-
.../gemfire/internal/cache/InterestFilter.java | 21 +-
.../cache/InterestRegistrationEventImpl.java | 21 +-
.../gemfire/internal/cache/InternalCache.java | 18 +-
.../internal/cache/InternalCacheEvent.java | 21 +-
.../internal/cache/InternalDataView.java | 21 +-
.../internal/cache/InternalRegionArguments.java | 21 +-
.../internal/cache/InvalidateOperation.java | 21 +-
.../InvalidatePartitionedRegionMessage.java | 21 +-
.../cache/InvalidateRegionOperation.java | 21 +-
.../cache/JtaAfterCompletionMessage.java | 21 +-
.../cache/JtaBeforeCompletionMessage.java | 21 +-
.../gemfire/internal/cache/KeyInfo.java | 21 +-
.../internal/cache/KeyWithRegionContext.java | 21 +-
.../gemfire/internal/cache/ListOfDeltas.java | 21 +-
.../internal/cache/LoaderHelperFactory.java | 21 +-
.../internal/cache/LoaderHelperImpl.java | 21 +-
.../gemfire/internal/cache/LocalDataSet.java | 21 +-
.../gemfire/internal/cache/LocalRegion.java | 26 +-
.../internal/cache/LocalRegionDataView.java | 21 +-
.../cache/MemberFunctionStreamingMessage.java | 21 +-
.../cache/MinimumSystemRequirements.java | 21 +-
.../cache/NetSearchExpirationCalculator.java | 21 +-
.../gemstone/gemfire/internal/cache/Node.java | 20 +-
.../internal/cache/NonLocalRegionEntry.java | 21 +-
.../cache/NonLocalRegionEntryWithStats.java | 23 +-
.../internal/cache/OffHeapRegionEntry.java | 16 +
.../cache/OfflineCompactionDiskRegion.java | 21 +-
.../gemstone/gemfire/internal/cache/OpType.java | 21 +-
.../gemstone/gemfire/internal/cache/Oplog.java | 22 +-
.../gemfire/internal/cache/OplogSet.java | 16 +
.../internal/cache/OrderedTombstoneMap.java | 21 +-
.../gemfire/internal/cache/OverflowOplog.java | 21 +-
.../internal/cache/OverflowOplogSet.java | 21 +-
.../internal/cache/PRContainsValueFunction.java | 21 +-
.../internal/cache/PRHARedundancyProvider.java | 20 +-
.../internal/cache/PRQueryProcessor.java | 20 +-
.../internal/cache/PRSystemPropertyGetter.java | 21 +-
.../internal/cache/PartitionAttributesImpl.java | 21 +-
.../internal/cache/PartitionRegionConfig.java | 21 +-
.../cache/PartitionRegionConfigValidator.java | 21 +-
.../internal/cache/PartitionedRegion.java | 47 +-
.../PartitionedRegionBucketMgmtHelper.java | 20 +-
.../cache/PartitionedRegionDataStore.java | 20 +-
.../cache/PartitionedRegionDataView.java | 21 +-
.../cache/PartitionedRegionException.java | 21 +-
.../internal/cache/PartitionedRegionHelper.java | 22 +-
.../cache/PartitionedRegionQueryEvaluator.java | 20 +-
.../internal/cache/PartitionedRegionStats.java | 21 +-
.../internal/cache/PartitionedRegionStatus.java | 21 +-
.../gemfire/internal/cache/PeerTXStateStub.java | 21 +-
.../internal/cache/PersistentOplogSet.java | 21 +-
.../internal/cache/PlaceHolderDiskRegion.java | 23 +-
.../gemfire/internal/cache/PoolFactoryImpl.java | 21 +-
.../gemfire/internal/cache/PoolManagerImpl.java | 21 +-
.../gemfire/internal/cache/PoolStats.java | 21 +-
.../cache/PreferBytesCachedDeserializable.java | 21 +-
.../internal/cache/PrimaryBucketException.java | 21 +-
.../cache/ProfileExchangeProcessor.java | 21 +-
.../internal/cache/ProxyBucketRegion.java | 21 +-
.../gemfire/internal/cache/ProxyRegionMap.java | 21 +-
.../cache/PutAllPartialResultException.java | 21 +-
.../gemfire/internal/cache/QueuedOperation.java | 21 +-
.../internal/cache/RegionClearedException.java | 21 +-
.../gemfire/internal/cache/RegionEntry.java | 21 +-
.../internal/cache/RegionEntryContext.java | 21 +-
.../internal/cache/RegionEntryFactory.java | 21 +-
.../gemfire/internal/cache/RegionEventImpl.java | 21 +-
.../internal/cache/RegionEvictorTask.java | 21 +-
.../internal/cache/RegionExpiryTask.java | 24 +-
.../internal/cache/RegionFactoryImpl.java | 21 +-
.../internal/cache/RegionIdleExpiryTask.java | 21 +-
.../gemfire/internal/cache/RegionMap.java | 21 +-
.../internal/cache/RegionMapFactory.java | 21 +-
.../gemfire/internal/cache/RegionQueue.java | 21 +-
.../internal/cache/RegionQueueException.java | 21 +-
.../gemfire/internal/cache/RegionStatus.java | 21 +-
.../internal/cache/RegionTTLExpiryTask.java | 21 +-
.../internal/cache/ReleaseClearLockMessage.java | 23 +-
.../cache/ReliableDistributionData.java | 21 +-
.../internal/cache/ReliableMessageQueue.java | 21 +-
.../cache/ReliableMessageQueueFactory.java | 21 +-
.../cache/ReliableMessageQueueFactoryImpl.java | 21 +-
.../cache/RemoteContainsKeyValueMessage.java | 20 +-
.../internal/cache/RemoteDestroyMessage.java | 21 +-
.../internal/cache/RemoteFetchEntryMessage.java | 20 +-
.../cache/RemoteFetchVersionMessage.java | 20 +-
.../internal/cache/RemoteGetMessage.java | 21 +-
.../internal/cache/RemoteInvalidateMessage.java | 20 +-
.../cache/RemoteOperationException.java | 21 +-
.../internal/cache/RemoteOperationMessage.java | 21 +-
.../RemoteOperationMessageWithDirectReply.java | 21 +-
.../internal/cache/RemotePutAllMessage.java | 21 +-
.../internal/cache/RemotePutMessage.java | 21 +-
.../internal/cache/RemoteRegionOperation.java | 20 +-
.../internal/cache/RemoteRemoveAllMessage.java | 21 +-
.../gemfire/internal/cache/RoleEventImpl.java | 21 +-
.../cache/SearchLoadAndWriteProcessor.java | 21 +-
.../internal/cache/SendQueueOperation.java | 21 +-
.../internal/cache/SerializationHelper.java | 16 +
.../internal/cache/ServerPingMessage.java | 16 +
.../internal/cache/StateFlushOperation.java | 21 +-
.../cache/StoreAllCachedDeserializable.java | 21 +-
.../internal/cache/TXBucketRegionState.java | 21 +-
.../gemfire/internal/cache/TXCommitMessage.java | 21 +-
.../gemfire/internal/cache/TXEntry.java | 21 +-
.../gemfire/internal/cache/TXEntryState.java | 21 +-
.../internal/cache/TXEntryStateFactory.java | 21 +-
.../internal/cache/TXEntryUserAttrState.java | 21 +-
.../gemfire/internal/cache/TXEvent.java | 21 +-
.../internal/cache/TXFarSideCMTracker.java | 21 +-
.../gemstone/gemfire/internal/cache/TXId.java | 22 +-
.../gemfire/internal/cache/TXLockRequest.java | 21 +-
.../gemfire/internal/cache/TXManagerImpl.java | 21 +-
.../gemfire/internal/cache/TXMessage.java | 21 +-
.../internal/cache/TXRegionLockRequestImpl.java | 21 +-
.../gemfire/internal/cache/TXRegionState.java | 21 +-
.../internal/cache/TXRemoteCommitMessage.java | 21 +-
.../internal/cache/TXRemoteRollbackMessage.java | 21 +-
.../internal/cache/TXReservationMgr.java | 21 +-
.../gemfire/internal/cache/TXRmtEvent.java | 21 +-
.../gemfire/internal/cache/TXState.java | 21 +-
.../internal/cache/TXStateInterface.java | 21 +-
.../gemfire/internal/cache/TXStateProxy.java | 21 +-
.../internal/cache/TXStateProxyImpl.java | 21 +-
.../gemfire/internal/cache/TXStateStub.java | 21 +-
.../cache/TXSynchronizationRunnable.java | 21 +-
.../cache/TestHeapThresholdObserver.java | 21 +-
.../cache/TimestampedEntryEventImpl.java | 21 +-
.../gemstone/gemfire/internal/cache/Token.java | 21 +-
.../internal/cache/TombstoneService.java | 24 +-
.../internal/cache/TransactionMessage.java | 21 +-
.../gemfire/internal/cache/TxEntryFactory.java | 16 +
.../internal/cache/UnsharedImageState.java | 21 +-
.../cache/UpdateAttributesProcessor.java | 21 +-
.../cache/UpdateEntryVersionOperation.java | 22 +-
.../gemfire/internal/cache/UpdateOperation.java | 20 +-
.../cache/UserSpecifiedDiskStoreAttributes.java | 21 +-
.../cache/UserSpecifiedRegionAttributes.java | 21 +-
.../internal/cache/VMCachedDeserializable.java | 21 +-
.../gemfire/internal/cache/VMLRURegionMap.java | 21 +-
.../gemfire/internal/cache/VMRegionMap.java | 21 +-
.../cache/VMStatsDiskLRURegionEntry.java | 21 +-
.../cache/VMStatsDiskLRURegionEntryHeap.java | 21 +-
.../VMStatsDiskLRURegionEntryHeapIntKey.java | 21 +-
.../VMStatsDiskLRURegionEntryHeapLongKey.java | 21 +-
.../VMStatsDiskLRURegionEntryHeapObjectKey.java | 21 +-
...VMStatsDiskLRURegionEntryHeapStringKey1.java | 21 +-
...VMStatsDiskLRURegionEntryHeapStringKey2.java | 21 +-
.../VMStatsDiskLRURegionEntryHeapUUIDKey.java | 21 +-
.../cache/VMStatsDiskLRURegionEntryOffHeap.java | 21 +-
.../VMStatsDiskLRURegionEntryOffHeapIntKey.java | 21 +-
...VMStatsDiskLRURegionEntryOffHeapLongKey.java | 21 +-
...StatsDiskLRURegionEntryOffHeapObjectKey.java | 21 +-
...tatsDiskLRURegionEntryOffHeapStringKey1.java | 21 +-
...tatsDiskLRURegionEntryOffHeapStringKey2.java | 21 +-
...VMStatsDiskLRURegionEntryOffHeapUUIDKey.java | 21 +-
.../internal/cache/VMStatsDiskRegionEntry.java | 21 +-
.../cache/VMStatsDiskRegionEntryHeap.java | 21 +-
.../cache/VMStatsDiskRegionEntryHeapIntKey.java | 21 +-
.../VMStatsDiskRegionEntryHeapLongKey.java | 21 +-
.../VMStatsDiskRegionEntryHeapObjectKey.java | 21 +-
.../VMStatsDiskRegionEntryHeapStringKey1.java | 21 +-
.../VMStatsDiskRegionEntryHeapStringKey2.java | 21 +-
.../VMStatsDiskRegionEntryHeapUUIDKey.java | 21 +-
.../cache/VMStatsDiskRegionEntryOffHeap.java | 21 +-
.../VMStatsDiskRegionEntryOffHeapIntKey.java | 21 +-
.../VMStatsDiskRegionEntryOffHeapLongKey.java | 21 +-
.../VMStatsDiskRegionEntryOffHeapObjectKey.java | 21 +-
...VMStatsDiskRegionEntryOffHeapStringKey1.java | 21 +-
...VMStatsDiskRegionEntryOffHeapStringKey2.java | 21 +-
.../VMStatsDiskRegionEntryOffHeapUUIDKey.java | 21 +-
.../internal/cache/VMStatsLRURegionEntry.java | 21 +-
.../cache/VMStatsLRURegionEntryHeap.java | 21 +-
.../cache/VMStatsLRURegionEntryHeapIntKey.java | 21 +-
.../cache/VMStatsLRURegionEntryHeapLongKey.java | 21 +-
.../VMStatsLRURegionEntryHeapObjectKey.java | 21 +-
.../VMStatsLRURegionEntryHeapStringKey1.java | 21 +-
.../VMStatsLRURegionEntryHeapStringKey2.java | 21 +-
.../cache/VMStatsLRURegionEntryHeapUUIDKey.java | 21 +-
.../cache/VMStatsLRURegionEntryOffHeap.java | 21 +-
.../VMStatsLRURegionEntryOffHeapIntKey.java | 21 +-
.../VMStatsLRURegionEntryOffHeapLongKey.java | 21 +-
.../VMStatsLRURegionEntryOffHeapObjectKey.java | 21 +-
.../VMStatsLRURegionEntryOffHeapStringKey1.java | 21 +-
.../VMStatsLRURegionEntryOffHeapStringKey2.java | 21 +-
.../VMStatsLRURegionEntryOffHeapUUIDKey.java | 21 +-
.../internal/cache/VMStatsRegionEntry.java | 21 +-
.../internal/cache/VMStatsRegionEntryHeap.java | 21 +-
.../cache/VMStatsRegionEntryHeapIntKey.java | 21 +-
.../cache/VMStatsRegionEntryHeapLongKey.java | 21 +-
.../cache/VMStatsRegionEntryHeapObjectKey.java | 21 +-
.../cache/VMStatsRegionEntryHeapStringKey1.java | 21 +-
.../cache/VMStatsRegionEntryHeapStringKey2.java | 21 +-
.../cache/VMStatsRegionEntryHeapUUIDKey.java | 21 +-
.../cache/VMStatsRegionEntryOffHeap.java | 21 +-
.../cache/VMStatsRegionEntryOffHeapIntKey.java | 21 +-
.../cache/VMStatsRegionEntryOffHeapLongKey.java | 21 +-
.../VMStatsRegionEntryOffHeapObjectKey.java | 21 +-
.../VMStatsRegionEntryOffHeapStringKey1.java | 21 +-
.../VMStatsRegionEntryOffHeapStringKey2.java | 21 +-
.../cache/VMStatsRegionEntryOffHeapUUIDKey.java | 21 +-
.../cache/VMThinDiskLRURegionEntry.java | 21 +-
.../cache/VMThinDiskLRURegionEntryHeap.java | 21 +-
.../VMThinDiskLRURegionEntryHeapIntKey.java | 21 +-
.../VMThinDiskLRURegionEntryHeapLongKey.java | 21 +-
.../VMThinDiskLRURegionEntryHeapObjectKey.java | 21 +-
.../VMThinDiskLRURegionEntryHeapStringKey1.java | 21 +-
.../VMThinDiskLRURegionEntryHeapStringKey2.java | 21 +-
.../VMThinDiskLRURegionEntryHeapUUIDKey.java | 21 +-
.../cache/VMThinDiskLRURegionEntryOffHeap.java | 21 +-
.../VMThinDiskLRURegionEntryOffHeapIntKey.java | 21 +-
.../VMThinDiskLRURegionEntryOffHeapLongKey.java | 21 +-
...MThinDiskLRURegionEntryOffHeapObjectKey.java | 21 +-
...ThinDiskLRURegionEntryOffHeapStringKey1.java | 21 +-
...ThinDiskLRURegionEntryOffHeapStringKey2.java | 21 +-
.../VMThinDiskLRURegionEntryOffHeapUUIDKey.java | 21 +-
.../internal/cache/VMThinDiskRegionEntry.java | 21 +-
.../cache/VMThinDiskRegionEntryHeap.java | 21 +-
.../cache/VMThinDiskRegionEntryHeapIntKey.java | 21 +-
.../cache/VMThinDiskRegionEntryHeapLongKey.java | 21 +-
.../VMThinDiskRegionEntryHeapObjectKey.java | 21 +-
.../VMThinDiskRegionEntryHeapStringKey1.java | 21 +-
.../VMThinDiskRegionEntryHeapStringKey2.java | 21 +-
.../cache/VMThinDiskRegionEntryHeapUUIDKey.java | 21 +-
.../cache/VMThinDiskRegionEntryOffHeap.java | 21 +-
.../VMThinDiskRegionEntryOffHeapIntKey.java | 21 +-
.../VMThinDiskRegionEntryOffHeapLongKey.java | 21 +-
.../VMThinDiskRegionEntryOffHeapObjectKey.java | 21 +-
.../VMThinDiskRegionEntryOffHeapStringKey1.java | 21 +-
.../VMThinDiskRegionEntryOffHeapStringKey2.java | 21 +-
.../VMThinDiskRegionEntryOffHeapUUIDKey.java | 21 +-
.../internal/cache/VMThinLRURegionEntry.java | 21 +-
.../cache/VMThinLRURegionEntryHeap.java | 21 +-
.../cache/VMThinLRURegionEntryHeapIntKey.java | 21 +-
.../cache/VMThinLRURegionEntryHeapLongKey.java | 21 +-
.../VMThinLRURegionEntryHeapObjectKey.java | 21 +-
.../VMThinLRURegionEntryHeapStringKey1.java | 21 +-
.../VMThinLRURegionEntryHeapStringKey2.java | 21 +-
.../cache/VMThinLRURegionEntryHeapUUIDKey.java | 21 +-
.../cache/VMThinLRURegionEntryOffHeap.java | 21 +-
.../VMThinLRURegionEntryOffHeapIntKey.java | 21 +-
.../VMThinLRURegionEntryOffHeapLongKey.java | 21 +-
.../VMThinLRURegionEntryOffHeapObjectKey.java | 21 +-
.../VMThinLRURegionEntryOffHeapStringKey1.java | 21 +-
.../VMThinLRURegionEntryOffHeapStringKey2.java | 21 +-
.../VMThinLRURegionEntryOffHeapUUIDKey.java | 21 +-
.../internal/cache/VMThinRegionEntry.java | 21 +-
.../internal/cache/VMThinRegionEntryHeap.java | 21 +-
.../cache/VMThinRegionEntryHeapIntKey.java | 21 +-
.../cache/VMThinRegionEntryHeapLongKey.java | 21 +-
.../cache/VMThinRegionEntryHeapObjectKey.java | 21 +-
.../cache/VMThinRegionEntryHeapStringKey1.java | 21 +-
.../cache/VMThinRegionEntryHeapStringKey2.java | 21 +-
.../cache/VMThinRegionEntryHeapUUIDKey.java | 21 +-
.../cache/VMThinRegionEntryOffHeap.java | 16 +
.../cache/VMThinRegionEntryOffHeapIntKey.java | 21 +-
.../cache/VMThinRegionEntryOffHeapLongKey.java | 21 +-
.../VMThinRegionEntryOffHeapObjectKey.java | 21 +-
.../VMThinRegionEntryOffHeapStringKey1.java | 21 +-
.../VMThinRegionEntryOffHeapStringKey2.java | 21 +-
.../cache/VMThinRegionEntryOffHeapUUIDKey.java | 21 +-
.../internal/cache/ValidatingDiskRegion.java | 21 +-
.../internal/cache/ValueByteWrapper.java | 21 +-
.../internal/cache/VersionTimestamp.java | 21 +-
.../cache/VersionedStatsDiskLRURegionEntry.java | 21 +-
.../VersionedStatsDiskLRURegionEntryHeap.java | 21 +-
...sionedStatsDiskLRURegionEntryHeapIntKey.java | 21 +-
...ionedStatsDiskLRURegionEntryHeapLongKey.java | 21 +-
...nedStatsDiskLRURegionEntryHeapObjectKey.java | 21 +-
...edStatsDiskLRURegionEntryHeapStringKey1.java | 21 +-
...edStatsDiskLRURegionEntryHeapStringKey2.java | 21 +-
...ionedStatsDiskLRURegionEntryHeapUUIDKey.java | 21 +-
...VersionedStatsDiskLRURegionEntryOffHeap.java | 21 +-
...nedStatsDiskLRURegionEntryOffHeapIntKey.java | 21 +-
...edStatsDiskLRURegionEntryOffHeapLongKey.java | 21 +-
...StatsDiskLRURegionEntryOffHeapObjectKey.java | 21 +-
...tatsDiskLRURegionEntryOffHeapStringKey1.java | 21 +-
...tatsDiskLRURegionEntryOffHeapStringKey2.java | 21 +-
...edStatsDiskLRURegionEntryOffHeapUUIDKey.java | 21 +-
.../cache/VersionedStatsDiskRegionEntry.java | 21 +-
.../VersionedStatsDiskRegionEntryHeap.java | 21 +-
...VersionedStatsDiskRegionEntryHeapIntKey.java | 21 +-
...ersionedStatsDiskRegionEntryHeapLongKey.java | 21 +-
...sionedStatsDiskRegionEntryHeapObjectKey.java | 21 +-
...ionedStatsDiskRegionEntryHeapStringKey1.java | 21 +-
...ionedStatsDiskRegionEntryHeapStringKey2.java | 21 +-
...ersionedStatsDiskRegionEntryHeapUUIDKey.java | 21 +-
.../VersionedStatsDiskRegionEntryOffHeap.java | 21 +-
...sionedStatsDiskRegionEntryOffHeapIntKey.java | 21 +-
...ionedStatsDiskRegionEntryOffHeapLongKey.java | 21 +-
...nedStatsDiskRegionEntryOffHeapObjectKey.java | 21 +-
...edStatsDiskRegionEntryOffHeapStringKey1.java | 21 +-
...edStatsDiskRegionEntryOffHeapStringKey2.java | 21 +-
...ionedStatsDiskRegionEntryOffHeapUUIDKey.java | 21 +-
.../cache/VersionedStatsLRURegionEntry.java | 21 +-
.../cache/VersionedStatsLRURegionEntryHeap.java | 21 +-
.../VersionedStatsLRURegionEntryHeapIntKey.java | 21 +-
...VersionedStatsLRURegionEntryHeapLongKey.java | 21 +-
...rsionedStatsLRURegionEntryHeapObjectKey.java | 21 +-
...sionedStatsLRURegionEntryHeapStringKey1.java | 21 +-
...sionedStatsLRURegionEntryHeapStringKey2.java | 21 +-
...VersionedStatsLRURegionEntryHeapUUIDKey.java | 21 +-
.../VersionedStatsLRURegionEntryOffHeap.java | 21 +-
...rsionedStatsLRURegionEntryOffHeapIntKey.java | 21 +-
...sionedStatsLRURegionEntryOffHeapLongKey.java | 21 +-
...onedStatsLRURegionEntryOffHeapObjectKey.java | 21 +-
...nedStatsLRURegionEntryOffHeapStringKey1.java | 21 +-
...nedStatsLRURegionEntryOffHeapStringKey2.java | 21 +-
...sionedStatsLRURegionEntryOffHeapUUIDKey.java | 21 +-
.../cache/VersionedStatsRegionEntry.java | 21 +-
.../cache/VersionedStatsRegionEntryHeap.java | 21 +-
.../VersionedStatsRegionEntryHeapIntKey.java | 21 +-
.../VersionedStatsRegionEntryHeapLongKey.java | 21 +-
.../VersionedStatsRegionEntryHeapObjectKey.java | 21 +-
...VersionedStatsRegionEntryHeapStringKey1.java | 21 +-
...VersionedStatsRegionEntryHeapStringKey2.java | 21 +-
.../VersionedStatsRegionEntryHeapUUIDKey.java | 21 +-
.../cache/VersionedStatsRegionEntryOffHeap.java | 21 +-
.../VersionedStatsRegionEntryOffHeapIntKey.java | 21 +-
...VersionedStatsRegionEntryOffHeapLongKey.java | 21 +-
...rsionedStatsRegionEntryOffHeapObjectKey.java | 21 +-
...sionedStatsRegionEntryOffHeapStringKey1.java | 21 +-
...sionedStatsRegionEntryOffHeapStringKey2.java | 21 +-
...VersionedStatsRegionEntryOffHeapUUIDKey.java | 21 +-
.../cache/VersionedThinDiskLRURegionEntry.java | 21 +-
.../VersionedThinDiskLRURegionEntryHeap.java | 21 +-
...rsionedThinDiskLRURegionEntryHeapIntKey.java | 21 +-
...sionedThinDiskLRURegionEntryHeapLongKey.java | 21 +-
...onedThinDiskLRURegionEntryHeapObjectKey.java | 21 +-
...nedThinDiskLRURegionEntryHeapStringKey1.java | 21 +-
...nedThinDiskLRURegionEntryHeapStringKey2.java | 21 +-
...sionedThinDiskLRURegionEntryHeapUUIDKey.java | 21 +-
.../VersionedThinDiskLRURegionEntryOffHeap.java | 21 +-
...onedThinDiskLRURegionEntryOffHeapIntKey.java | 21 +-
...nedThinDiskLRURegionEntryOffHeapLongKey.java | 21 +-
...dThinDiskLRURegionEntryOffHeapObjectKey.java | 21 +-
...ThinDiskLRURegionEntryOffHeapStringKey1.java | 21 +-
...ThinDiskLRURegionEntryOffHeapStringKey2.java | 21 +-
...nedThinDiskLRURegionEntryOffHeapUUIDKey.java | 21 +-
.../cache/VersionedThinDiskRegionEntry.java | 21 +-
.../cache/VersionedThinDiskRegionEntryHeap.java | 21 +-
.../VersionedThinDiskRegionEntryHeapIntKey.java | 21 +-
...VersionedThinDiskRegionEntryHeapLongKey.java | 21 +-
...rsionedThinDiskRegionEntryHeapObjectKey.java | 21 +-
...sionedThinDiskRegionEntryHeapStringKey1.java | 21 +-
...sionedThinDiskRegionEntryHeapStringKey2.java | 21 +-
...VersionedThinDiskRegionEntryHeapUUIDKey.java | 21 +-
.../VersionedThinDiskRegionEntryOffHeap.java | 21 +-
...rsionedThinDiskRegionEntryOffHeapIntKey.java | 21 +-
...sionedThinDiskRegionEntryOffHeapLongKey.java | 21 +-
...onedThinDiskRegionEntryOffHeapObjectKey.java | 21 +-
...nedThinDiskRegionEntryOffHeapStringKey1.java | 21 +-
...nedThinDiskRegionEntryOffHeapStringKey2.java | 21 +-
...sionedThinDiskRegionEntryOffHeapUUIDKey.java | 21 +-
.../cache/VersionedThinLRURegionEntry.java | 21 +-
.../cache/VersionedThinLRURegionEntryHeap.java | 21 +-
.../VersionedThinLRURegionEntryHeapIntKey.java | 21 +-
.../VersionedThinLRURegionEntryHeapLongKey.java | 21 +-
...ersionedThinLRURegionEntryHeapObjectKey.java | 21 +-
...rsionedThinLRURegionEntryHeapStringKey1.java | 21 +-
...rsionedThinLRURegionEntryHeapStringKey2.java | 21 +-
.../VersionedThinLRURegionEntryHeapUUIDKey.java | 21 +-
.../VersionedThinLRURegionEntryOffHeap.java | 21 +-
...ersionedThinLRURegionEntryOffHeapIntKey.java | 21 +-
...rsionedThinLRURegionEntryOffHeapLongKey.java | 21 +-
...ionedThinLRURegionEntryOffHeapObjectKey.java | 21 +-
...onedThinLRURegionEntryOffHeapStringKey1.java | 21 +-
...onedThinLRURegionEntryOffHeapStringKey2.java | 21 +-
...rsionedThinLRURegionEntryOffHeapUUIDKey.java | 21 +-
.../cache/VersionedThinRegionEntry.java | 21 +-
.../cache/VersionedThinRegionEntryHeap.java | 21 +-
.../VersionedThinRegionEntryHeapIntKey.java | 21 +-
.../VersionedThinRegionEntryHeapLongKey.java | 21 +-
.../VersionedThinRegionEntryHeapObjectKey.java | 21 +-
.../VersionedThinRegionEntryHeapStringKey1.java | 21 +-
.../VersionedThinRegionEntryHeapStringKey2.java | 21 +-
.../VersionedThinRegionEntryHeapUUIDKey.java | 21 +-
.../cache/VersionedThinRegionEntryOffHeap.java | 21 +-
.../VersionedThinRegionEntryOffHeapIntKey.java | 21 +-
.../VersionedThinRegionEntryOffHeapLongKey.java | 21 +-
...ersionedThinRegionEntryOffHeapObjectKey.java | 21 +-
...rsionedThinRegionEntryOffHeapStringKey1.java | 21 +-
...rsionedThinRegionEntryOffHeapStringKey2.java | 21 +-
.../VersionedThinRegionEntryOffHeapUUIDKey.java | 21 +-
.../internal/cache/WrappedCallbackArgument.java | 21 +-
.../cache/WrappedRegionMembershipListener.java | 21 +-
.../CompressedCachedDeserializable.java | 23 +-
.../SnappyCompressedCachedDeserializable.java | 23 +-
.../internal/cache/control/FilterByPath.java | 21 +-
.../cache/control/HeapMemoryMonitor.java | 21 +-
.../cache/control/InternalResourceManager.java | 21 +-
.../internal/cache/control/MemoryEvent.java | 20 +-
.../cache/control/MemoryThresholds.java | 16 +
.../cache/control/OffHeapMemoryMonitor.java | 124 +-
.../control/PartitionRebalanceDetailsImpl.java | 21 +-
.../cache/control/RebalanceOperationImpl.java | 21 +-
.../cache/control/RebalanceResultsImpl.java | 21 +-
.../internal/cache/control/RegionFilter.java | 21 +-
.../internal/cache/control/ResourceAdvisor.java | 21 +-
.../internal/cache/control/ResourceEvent.java | 20 +-
.../cache/control/ResourceListener.java | 21 +-
.../cache/control/ResourceManagerStats.java | 21 +-
.../internal/cache/control/ResourceMonitor.java | 16 +
.../gemfire/internal/cache/delta/Delta.java | 21 +-
.../cache/execute/AbstractExecution.java | 21 +-
.../cache/execute/BucketMovedException.java | 21 +-
.../cache/execute/DefaultResultCollector.java | 20 +-
.../DistributedRegionFunctionExecutor.java | 20 +-
.../DistributedRegionFunctionResultSender.java | 21 +-
.../DistributedRegionFunctionResultWaiter.java | 21 +-
.../cache/execute/FunctionContextImpl.java | 21 +-
.../execute/FunctionExecutionNodePruner.java | 21 +-
.../cache/execute/FunctionRemoteContext.java | 21 +-
.../cache/execute/FunctionServiceStats.java | 24 +-
.../internal/cache/execute/FunctionStats.java | 21 +-
.../FunctionStreamingResultCollector.java | 21 +-
.../cache/execute/InternalExecution.java | 21 +-
.../execute/InternalFunctionException.java | 21 +-
...ternalFunctionInvocationTargetException.java | 21 +-
.../cache/execute/InternalFunctionService.java | 20 +-
.../execute/InternalRegionFunctionContext.java | 21 +-
.../cache/execute/InternalResultSender.java | 21 +-
.../cache/execute/LocalResultCollector.java | 20 +-
.../cache/execute/LocalResultCollectorImpl.java | 21 +-
.../cache/execute/MemberFunctionExecutor.java | 21 +-
.../execute/MemberFunctionResultSender.java | 20 +-
.../execute/MemberFunctionResultWaiter.java | 21 +-
.../cache/execute/MemberMappedArgument.java | 20 +-
.../execute/MultiRegionFunctionContext.java | 21 +-
.../execute/MultiRegionFunctionContextImpl.java | 21 +-
.../execute/MultiRegionFunctionExecutor.java | 21 +-
.../MultiRegionFunctionResultWaiter.java | 21 +-
.../internal/cache/execute/NoResult.java | 20 +-
.../PartitionedRegionFunctionExecutor.java | 21 +-
.../PartitionedRegionFunctionResultSender.java | 20 +-
.../PartitionedRegionFunctionResultWaiter.java | 21 +-
.../execute/RegionFunctionContextImpl.java | 21 +-
.../cache/execute/ServerFunctionExecutor.java | 21 +-
.../execute/ServerRegionFunctionExecutor.java | 23 +-
.../ServerToClientFunctionResultSender.java | 20 +-
.../ServerToClientFunctionResultSender65.java | 20 +-
.../execute/StreamingFunctionOperation.java | 21 +-
.../execute/TransactionFunctionService.java | 21 +-
.../cache/execute/util/CommitFunction.java | 21 +-
.../util/FindRestEnabledServersFunction.java | 23 +-
.../execute/util/NestedTransactionFunction.java | 21 +-
.../cache/execute/util/RollbackFunction.java | 21 +-
.../internal/cache/extension/Extensible.java | 21 +-
.../internal/cache/extension/Extension.java | 21 +-
.../cache/extension/ExtensionPoint.java | 21 +-
.../cache/extension/SimpleExtensionPoint.java | 21 +-
.../internal/cache/ha/HAContainerMap.java | 21 +-
.../internal/cache/ha/HAContainerRegion.java | 21 +-
.../internal/cache/ha/HAContainerWrapper.java | 21 +-
.../internal/cache/ha/HARegionQueue.java | 20 +-
.../cache/ha/HARegionQueueAttributes.java | 21 +-
.../internal/cache/ha/HARegionQueueStats.java | 21 +-
.../internal/cache/ha/QueueRemovalMessage.java | 21 +-
.../internal/cache/ha/ThreadIdentifier.java | 21 +-
.../locks/GFEAbstractQueuedSynchronizer.java | 21 +-
.../locks/ReentrantReadWriteWriteShareLock.java | 21 +-
.../cache/locks/TXLessorDepartureHandler.java | 21 +-
.../internal/cache/locks/TXLockBatch.java | 21 +-
.../gemfire/internal/cache/locks/TXLockId.java | 21 +-
.../internal/cache/locks/TXLockIdImpl.java | 21 +-
.../internal/cache/locks/TXLockService.java | 21 +-
.../internal/cache/locks/TXLockServiceImpl.java | 21 +-
.../internal/cache/locks/TXLockToken.java | 21 +-
.../locks/TXLockUpdateParticipantsMessage.java | 21 +-
.../locks/TXOriginatorRecoveryProcessor.java | 21 +-
.../locks/TXRecoverGrantorMessageProcessor.java | 21 +-
.../cache/locks/TXRegionLockRequest.java | 21 +-
.../gemfire/internal/cache/lru/EnableLRU.java | 21 +-
.../gemfire/internal/cache/lru/HeapEvictor.java | 21 +-
.../cache/lru/HeapLRUCapacityController.java | 21 +-
.../internal/cache/lru/HeapLRUStatistics.java | 21 +-
.../internal/cache/lru/LRUAlgorithm.java | 21 +-
.../cache/lru/LRUCapacityController.java | 21 +-
.../internal/cache/lru/LRUClockNode.java | 21 +-
.../gemfire/internal/cache/lru/LRUEntry.java | 21 +-
.../internal/cache/lru/LRUMapCallbacks.java | 21 +-
.../internal/cache/lru/LRUStatistics.java | 21 +-
.../cache/lru/MemLRUCapacityController.java | 21 +-
.../internal/cache/lru/NewLIFOClockHand.java | 21 +-
.../internal/cache/lru/NewLRUClockHand.java | 21 +-
.../internal/cache/lru/OffHeapEvictor.java | 21 +-
.../gemfire/internal/cache/lru/Sizeable.java | 21 +-
.../operations/ContainsKeyOperationContext.java | 21 +-
.../AllBucketProfilesUpdateMessage.java | 21 +-
.../partitioned/BecomePrimaryBucketMessage.java | 21 +-
.../internal/cache/partitioned/Bucket.java | 21 +-
.../cache/partitioned/BucketBackupMessage.java | 20 +-
.../partitioned/BucketProfileUpdateMessage.java | 21 +-
.../cache/partitioned/BucketSizeMessage.java | 21 +-
.../partitioned/ContainsKeyValueMessage.java | 20 +-
.../cache/partitioned/CreateBucketMessage.java | 21 +-
.../partitioned/CreateMissingBucketsTask.java | 23 +-
.../partitioned/DeposePrimaryBucketMessage.java | 21 +-
.../cache/partitioned/DestroyMessage.java | 21 +-
.../DestroyRegionOnDataStoreMessage.java | 20 +-
.../partitioned/DumpAllPRConfigMessage.java | 20 +-
.../cache/partitioned/DumpB2NRegion.java | 20 +-
.../cache/partitioned/DumpBucketsMessage.java | 21 +-
.../partitioned/EndBucketCreationMessage.java | 21 +-
.../partitioned/FetchBulkEntriesMessage.java | 21 +-
.../cache/partitioned/FetchEntriesMessage.java | 21 +-
.../cache/partitioned/FetchEntryMessage.java | 20 +-
.../cache/partitioned/FetchKeysMessage.java | 21 +-
.../FetchPartitionDetailsMessage.java | 21 +-
.../cache/partitioned/FlushMessage.java | 21 +-
.../internal/cache/partitioned/GetMessage.java | 21 +-
.../partitioned/IdentityRequestMessage.java | 20 +-
.../partitioned/IdentityUpdateMessage.java | 21 +-
.../cache/partitioned/IndexCreationMsg.java | 21 +-
.../cache/partitioned/InterestEventMessage.java | 21 +-
.../cache/partitioned/InternalPRInfo.java | 21 +-
.../partitioned/InternalPartitionDetails.java | 21 +-
.../cache/partitioned/InvalidateMessage.java | 20 +-
.../internal/cache/partitioned/LoadProbe.java | 21 +-
.../internal/cache/partitioned/LockObject.java | 21 +-
.../partitioned/ManageBackupBucketMessage.java | 21 +-
.../cache/partitioned/ManageBucketMessage.java | 21 +-
.../cache/partitioned/MoveBucketMessage.java | 21 +-
.../cache/partitioned/OfflineMemberDetails.java | 23 +-
.../partitioned/OfflineMemberDetailsImpl.java | 21 +-
.../cache/partitioned/PREntriesIterator.java | 21 +-
.../PRFunctionStreamingResultCollector.java | 21 +-
.../internal/cache/partitioned/PRLoad.java | 21 +-
.../PRLocallyDestroyedException.java | 21 +-
.../cache/partitioned/PRSanityCheckMessage.java | 21 +-
.../cache/partitioned/PRTombstoneMessage.java | 21 +-
.../PRUpdateEntryVersionMessage.java | 22 +-
.../partitioned/PartitionMemberInfoImpl.java | 21 +-
.../cache/partitioned/PartitionMessage.java | 21 +-
.../PartitionMessageWithDirectReply.java | 21 +-
.../partitioned/PartitionRegionInfoImpl.java | 21 +-
...rtitionedRegionFunctionStreamingMessage.java | 21 +-
.../partitioned/PartitionedRegionObserver.java | 21 +-
.../PartitionedRegionObserverAdapter.java | 21 +-
.../PartitionedRegionObserverHolder.java | 21 +-
.../PartitionedRegionRebalanceOp.java | 73 +-
.../partitioned/PrimaryRequestMessage.java | 21 +-
.../cache/partitioned/PutAllPRMessage.java | 21 +-
.../internal/cache/partitioned/PutMessage.java | 21 +-
.../cache/partitioned/QueryMessage.java | 21 +-
.../cache/partitioned/RecoveryRunnable.java | 23 +-
.../RedundancyAlreadyMetException.java | 21 +-
.../cache/partitioned/RedundancyLogger.java | 21 +-
.../cache/partitioned/RegionAdvisor.java | 20 +-
.../partitioned/RemoteFetchKeysMessage.java | 21 +-
.../cache/partitioned/RemoteSizeMessage.java | 21 +-
.../cache/partitioned/RemoveAllPRMessage.java | 21 +-
.../cache/partitioned/RemoveBucketMessage.java | 21 +-
.../cache/partitioned/RemoveIndexesMessage.java | 21 +-
.../internal/cache/partitioned/SizeMessage.java | 21 +-
.../cache/partitioned/SizedBasedLoadProbe.java | 21 +-
.../StreamingPartitionOperation.java | 24 +-
.../partitioned/rebalance/BucketOperator.java | 21 +-
.../rebalance/CompositeDirector.java | 21 +-
.../rebalance/ExplicitMoveDirector.java | 21 +-
.../partitioned/rebalance/FPRDirector.java | 21 +-
.../partitioned/rebalance/MoveBuckets.java | 21 +-
.../partitioned/rebalance/MovePrimaries.java | 21 +-
.../partitioned/rebalance/MovePrimariesFPR.java | 21 +-
.../rebalance/ParallelBucketOperator.java | 16 +
.../rebalance/PartitionedRegionLoadModel.java | 21 +-
.../rebalance/PercentageMoveDirector.java | 21 +-
.../rebalance/RebalanceDirector.java | 21 +-
.../rebalance/RebalanceDirectorAdapter.java | 21 +-
.../rebalance/RemoveOverRedundancy.java | 21 +-
.../rebalance/SatisfyRedundancy.java | 21 +-
.../rebalance/SatisfyRedundancyFPR.java | 21 +-
.../rebalance/SimulatedBucketOperator.java | 21 +-
.../cache/persistence/BackupInspector.java | 21 +-
.../cache/persistence/BackupManager.java | 21 +-
.../cache/persistence/BytesAndBits.java | 21 +-
.../cache/persistence/CanonicalIdHolder.java | 21 +-
.../CreatePersistentRegionProcessor.java | 21 +-
.../cache/persistence/DiskExceptionHandler.java | 21 +-
.../persistence/DiskInitFileInterpreter.java | 21 +-
.../cache/persistence/DiskInitFileParser.java | 21 +-
.../cache/persistence/DiskRecoveryStore.java | 23 +-
.../cache/persistence/DiskRegionView.java | 21 +-
.../cache/persistence/DiskStoreFilter.java | 23 +-
.../internal/cache/persistence/DiskStoreID.java | 21 +-
.../persistence/MembershipFlushRequest.java | 21 +-
.../persistence/MembershipViewRequest.java | 21 +-
.../internal/cache/persistence/OplogType.java | 18 +-
.../cache/persistence/PRPersistentConfig.java | 21 +-
.../cache/persistence/PersistenceAdvisor.java | 21 +-
.../persistence/PersistenceAdvisorImpl.java | 21 +-
.../persistence/PersistenceObserverHolder.java | 21 +-
.../cache/persistence/PersistentMemberID.java | 21 +-
.../persistence/PersistentMemberManager.java | 21 +-
.../persistence/PersistentMemberPattern.java | 23 +-
.../persistence/PersistentMemberState.java | 21 +-
.../cache/persistence/PersistentMemberView.java | 21 +-
.../persistence/PersistentMembershipView.java | 23 +-
.../persistence/PersistentStateListener.java | 23 +-
.../PersistentStateQueryMessage.java | 21 +-
.../PersistentStateQueryResults.java | 21 +-
.../PrepareNewPersistentMemberMessage.java | 21 +-
.../RemovePersistentMemberMessage.java | 21 +-
.../cache/persistence/RestoreScript.java | 21 +-
.../persistence/UninterruptibleFileChannel.java | 18 +-
.../UninterruptibleRandomAccessFile.java | 16 +
.../persistence/query/CloseableIterator.java | 18 +-
.../persistence/query/IdentityExtractor.java | 16 +
.../cache/persistence/query/IndexMap.java | 21 +-
.../cache/persistence/query/ResultBag.java | 21 +-
.../cache/persistence/query/ResultList.java | 21 +-
.../cache/persistence/query/ResultMap.java | 21 +-
.../cache/persistence/query/ResultSet.java | 21 +-
.../persistence/query/SortKeyExtractor.java | 16 +
.../query/TemporaryResultSetFactory.java | 21 +-
.../persistence/query/mock/ByteComparator.java | 21 +-
.../mock/CachedDeserializableComparator.java | 23 +-
.../persistence/query/mock/IndexMapImpl.java | 21 +-
.../persistence/query/mock/ItrAdapter.java | 23 +-
.../query/mock/NaturalComparator.java | 16 +
.../cache/persistence/query/mock/Pair.java | 21 +-
.../persistence/query/mock/PairComparator.java | 21 +-
.../persistence/query/mock/ResultListImpl.java | 21 +-
.../query/mock/ReverseComparator.java | 21 +-
.../query/mock/SortedResultBagImpl.java | 21 +-
.../query/mock/SortedResultMapImpl.java | 21 +-
.../query/mock/SortedResultSetImpl.java | 21 +-
.../persistence/soplog/AbstractCompactor.java | 21 +-
.../soplog/AbstractKeyValueIterator.java | 21 +-
.../soplog/AbstractSortedReader.java | 21 +-
.../soplog/ArraySerializedComparator.java | 21 +-
.../persistence/soplog/ByteComparator.java | 21 +-
.../cache/persistence/soplog/Compactor.java | 21 +-
.../soplog/CompositeSerializedComparator.java | 21 +-
.../persistence/soplog/CursorIterator.java | 21 +-
.../soplog/DelegatingSerializedComparator.java | 21 +-
.../soplog/HFileStoreStatistics.java | 21 +-
.../soplog/IndexSerializedComparator.java | 21 +-
.../persistence/soplog/KeyValueIterator.java | 21 +-
.../cache/persistence/soplog/LevelTracker.java | 21 +-
.../soplog/LexicographicalComparator.java | 21 +-
.../cache/persistence/soplog/NonCompactor.java | 21 +-
.../soplog/ReversingSerializedComparator.java | 21 +-
.../persistence/soplog/SizeTieredCompactor.java | 21 +-
.../cache/persistence/soplog/SoplogToken.java | 21 +-
.../cache/persistence/soplog/SortedBuffer.java | 21 +-
.../cache/persistence/soplog/SortedOplog.java | 21 +-
.../persistence/soplog/SortedOplogFactory.java | 21 +-
.../persistence/soplog/SortedOplogSet.java | 21 +-
.../persistence/soplog/SortedOplogSetImpl.java | 21 +-
.../soplog/SortedOplogStatistics.java | 21 +-
.../cache/persistence/soplog/SortedReader.java | 21 +-
.../persistence/soplog/TrackedReference.java | 21 +-
.../soplog/hfile/BlockCacheHolder.java | 21 +-
.../soplog/hfile/HFileSortedOplog.java | 21 +-
.../soplog/hfile/HFileSortedOplogFactory.java | 21 +-
.../soplog/nofile/NoFileSortedOplog.java | 21 +-
.../soplog/nofile/NoFileSortedOplogFactory.java | 21 +-
.../snapshot/CacheSnapshotServiceImpl.java | 21 +-
.../internal/cache/snapshot/ClientExporter.java | 21 +-
.../cache/snapshot/ExportedRegistry.java | 21 +-
.../internal/cache/snapshot/FlowController.java | 21 +-
.../internal/cache/snapshot/GFSnapshot.java | 21 +-
.../internal/cache/snapshot/LocalExporter.java | 21 +-
.../snapshot/RegionSnapshotServiceImpl.java | 21 +-
.../cache/snapshot/SnapshotFileMapper.java | 21 +-
.../cache/snapshot/SnapshotOptionsImpl.java | 21 +-
.../internal/cache/snapshot/SnapshotPacket.java | 21 +-
.../cache/snapshot/WindowedExporter.java | 21 +-
.../gemfire/internal/cache/tier/Acceptor.java | 21 +-
.../internal/cache/tier/BatchException.java | 21 +-
.../internal/cache/tier/CachedRegionHelper.java | 21 +-
.../internal/cache/tier/ClientHandShake.java | 21 +-
.../gemfire/internal/cache/tier/Command.java | 21 +-
.../internal/cache/tier/ConnectionProxy.java | 21 +-
.../internal/cache/tier/InterestType.java | 21 +-
.../cache/tier/InternalClientMembership.java | 21 +-
.../internal/cache/tier/MessageType.java | 21 +-
.../cache/tier/sockets/AcceptorImpl.java | 57 +-
.../cache/tier/sockets/BaseCommand.java | 21 +-
.../cache/tier/sockets/BaseCommandQuery.java | 16 +
.../cache/tier/sockets/CacheClientNotifier.java | 21 +-
.../tier/sockets/CacheClientNotifierStats.java | 21 +-
.../cache/tier/sockets/CacheClientProxy.java | 20 +-
.../tier/sockets/CacheClientProxyStats.java | 21 +-
.../cache/tier/sockets/CacheClientUpdater.java | 31 +-
.../cache/tier/sockets/CacheServerHelper.java | 21 +-
.../cache/tier/sockets/CacheServerStats.java | 21 +-
.../cache/tier/sockets/ChunkedMessage.java | 21 +-
.../tier/sockets/ClientBlacklistProcessor.java | 21 +-
.../sockets/ClientDataSerializerMessage.java | 21 +-
.../cache/tier/sockets/ClientHealthMonitor.java | 21 +-
.../tier/sockets/ClientInstantiatorMessage.java | 20 +-
.../tier/sockets/ClientInterestMessageImpl.java | 21 +-
.../tier/sockets/ClientMarkerMessageImpl.java | 21 +-
.../cache/tier/sockets/ClientMessage.java | 21 +-
.../tier/sockets/ClientPingMessageImpl.java | 21 +-
.../tier/sockets/ClientProxyMembershipID.java | 21 +-
.../tier/sockets/ClientTombstoneMessage.java | 21 +-
.../cache/tier/sockets/ClientUpdateMessage.java | 21 +-
.../tier/sockets/ClientUpdateMessageImpl.java | 21 +-
.../cache/tier/sockets/ClientUserAuths.java | 21 +-
.../cache/tier/sockets/CommandInitializer.java | 21 +-
.../cache/tier/sockets/ConnectionListener.java | 21 +-
.../tier/sockets/ConnectionListenerAdapter.java | 21 +-
.../cache/tier/sockets/HAEventWrapper.java | 21 +-
.../internal/cache/tier/sockets/HandShake.java | 21 +-
.../tier/sockets/InterestResultPolicyImpl.java | 21 +-
.../internal/cache/tier/sockets/Message.java | 21 +-
.../cache/tier/sockets/MessageStats.java | 21 +-
.../cache/tier/sockets/ObjectPartList.java | 21 +-
.../cache/tier/sockets/ObjectPartList651.java | 21 +-
.../internal/cache/tier/sockets/Part.java | 21 +-
.../RemoveClientFromBlacklistMessage.java | 23 +-
.../tier/sockets/SerializedObjectPartList.java | 21 +-
.../cache/tier/sockets/ServerConnection.java | 21 +-
.../tier/sockets/ServerHandShakeProcessor.java | 21 +-
.../cache/tier/sockets/ServerQueueStatus.java | 21 +-
.../tier/sockets/ServerResponseMatrix.java | 20 +-
.../tier/sockets/UnregisterAllInterest.java | 21 +-
.../cache/tier/sockets/UserAuthAttributes.java | 21 +-
.../cache/tier/sockets/VersionedObjectList.java | 21 +-
.../cache/tier/sockets/command/AddPdxEnum.java | 21 +-
.../cache/tier/sockets/command/AddPdxType.java | 21 +-
.../cache/tier/sockets/command/ClearRegion.java | 21 +-
.../cache/tier/sockets/command/ClientReady.java | 21 +-
.../tier/sockets/command/CloseConnection.java | 21 +-
.../tier/sockets/command/CommitCommand.java | 21 +-
.../cache/tier/sockets/command/ContainsKey.java | 21 +-
.../tier/sockets/command/ContainsKey66.java | 21 +-
.../tier/sockets/command/CreateRegion.java | 21 +-
.../cache/tier/sockets/command/Default.java | 21 +-
.../cache/tier/sockets/command/Destroy.java | 21 +-
.../cache/tier/sockets/command/Destroy65.java | 21 +-
.../cache/tier/sockets/command/Destroy70.java | 23 +-
.../tier/sockets/command/DestroyRegion.java | 21 +-
.../tier/sockets/command/ExecuteFunction.java | 21 +-
.../tier/sockets/command/ExecuteFunction65.java | 20 +-
.../tier/sockets/command/ExecuteFunction66.java | 20 +-
.../tier/sockets/command/ExecuteFunction70.java | 21 +-
.../sockets/command/ExecuteRegionFunction.java | 20 +-
.../command/ExecuteRegionFunction61.java | 20 +-
.../command/ExecuteRegionFunction65.java | 20 +-
.../command/ExecuteRegionFunction66.java | 20 +-
.../command/ExecuteRegionFunctionSingleHop.java | 21 +-
.../sockets/command/GatewayReceiverCommand.java | 21 +-
.../cache/tier/sockets/command/Get70.java | 21 +-
.../cache/tier/sockets/command/GetAll.java | 21 +-
.../cache/tier/sockets/command/GetAll651.java | 21 +-
.../cache/tier/sockets/command/GetAll70.java | 23 +-
.../cache/tier/sockets/command/GetAllForRI.java | 21 +-
.../sockets/command/GetAllWithCallback.java | 21 +-
.../command/GetClientPRMetadataCommand.java | 20 +-
.../command/GetClientPRMetadataCommand66.java | 20 +-
.../GetClientPartitionAttributesCommand.java | 20 +-
.../GetClientPartitionAttributesCommand66.java | 20 +-
.../cache/tier/sockets/command/GetEntry70.java | 23 +-
.../tier/sockets/command/GetEntryCommand.java | 21 +-
.../sockets/command/GetFunctionAttribute.java | 21 +-
.../tier/sockets/command/GetPDXEnumById.java | 21 +-
.../tier/sockets/command/GetPDXIdForEnum.java | 21 +-
.../tier/sockets/command/GetPDXIdForType.java | 21 +-
.../tier/sockets/command/GetPDXTypeById.java | 21 +-
.../tier/sockets/command/GetPdxEnums70.java | 21 +-
.../tier/sockets/command/GetPdxTypes70.java | 21 +-
.../cache/tier/sockets/command/Invalid.java | 21 +-
.../cache/tier/sockets/command/Invalidate.java | 21 +-
.../tier/sockets/command/Invalidate70.java | 23 +-
.../cache/tier/sockets/command/KeySet.java | 21 +-
.../cache/tier/sockets/command/MakePrimary.java | 21 +-
.../tier/sockets/command/ManagementCommand.java | 21 +-
.../cache/tier/sockets/command/PeriodicAck.java | 21 +-
.../cache/tier/sockets/command/Ping.java | 21 +-
.../cache/tier/sockets/command/Put.java | 21 +-
.../cache/tier/sockets/command/Put61.java | 21 +-
.../cache/tier/sockets/command/Put65.java | 21 +-
.../cache/tier/sockets/command/Put70.java | 21 +-
.../cache/tier/sockets/command/PutAll.java | 21 +-
.../cache/tier/sockets/command/PutAll70.java | 21 +-
.../cache/tier/sockets/command/PutAll80.java | 21 +-
.../sockets/command/PutAllWithCallback.java | 21 +-
.../sockets/command/PutUserCredentials.java | 21 +-
.../cache/tier/sockets/command/Query.java | 21 +-
.../cache/tier/sockets/command/Query651.java | 21 +-
.../command/RegisterDataSerializers.java | 21 +-
.../sockets/command/RegisterInstantiators.java | 21 +-
.../tier/sockets/command/RegisterInterest.java | 21 +-
.../sockets/command/RegisterInterest61.java | 21 +-
.../sockets/command/RegisterInterestList.java | 21 +-
.../sockets/command/RegisterInterestList61.java | 21 +-
.../sockets/command/RegisterInterestList66.java | 21 +-
.../cache/tier/sockets/command/RemoveAll.java | 21 +-
.../tier/sockets/command/RemoveUserAuth.java | 21 +-
.../cache/tier/sockets/command/Request.java | 21 +-
.../tier/sockets/command/RequestEventValue.java | 20 +-
.../tier/sockets/command/RollbackCommand.java | 21 +-
.../cache/tier/sockets/command/Size.java | 21 +-
.../tier/sockets/command/TXFailoverCommand.java | 21 +-
.../command/TXSynchronizationCommand.java | 21 +-
.../sockets/command/UnregisterInterest.java | 21 +-
.../sockets/command/UnregisterInterestList.java | 21 +-
.../command/UpdateClientNotification.java | 21 +-
.../cache/tx/AbstractPeerTXRegionStub.java | 21 +-
.../internal/cache/tx/ClientTXRegionStub.java | 21 +-
.../internal/cache/tx/ClientTXStateStub.java | 21 +-
.../cache/tx/DistClientTXStateStub.java | 19 +-
.../internal/cache/tx/DistTxEntryEvent.java | 16 +
.../internal/cache/tx/DistTxKeyInfo.java | 18 +-
.../cache/tx/DistributedTXRegionStub.java | 21 +-
.../cache/tx/PartitionedTXRegionStub.java | 21 +-
.../gemfire/internal/cache/tx/TXRegionStub.java | 21 +-
.../cache/tx/TransactionalOperation.java | 24 +-
.../cache/versions/CompactVersionHolder.java | 21 +-
.../ConcurrentCacheModificationException.java | 23 +-
.../cache/versions/DiskRegionVersionVector.java | 21 +-
.../internal/cache/versions/DiskVersionTag.java | 21 +-
.../internal/cache/versions/RVVException.java | 21 +-
.../internal/cache/versions/RVVExceptionB.java | 23 +-
.../internal/cache/versions/RVVExceptionT.java | 23 +-
.../cache/versions/RegionVersionHolder.java | 21 +-
.../cache/versions/RegionVersionVector.java | 21 +-
.../cache/versions/VMRegionVersionVector.java | 21 +-
.../internal/cache/versions/VMVersionTag.java | 21 +-
.../internal/cache/versions/VersionHolder.java | 21 +-
.../internal/cache/versions/VersionSource.java | 21 +-
.../internal/cache/versions/VersionStamp.java | 21 +-
.../internal/cache/versions/VersionTag.java | 21 +-
.../internal/cache/vmotion/VMotionObserver.java | 20 +-
.../cache/vmotion/VMotionObserverAdapter.java | 20 +-
.../cache/vmotion/VMotionObserverHolder.java | 20 +-
.../cache/wan/AbstractGatewaySender.java | 20 +-
.../AbstractGatewaySenderEventProcessor.java | 21 +-
.../AsyncEventQueueConfigurationException.java | 21 +-
.../internal/cache/wan/BatchException70.java | 21 +-
.../cache/wan/DistributedSystemListener.java | 16 +
.../cache/wan/GatewayEventFilterImpl.java | 21 +-
.../cache/wan/GatewayReceiverException.java | 21 +-
.../cache/wan/GatewayReceiverStats.java | 21 +-
.../cache/wan/GatewaySenderAdvisor.java | 21 +-
.../cache/wan/GatewaySenderAttributes.java | 21 +-
.../GatewaySenderConfigurationException.java | 21 +-
.../wan/GatewaySenderEventCallbackArgument.java | 20 +-
.../GatewaySenderEventCallbackDispatcher.java | 20 +-
.../cache/wan/GatewaySenderEventDispatcher.java | 21 +-
.../cache/wan/GatewaySenderEventImpl.java | 20 +-
.../cache/wan/GatewaySenderException.java | 21 +-
.../internal/cache/wan/GatewaySenderStats.java | 21 +-
.../cache/wan/InternalGatewaySenderFactory.java | 16 +
.../cache/wan/TransportFilterServerSocket.java | 21 +-
.../cache/wan/TransportFilterSocket.java | 21 +-
.../cache/wan/TransportFilterSocketFactory.java | 21 +-
.../internal/cache/wan/WANServiceProvider.java | 16 +
.../BucketRegionQueueUnavailableException.java | 16 +
...rentParallelGatewaySenderEventProcessor.java | 21 +-
.../ConcurrentParallelGatewaySenderQueue.java | 21 +-
.../ParallelGatewaySenderEventProcessor.java | 21 +-
.../parallel/ParallelGatewaySenderQueue.java | 21 +-
.../ParallelQueueBatchRemovalMessage.java | 21 +-
.../parallel/ParallelQueueRemovalMessage.java | 21 +-
.../cache/wan/parallel/RREventIDResolver.java | 21 +-
.../cache/wan/serial/BatchDestroyOperation.java | 21 +-
...urrentSerialGatewaySenderEventProcessor.java | 21 +-
.../SerialGatewaySenderEventProcessor.java | 20 +-
.../wan/serial/SerialGatewaySenderQueue.java | 21 +-
.../serial/SerialSecondaryGatewayListener.java | 21 +-
.../internal/cache/wan/spi/WANFactory.java | 16 +
.../cache/xmlcache/AbstractXmlParser.java | 21 +-
.../cache/xmlcache/AsyncEventQueueCreation.java | 21 +-
.../cache/xmlcache/BindingCreation.java | 21 +-
.../internal/cache/xmlcache/CacheCreation.java | 32 +-
.../cache/xmlcache/CacheServerCreation.java | 45 +-
.../CacheTransactionManagerCreation.java | 21 +-
.../internal/cache/xmlcache/CacheXml.java | 21 +-
.../cache/xmlcache/CacheXmlGenerator.java | 25 +-
.../internal/cache/xmlcache/CacheXmlParser.java | 27 +-
.../xmlcache/CacheXmlPropertyResolver.java | 21 +-
.../CacheXmlPropertyResolverHelper.java | 21 +-
.../cache/xmlcache/CacheXmlVersion.java | 17 +-
.../cache/xmlcache/ClientCacheCreation.java | 21 +-
.../cache/xmlcache/ClientHaQueueCreation.java | 21 +-
.../internal/cache/xmlcache/Declarable2.java | 21 +-
.../cache/xmlcache/DefaultEntityResolver2.java | 21 +-
.../xmlcache/DiskStoreAttributesCreation.java | 21 +-
.../cache/xmlcache/FunctionServiceCreation.java | 21 +-
.../cache/xmlcache/GatewayReceiverCreation.java | 21 +-
.../cache/xmlcache/IndexCreationData.java | 21 +-
.../ParallelAsyncEventQueueCreation.java | 21 +-
.../xmlcache/ParallelGatewaySenderCreation.java | 21 +-
.../cache/xmlcache/PivotalEntityResolver.java | 21 +-
.../cache/xmlcache/PropertyResolver.java | 21 +-
.../xmlcache/RegionAttributesCreation.java | 21 +-
.../internal/cache/xmlcache/RegionCreation.java | 21 +-
.../cache/xmlcache/ResourceManagerCreation.java | 21 +-
.../xmlcache/SerialAsyncEventQueueCreation.java | 21 +-
.../xmlcache/SerialGatewaySenderCreation.java | 21 +-
.../cache/xmlcache/SerializerCreation.java | 21 +-
.../internal/cache/xmlcache/XmlGenerator.java | 21 +-
.../cache/xmlcache/XmlGeneratorUtils.java | 21 +-
.../internal/cache/xmlcache/XmlParser.java | 21 +-
.../gemfire/internal/concurrent/AL.java | 21 +-
.../internal/concurrent/AtomicLong5.java | 21 +-
.../gemfire/internal/concurrent/Atomics.java | 21 +-
.../concurrent/CompactConcurrentHashSet2.java | 16 +
.../internal/concurrent/ConcurrentHashSet.java | 21 +-
.../gemfire/internal/concurrent/LI.java | 21 +-
.../internal/concurrent/MapCallback.java | 21 +-
.../internal/concurrent/MapCallbackAdapter.java | 21 +-
.../gemfire/internal/concurrent/MapResult.java | 21 +-
.../internal/datasource/AbstractDataSource.java | 21 +-
.../internal/datasource/AbstractPoolCache.java | 21 +-
.../ClientConnectionFactoryWrapper.java | 21 +-
.../internal/datasource/ConfigProperty.java | 21 +-
.../ConfiguredDataSourceProperties.java | 21 +-
.../ConnectionEventListenerAdaptor.java | 21 +-
.../datasource/ConnectionPoolCache.java | 21 +-
.../datasource/ConnectionPoolCacheImpl.java | 21 +-
.../internal/datasource/ConnectionProvider.java | 21 +-
.../datasource/ConnectionProviderException.java | 21 +-
.../datasource/DataSourceCreateException.java | 21 +-
.../internal/datasource/DataSourceFactory.java | 21 +-
.../datasource/DataSourceResources.java | 21 +-
.../FacetsJCAConnectionManagerImpl.java | 21 +-
.../datasource/GemFireBasicDataSource.java | 21 +-
.../datasource/GemFireConnPooledDataSource.java | 21 +-
.../GemFireConnectionPoolManager.java | 21 +-
.../GemFireTransactionDataSource.java | 21 +-
.../datasource/JCAConnectionManagerImpl.java | 21 +-
.../datasource/ManagedPoolCacheImpl.java | 21 +-
.../internal/datasource/PoolException.java | 21 +-
.../internal/datasource/TranxPoolCacheImpl.java | 21 +-
.../i18n/AbstractStringIdResourceBundle.java | 21 +-
.../gemfire/internal/i18n/LocalizedStrings.java | 23 +-
.../internal/i18n/ParentLocalizedStrings.java | 21 +-
.../internal/io/CompositeOutputStream.java | 21 +-
.../internal/io/CompositePrintStream.java | 21 +-
.../gemfire/internal/io/TeeOutputStream.java | 21 +-
.../gemfire/internal/io/TeePrintStream.java | 21 +-
.../gemfire/internal/jndi/ContextImpl.java | 21 +-
.../jndi/InitialContextFactoryImpl.java | 21 +-
.../gemfire/internal/jndi/JNDIInvoker.java | 21 +-
.../gemfire/internal/jndi/NameParserImpl.java | 21 +-
.../gemfire/internal/jta/GlobalTransaction.java | 21 +-
.../gemfire/internal/jta/TransactionImpl.java | 21 +-
.../internal/jta/TransactionManagerImpl.java | 21 +-
.../gemfire/internal/jta/TransactionUtils.java | 21 +-
.../internal/jta/UserTransactionImpl.java | 21 +-
.../gemstone/gemfire/internal/jta/XidImpl.java | 21 +-
.../gemfire/internal/lang/ClassUtils.java | 20 +-
.../gemstone/gemfire/internal/lang/Filter.java | 18 +-
.../gemfire/internal/lang/InOutParameter.java | 20 +-
.../gemfire/internal/lang/Initable.java | 20 +-
.../gemfire/internal/lang/Initializer.java | 21 +-
.../internal/lang/MutableIdentifiable.java | 24 +-
.../gemfire/internal/lang/ObjectUtils.java | 20 +-
.../gemfire/internal/lang/Orderable.java | 20 +-
.../gemstone/gemfire/internal/lang/Ordered.java | 20 +-
.../gemfire/internal/lang/StringUtils.java | 20 +-
.../gemfire/internal/lang/SystemUtils.java | 20 +-
.../gemfire/internal/lang/ThreadUtils.java | 20 +-
.../gemfire/internal/logging/DateFormatter.java | 16 +
.../internal/logging/DebugLogWriter.java | 21 +-
.../internal/logging/GemFireFormatter.java | 21 +-
.../internal/logging/GemFireHandler.java | 21 +-
.../gemfire/internal/logging/GemFireLevel.java | 21 +-
.../internal/logging/InternalLogWriter.java | 16 +
.../internal/logging/LocalLogWriter.java | 21 +-
.../gemfire/internal/logging/LogConfig.java | 16 +
.../gemfire/internal/logging/LogFileParser.java | 21 +-
.../gemfire/internal/logging/LogService.java | 149 +-
.../internal/logging/LogWriterFactory.java | 16 +
.../gemfire/internal/logging/LogWriterImpl.java | 21 +-
.../internal/logging/LoggingThreadGroup.java | 16 +
.../internal/logging/ManagerLogWriter.java | 21 +-
.../gemfire/internal/logging/MergeLogFiles.java | 21 +-
.../gemfire/internal/logging/PureLogWriter.java | 21 +-
.../logging/SecurityLocalLogWriter.java | 21 +-
.../internal/logging/SecurityLogConfig.java | 16 +
.../internal/logging/SecurityLogWriter.java | 21 +-
.../logging/SecurityManagerLogWriter.java | 21 +-
.../gemfire/internal/logging/SortLogFile.java | 21 +-
.../internal/logging/StandardErrorPrinter.java | 16 +
.../internal/logging/StandardOutputPrinter.java | 16 +
.../internal/logging/log4j/AlertAppender.java | 16 +
.../internal/logging/log4j/AppenderContext.java | 16 +
.../internal/logging/log4j/ConfigLocator.java | 16 +
.../internal/logging/log4j/Configurator.java | 21 +
.../internal/logging/log4j/FastLogger.java | 16 +
.../internal/logging/log4j/GemFireLogger.java | 16 +
.../logging/log4j/LocalizedMessage.java | 16 +
.../internal/logging/log4j/LogMarker.java | 16 +
.../logging/log4j/LogWriterAppender.java | 18 +-
.../logging/log4j/LogWriterAppenders.java | 16 +
.../internal/logging/log4j/LogWriterLogger.java | 16 +
.../logging/log4j/ThreadIdPatternConverter.java | 16 +
.../gemfire/internal/memcached/Command.java | 21 +-
.../internal/memcached/CommandProcessor.java | 21 +-
.../internal/memcached/ConnectionHandler.java | 21 +-
.../gemfire/internal/memcached/KeyWrapper.java | 21 +-
.../gemfire/internal/memcached/Reply.java | 21 +-
.../internal/memcached/RequestReader.java | 21 +-
.../internal/memcached/ResponseStatus.java | 21 +-
.../internal/memcached/ValueWrapper.java | 21 +-
.../memcached/commands/AbstractCommand.java | 21 +-
.../internal/memcached/commands/AddCommand.java | 21 +-
.../memcached/commands/AddQCommand.java | 16 +
.../memcached/commands/AppendCommand.java | 21 +-
.../memcached/commands/AppendQCommand.java | 16 +
.../internal/memcached/commands/CASCommand.java | 21 +-
.../memcached/commands/ClientError.java | 21 +-
.../memcached/commands/DecrementCommand.java | 21 +-
.../memcached/commands/DecrementQCommand.java | 16 +
.../memcached/commands/DeleteCommand.java | 21 +-
.../memcached/commands/DeleteQCommand.java | 16 +
.../memcached/commands/FlushAllCommand.java | 21 +-
.../memcached/commands/FlushAllQCommand.java | 16 +
.../internal/memcached/commands/GATCommand.java | 16 +
.../memcached/commands/GATQCommand.java | 16 +
.../internal/memcached/commands/GetCommand.java | 21 +-
.../memcached/commands/GetKCommand.java | 16 +
.../memcached/commands/GetKQCommand.java | 16 +
.../memcached/commands/GetQCommand.java | 21 +-
.../memcached/commands/IncrementCommand.java | 21 +-
.../memcached/commands/IncrementQCommand.java | 16 +
.../memcached/commands/NoOpCommand.java | 21 +-
.../memcached/commands/NotSupportedCommand.java | 21 +-
.../memcached/commands/PrependCommand.java | 21 +-
.../memcached/commands/PrependQCommand.java | 16 +
.../memcached/commands/QuitCommand.java | 21 +-
.../memcached/commands/QuitQCommand.java | 16 +
.../memcached/commands/ReplaceCommand.java | 21 +-
.../memcached/commands/ReplaceQCommand.java | 16 +
.../internal/memcached/commands/SetCommand.java | 21 +-
.../memcached/commands/SetQCommand.java | 16 +
.../memcached/commands/StatsCommand.java | 21 +-
.../memcached/commands/StorageCommand.java | 21 +-
.../memcached/commands/TouchCommand.java | 21 +-
.../memcached/commands/VerbosityCommand.java | 21 +-
.../memcached/commands/VersionCommand.java | 21 +-
.../modules/util/RegionConfiguration.java | 21 +-
.../gemfire/internal/net/SocketUtils.java | 20 +-
.../internal/offheap/ByteArrayMemoryChunk.java | 16 +
.../internal/offheap/ByteBufferMemoryChunk.java | 16 +
.../gemfire/internal/offheap/DataType.java | 16 +
.../internal/offheap/MemoryAllocator.java | 16 +
.../gemfire/internal/offheap/MemoryBlock.java | 16 +
.../gemfire/internal/offheap/MemoryChunk.java | 16 +
.../offheap/MemoryChunkWithRefCount.java | 16 +
.../internal/offheap/MemoryInspector.java | 16 +
.../internal/offheap/MemoryUsageListener.java | 16 +
.../offheap/OffHeapCachedDeserializable.java | 16 +
.../gemfire/internal/offheap/OffHeapHelper.java | 16 +
.../internal/offheap/OffHeapMemoryStats.java | 16 +
.../internal/offheap/OffHeapReference.java | 18 +-
.../offheap/OffHeapRegionEntryHelper.java | 16 +
.../internal/offheap/OffHeapStorage.java | 16 +
.../offheap/OutOfOffHeapMemoryListener.java | 16 +
.../gemfire/internal/offheap/Releasable.java | 16 +
.../offheap/SimpleMemoryAllocatorImpl.java | 18 +-
.../gemfire/internal/offheap/StoredObject.java | 16 +
.../internal/offheap/UnsafeMemoryChunk.java | 16 +
.../offheap/annotations/OffHeapIdentifier.java | 16 +
.../internal/offheap/annotations/Released.java | 16 +
.../internal/offheap/annotations/Retained.java | 16 +
.../offheap/annotations/Unretained.java | 16 +
.../internal/process/AttachProcessUtils.java | 16 +
.../process/BlockingProcessStreamReader.java | 16 +
...usterConfigurationNotAvailableException.java | 16 +
.../process/ConnectionFailedException.java | 21 +-
.../internal/process/ControlFileWatchdog.java | 16 +
.../process/ControlNotificationHandler.java | 16 +
.../internal/process/ControllableProcess.java | 16 +
.../process/FileAlreadyExistsException.java | 21 +-
.../process/FileControllerParameters.java | 16 +
.../internal/process/FileProcessController.java | 16 +
.../process/LocalProcessController.java | 21 +-
.../internal/process/LocalProcessLauncher.java | 21 +-
.../process/MBeanControllerParameters.java | 16 +
.../process/MBeanInvocationFailedException.java | 21 +-
.../process/MBeanProcessController.java | 16 +
.../internal/process/NativeProcessUtils.java | 16 +
.../process/NonBlockingProcessStreamReader.java | 16 +
.../gemfire/internal/process/PidFile.java | 16 +
.../process/PidUnavailableException.java | 21 +-
.../internal/process/ProcessController.java | 16 +
.../process/ProcessControllerFactory.java | 16 +
.../process/ProcessControllerParameters.java | 16 +
.../process/ProcessLauncherContext.java | 21 +-
.../internal/process/ProcessStreamReader.java | 21 +-
.../ProcessTerminatedAbnormallyException.java | 20 +-
.../gemfire/internal/process/ProcessType.java | 16 +
.../gemfire/internal/process/ProcessUtils.java | 21 +-
.../gemfire/internal/process/StartupStatus.java | 16 +
.../internal/process/StartupStatusListener.java | 16 +
.../UnableToControlProcessException.java | 16 +
.../AbstractSignalNotificationHandler.java | 20 +-
.../gemfire/internal/process/signal/Signal.java | 20 +-
.../internal/process/signal/SignalEvent.java | 20 +-
.../internal/process/signal/SignalListener.java | 20 +-
.../internal/process/signal/SignalType.java | 20 +-
.../internal/redis/ByteArrayWrapper.java | 16 +
.../internal/redis/ByteToCommandDecoder.java | 16 +
.../gemstone/gemfire/internal/redis/Coder.java | 16 +
.../gemfire/internal/redis/Command.java | 16 +
.../gemfire/internal/redis/DoubleWrapper.java | 16 +
.../internal/redis/ExecutionHandlerContext.java | 16 +
.../gemfire/internal/redis/Executor.java | 16 +
.../gemfire/internal/redis/Extendable.java | 16 +
.../redis/RedisCommandParserException.java | 16 +
.../internal/redis/RedisCommandType.java | 16 +
.../gemfire/internal/redis/RedisConstants.java | 16 +
.../gemfire/internal/redis/RedisDataType.java | 18 +-
.../redis/RedisDataTypeMismatchException.java | 16 +
.../internal/redis/RegionCreationException.java | 16 +
.../gemfire/internal/redis/RegionProvider.java | 18 +-
.../redis/executor/AbstractExecutor.java | 16 +
.../redis/executor/AbstractScanExecutor.java | 16 +
.../internal/redis/executor/AuthExecutor.java | 16 +
.../internal/redis/executor/DBSizeExecutor.java | 16 +
.../internal/redis/executor/DelExecutor.java | 16 +
.../internal/redis/executor/EchoExecutor.java | 16 +
.../internal/redis/executor/ExistsExecutor.java | 16 +
.../redis/executor/ExpirationExecutor.java | 16 +
.../redis/executor/ExpireAtExecutor.java | 16 +
.../internal/redis/executor/ExpireExecutor.java | 16 +
.../redis/executor/FlushAllExecutor.java | 16 +
.../internal/redis/executor/KeysExecutor.java | 16 +
.../internal/redis/executor/ListQuery.java | 16 +
.../redis/executor/PExpireAtExecutor.java | 16 +
.../redis/executor/PExpireExecutor.java | 16 +
.../internal/redis/executor/PTTLExecutor.java | 16 +
.../redis/executor/PersistExecutor.java | 16 +
.../internal/redis/executor/PingExecutor.java | 16 +
.../internal/redis/executor/QuitExecutor.java | 16 +
.../internal/redis/executor/ScanExecutor.java | 16 +
.../redis/executor/ShutDownExecutor.java | 16 +
.../internal/redis/executor/SortedSetQuery.java | 16 +
.../internal/redis/executor/TTLExecutor.java | 16 +
.../internal/redis/executor/TimeExecutor.java | 16 +
.../internal/redis/executor/TypeExecutor.java | 16 +
.../internal/redis/executor/UnkownExecutor.java | 16 +
.../redis/executor/hash/HDelExecutor.java | 16 +
.../redis/executor/hash/HExistsExecutor.java | 16 +
.../redis/executor/hash/HGetAllExecutor.java | 16 +
.../redis/executor/hash/HGetExecutor.java | 16 +
.../redis/executor/hash/HIncrByExecutor.java | 16 +
.../executor/hash/HIncrByFloatExecutor.java | 16 +
.../redis/executor/hash/HKeysExecutor.java | 16 +
.../redis/executor/hash/HLenExecutor.java | 16 +
.../redis/executor/hash/HMGetExecutor.java | 16 +
.../redis/executor/hash/HMSetExecutor.java | 16 +
.../redis/executor/hash/HScanExecutor.java | 16 +
.../redis/executor/hash/HSetExecutor.java | 16 +
.../redis/executor/hash/HSetNXExecutor.java | 16 +
.../redis/executor/hash/HValsExecutor.java | 16 +
.../redis/executor/hash/HashExecutor.java | 18 +-
.../internal/redis/executor/hll/Bits.java | 16 +
.../executor/hll/CardinalityMergeException.java | 18 +-
.../redis/executor/hll/HllExecutor.java | 16 +
.../redis/executor/hll/HyperLogLog.java | 16 +
.../redis/executor/hll/HyperLogLogPlus.java | 18 +-
.../internal/redis/executor/hll/IBuilder.java | 18 +-
.../redis/executor/hll/ICardinality.java | 16 +
.../internal/redis/executor/hll/MurmurHash.java | 18 +-
.../redis/executor/hll/PFAddExecutor.java | 16 +
.../redis/executor/hll/PFCountExecutor.java | 16 +
.../redis/executor/hll/PFMergeExecutor.java | 16 +
.../redis/executor/hll/RegisterSet.java | 18 +-
.../internal/redis/executor/hll/Varint.java | 18 +-
.../redis/executor/list/LIndexExecutor.java | 16 +
.../redis/executor/list/LInsertExecutor.java | 16 +
.../redis/executor/list/LLenExecutor.java | 16 +
.../redis/executor/list/LPopExecutor.java | 16 +
.../redis/executor/list/LPushExecutor.java | 16 +
.../redis/executor/list/LPushXExecutor.java | 16 +
.../redis/executor/list/LRangeExecutor.java | 16 +
.../redis/executor/list/LRemExecutor.java | 16 +
.../redis/executor/list/LSetExecutor.java | 16 +
.../redis/executor/list/LTrimExecutor.java | 16 +
.../redis/executor/list/ListExecutor.java | 16 +
.../redis/executor/list/PopExecutor.java | 16 +
.../redis/executor/list/PushExecutor.java | 16 +
.../redis/executor/list/PushXExecutor.java | 16 +
.../redis/executor/list/RPopExecutor.java | 16 +
.../redis/executor/list/RPushExecutor.java | 16 +
.../redis/executor/list/RPushXExecutor.java | 16 +
.../redis/executor/set/SAddExecutor.java | 16 +
.../redis/executor/set/SCardExecutor.java | 16 +
.../redis/executor/set/SDiffExecutor.java | 16 +
.../redis/executor/set/SDiffStoreExecutor.java | 16 +
.../redis/executor/set/SInterExecutor.java | 16 +
.../redis/executor/set/SInterStoreExecutor.java | 16 +
.../redis/executor/set/SIsMemberExecutor.java | 16 +
.../redis/executor/set/SMembersExecutor.java | 16 +
.../redis/executor/set/SMoveExecutor.java | 16 +
.../redis/executor/set/SPopExecutor.java | 16 +
.../redis/executor/set/SRandMemberExecutor.java | 16 +
.../redis/executor/set/SRemExecutor.java | 16 +
.../redis/executor/set/SScanExecutor.java | 16 +
.../redis/executor/set/SUnionExecutor.java | 16 +
.../redis/executor/set/SUnionStoreExecutor.java | 16 +
.../redis/executor/set/SetExecutor.java | 16 +
.../redis/executor/set/SetOpExecutor.java | 16 +
.../executor/sortedset/SortedSetExecutor.java | 16 +
.../redis/executor/sortedset/ZAddExecutor.java | 16 +
.../redis/executor/sortedset/ZCardExecutor.java | 16 +
.../executor/sortedset/ZCountExecutor.java | 16 +
.../executor/sortedset/ZIncrByExecutor.java | 16 +
.../executor/sortedset/ZLexCountExecutor.java | 16 +
.../executor/sortedset/ZRangeByLexExecutor.java | 16 +
.../sortedset/ZRangeByScoreExecutor.java | 16 +
.../executor/sortedset/ZRangeExecutor.java | 16 +
.../redis/executor/sortedset/ZRankExecutor.java | 16 +
.../redis/executor/sortedset/ZRemExecutor.java | 16 +
.../sortedset/ZRemRangeByLexExecutor.java | 16 +
.../sortedset/ZRemRangeByRankExecutor.java | 16 +
.../sortedset/ZRemRangeByScoreExecutor.java | 16 +
.../sortedset/ZRevRangeByScoreExecutor.java | 16 +
.../executor/sortedset/ZRevRangeExecutor.java | 16 +
.../executor/sortedset/ZRevRankExecutor.java | 16 +
.../redis/executor/sortedset/ZScanExecutor.java | 16 +
.../executor/sortedset/ZScoreExecutor.java | 16 +
.../redis/executor/string/AppendExecutor.java | 16 +
.../redis/executor/string/BitCountExecutor.java | 16 +
.../redis/executor/string/BitOpExecutor.java | 16 +
.../redis/executor/string/BitPosExecutor.java | 16 +
.../redis/executor/string/DecrByExecutor.java | 16 +
.../redis/executor/string/DecrExecutor.java | 16 +
.../redis/executor/string/GetBitExecutor.java | 16 +
.../redis/executor/string/GetExecutor.java | 16 +
.../redis/executor/string/GetRangeExecutor.java | 16 +
.../redis/executor/string/GetSetExecutor.java | 16 +
.../redis/executor/string/IncrByExecutor.java | 16 +
.../executor/string/IncrByFloatExecutor.java | 16 +
.../redis/executor/string/IncrExecutor.java | 16 +
.../redis/executor/string/MGetExecutor.java | 16 +
.../redis/executor/string/MSetExecutor.java | 16 +
.../redis/executor/string/MSetNXExecutor.java | 16 +
.../redis/executor/string/PSetEXExecutor.java | 16 +
.../redis/executor/string/SetBitExecutor.java | 16 +
.../redis/executor/string/SetEXExecutor.java | 16 +
.../redis/executor/string/SetExecutor.java | 16 +
.../redis/executor/string/SetNXExecutor.java | 16 +
.../redis/executor/string/SetRangeExecutor.java | 16 +
.../redis/executor/string/StringExecutor.java | 18 +-
.../redis/executor/string/StrlenExecutor.java | 16 +
.../executor/transactions/DiscardExecutor.java | 16 +
.../executor/transactions/ExecExecutor.java | 16 +
.../executor/transactions/MultiExecutor.java | 16 +
.../transactions/TransactionExecutor.java | 16 +
.../executor/transactions/UnwatchExecutor.java | 16 +
.../executor/transactions/WatchExecutor.java | 16 +
.../internal/security/AuthorizeRequest.java | 21 +-
.../internal/security/AuthorizeRequestPP.java | 21 +-
.../security/FilterPostAuthorization.java | 21 +-
.../security/FilterPreAuthorization.java | 21 +-
.../internal/security/ObjectWithAuthz.java | 21 +-
.../internal/sequencelog/EntryLogger.java | 23 +-
.../gemfire/internal/sequencelog/GraphType.java | 21 +-
.../internal/sequencelog/MembershipLogger.java | 21 +-
.../internal/sequencelog/MessageLogger.java | 21 +-
.../internal/sequencelog/RegionLogger.java | 21 +-
.../internal/sequencelog/SequenceLogger.java | 21 +-
.../sequencelog/SequenceLoggerImpl.java | 21 +-
.../internal/sequencelog/Transition.java | 21 +-
.../gemfire/internal/sequencelog/io/Filter.java | 21 +-
.../sequencelog/io/GemfireLogConverter.java | 21 +-
.../internal/sequencelog/io/GraphReader.java | 21 +-
.../sequencelog/io/InputStreamReader.java | 21 +-
.../sequencelog/io/OutputStreamAppender.java | 21 +-
.../internal/sequencelog/model/Edge.java | 23 +-
.../internal/sequencelog/model/Graph.java | 21 +-
.../internal/sequencelog/model/GraphID.java | 21 +-
.../sequencelog/model/GraphReaderCallback.java | 23 +-
.../internal/sequencelog/model/GraphSet.java | 21 +-
.../internal/sequencelog/model/Vertex.java | 21 +-
.../visualization/text/TextDisplay.java | 21 +-
.../gemfire/internal/shared/NativeCalls.java | 21 +-
.../internal/shared/NativeCallsJNAImpl.java | 21 +-
.../internal/shared/NativeErrorException.java | 21 +-
.../gemfire/internal/shared/OSType.java | 21 +-
.../internal/shared/StringPrintWriter.java | 21 +-
.../internal/shared/TCPSocketOptions.java | 21 +-
.../internal/size/CachingSingleObjectSizer.java | 21 +-
.../size/InstrumentationSingleObjectSizer.java | 21 +-
.../gemfire/internal/size/ObjectGraphSizer.java | 28 +-
.../gemfire/internal/size/ObjectTraverser.java | 28 +-
.../internal/size/ReflectionObjectSizer.java | 21 +-
.../size/ReflectionSingleObjectSizer.java | 21 +-
.../internal/size/SingleObjectSizer.java | 16 +
.../internal/size/SizeClassOnceObjectSizer.java | 21 +-
.../gemfire/internal/size/SizeOfUtil0.java | 21 +-
.../internal/size/WellKnownClassSizer.java | 21 +-
.../internal/statistics/CounterMonitor.java | 21 +-
.../internal/statistics/GaugeMonitor.java | 21 +-
.../statistics/IgnoreResourceException.java | 21 +-
.../MapBasedStatisticsNotification.java | 21 +-
.../internal/statistics/ResourceInstance.java | 21 +-
.../internal/statistics/ResourceType.java | 21 +-
.../internal/statistics/SampleCollector.java | 21 +-
.../internal/statistics/SampleHandler.java | 21 +-
.../internal/statistics/SimpleStatisticId.java | 21 +-
.../statistics/StatArchiveDescriptor.java | 21 +-
.../internal/statistics/StatArchiveHandler.java | 21 +-
.../statistics/StatArchiveHandlerConfig.java | 21 +-
.../internal/statistics/StatMonitorHandler.java | 21 +-
.../internal/statistics/StatisticId.java | 21 +-
.../statistics/StatisticNotFoundException.java | 21 +-
.../internal/statistics/StatisticsListener.java | 23 +-
.../internal/statistics/StatisticsMonitor.java | 21 +-
.../statistics/StatisticsNotification.java | 21 +-
.../internal/statistics/StatisticsSampler.java | 21 +-
.../internal/statistics/ValueMonitor.java | 21 +-
.../stats50/Atomic50StatisticsImpl.java | 21 +-
.../gemfire/internal/stats50/VMStats50.java | 21 +-
.../gemfire/internal/tcp/BaseMsgStreamer.java | 21 +-
.../gemstone/gemfire/internal/tcp/Buffers.java | 21 +-
.../internal/tcp/ByteBufferInputStream.java | 21 +-
.../gemfire/internal/tcp/ConnectExceptions.java | 21 +-
.../gemfire/internal/tcp/Connection.java | 21 +-
.../internal/tcp/ConnectionException.java | 21 +-
.../gemfire/internal/tcp/ConnectionTable.java | 22 +-
.../gemfire/internal/tcp/DirectReplySender.java | 21 +-
.../tcp/ImmutableByteBufferInputStream.java | 21 +-
.../internal/tcp/MemberShunnedException.java | 21 +-
.../gemfire/internal/tcp/MsgDestreamer.java | 21 +-
.../gemfire/internal/tcp/MsgIdGenerator.java | 21 +-
.../gemfire/internal/tcp/MsgOutputStream.java | 21 +-
.../gemfire/internal/tcp/MsgReader.java | 21 +-
.../gemfire/internal/tcp/MsgStreamer.java | 21 +-
.../gemfire/internal/tcp/MsgStreamerList.java | 21 +-
.../gemfire/internal/tcp/NIOMsgReader.java | 21 +-
.../gemfire/internal/tcp/OioMsgReader.java | 21 +-
.../internal/tcp/ReenteredConnectException.java | 21 +-
.../gemfire/internal/tcp/ServerDelegate.java | 21 +-
.../com/gemstone/gemfire/internal/tcp/Stub.java | 21 +-
.../gemfire/internal/tcp/TCPConduit.java | 21 +-
.../tcp/VersionedByteBufferInputStream.java | 21 +-
.../internal/tcp/VersionedMsgStreamer.java | 21 +-
.../internal/util/AbortableTaskService.java | 21 +-
.../gemfire/internal/util/ArrayUtils.java | 21 +-
.../gemfire/internal/util/BlobHelper.java | 21 +-
.../gemfire/internal/util/Breadcrumbs.java | 21 +-
.../gemstone/gemfire/internal/util/Bytes.java | 21 +-
.../gemfire/internal/util/Callable.java | 21 +-
.../gemfire/internal/util/CollectionUtils.java | 21 +-
.../gemfire/internal/util/DebuggerSupport.java | 21 +-
.../gemfire/internal/util/DelayedAction.java | 21 +-
.../com/gemstone/gemfire/internal/util/Hex.java | 21 +-
.../gemstone/gemfire/internal/util/IOUtils.java | 21 +-
.../internal/util/JavaCommandBuilder.java | 21 +-
.../gemfire/internal/util/LogFileUtils.java | 21 +-
.../internal/util/ObjectIntProcedure.java | 16 +
.../gemfire/internal/util/ObjectProcedure.java | 16 +
.../gemfire/internal/util/PasswordUtil.java | 20 +-
.../gemfire/internal/util/PluckStacks.java | 21 +-
.../internal/util/SingletonCallable.java | 16 +
.../gemfire/internal/util/SingletonValue.java | 18 +-
.../internal/util/StackTraceCollector.java | 21 +-
.../gemfire/internal/util/StopWatch.java | 21 +-
.../internal/util/SunAPINotFoundException.java | 20 +-
.../gemfire/internal/util/TransformUtils.java | 21 +-
.../gemfire/internal/util/Transformer.java | 21 +-
.../gemfire/internal/util/Versionable.java | 21 +-
.../internal/util/VersionedArrayList.java | 20 +-
.../util/concurrent/CopyOnWriteHashMap.java | 21 +-
.../util/concurrent/CopyOnWriteWeakHashMap.java | 21 +-
.../CustomEntryConcurrentHashMap.java | 21 +-
.../internal/util/concurrent/FutureResult.java | 21 +-
.../util/concurrent/ReentrantSemaphore.java | 21 +-
.../util/concurrent/SemaphoreReadWriteLock.java | 21 +-
.../util/concurrent/StoppableCondition.java | 21 +-
.../concurrent/StoppableCountDownLatch.java | 21 +-
.../concurrent/StoppableCountDownOrUpLatch.java | 21 +-
.../concurrent/StoppableNonReentrantLock.java | 21 +-
.../util/concurrent/StoppableReadWriteLock.java | 16 +
.../util/concurrent/StoppableReentrantLock.java | 21 +-
.../StoppableReentrantReadWriteLock.java | 21 +-
.../lang/AttachAPINotFoundException.java | 20 +-
.../com/gemstone/gemfire/lang/Identifiable.java | 20 +-
.../management/AlreadyRunningException.java | 21 +-
.../management/AsyncEventQueueMXBean.java | 20 +-
.../gemfire/management/CacheServerMXBean.java | 20 +-
.../gemfire/management/ClientHealthStatus.java | 20 +-
.../gemfire/management/ClientQueueDetail.java | 21 +-
.../DependenciesNotFoundException.java | 20 +-
.../gemfire/management/DiskBackupResult.java | 20 +-
.../gemfire/management/DiskBackupStatus.java | 20 +-
.../gemfire/management/DiskMetrics.java | 20 +-
.../gemfire/management/DiskStoreMXBean.java | 20 +-
.../DistributedLockServiceMXBean.java | 20 +-
.../management/DistributedRegionMXBean.java | 20 +-
.../management/DistributedSystemMXBean.java | 20 +-
.../management/EvictionAttributesData.java | 20 +-
.../FixedPartitionAttributesData.java | 21 +-
.../management/GatewayReceiverMXBean.java | 20 +-
.../gemfire/management/GatewaySenderMXBean.java | 20 +-
.../gemfire/management/GemFireProperties.java | 20 +-
.../gemfire/management/JMXNotificationType.java | 28 +-
.../management/JMXNotificationUserData.java | 28 +-
.../gemstone/gemfire/management/JVMMetrics.java | 20 +-
.../gemfire/management/LocatorMXBean.java | 20 +-
.../gemfire/management/LockServiceMXBean.java | 20 +-
.../gemfire/management/ManagementException.java | 20 +-
.../gemfire/management/ManagementService.java | 21 +-
.../gemfire/management/ManagerMXBean.java | 20 +-
.../gemfire/management/MemberMXBean.java | 20 +-
.../management/MembershipAttributesData.java | 20 +-
.../gemfire/management/NetworkMetrics.java | 20 +-
.../gemstone/gemfire/management/OSMetrics.java | 20 +-
.../management/PartitionAttributesData.java | 20 +-
.../management/PersistentMemberDetails.java | 20 +-
.../management/RegionAttributesData.java | 20 +-
.../gemfire/management/RegionMXBean.java | 20 +-
.../gemfire/management/ServerLoadData.java | 20 +-
.../gemfire/management/cli/CliMetaData.java | 20 +-
.../cli/CommandProcessingException.java | 20 +-
.../gemfire/management/cli/CommandService.java | 20 +-
.../management/cli/CommandServiceException.java | 20 +-
.../management/cli/CommandStatement.java | 20 +-
.../gemfire/management/cli/ConverterHint.java | 21 +-
.../gemstone/gemfire/management/cli/Result.java | 21 +-
.../management/internal/AlertDetails.java | 21 +-
.../management/internal/ArrayConverter.java | 20 +-
.../internal/BaseManagementService.java | 21 +-
.../internal/CollectionConverter.java | 22 +-
.../management/internal/CompositeConverter.java | 20 +-
.../management/internal/EnumConverter.java | 20 +-
.../management/internal/FederatingManager.java | 21 +-
.../internal/FederationComponent.java | 20 +-
.../management/internal/FilterChain.java | 20 +-
.../management/internal/FilterParam.java | 22 +-
.../management/internal/IdentityConverter.java | 20 +-
.../management/internal/JettyHelper.java | 21 +-
.../management/internal/JmxManagerAdvisee.java | 21 +-
.../management/internal/JmxManagerAdvisor.java | 21 +-
.../management/internal/JmxManagerLocator.java | 21 +-
.../internal/JmxManagerLocatorRequest.java | 20 +-
.../internal/JmxManagerLocatorResponse.java | 20 +-
.../management/internal/LocalFilterChain.java | 20 +-
.../management/internal/LocalManager.java | 20 +-
.../management/internal/MBeanJMXAdapter.java | 20 +-
.../management/internal/MBeanProxyFactory.java | 22 +-
.../internal/MBeanProxyInfoRepository.java | 22 +-
.../internal/MBeanProxyInvocationHandler.java | 23 +-
.../internal/MXBeanProxyInvocationHandler.java | 20 +-
.../management/internal/ManagementAgent.java | 21 +-
.../internal/ManagementCacheListener.java | 22 +-
.../internal/ManagementConstants.java | 20 +-
.../management/internal/ManagementFunction.java | 20 +-
.../internal/ManagementMembershipListener.java | 20 +-
.../internal/ManagementResourceRepo.java | 20 +-
.../management/internal/ManagementStrings.java | 20 +-
.../gemfire/management/internal/Manager.java | 21 +-
.../internal/ManagerStartupMessage.java | 21 +-
.../management/internal/MemberMessenger.java | 20 +-
.../internal/MonitoringRegionCacheListener.java | 20 +-
.../internal/NotificationBroadCasterProxy.java | 20 +-
.../internal/NotificationCacheListener.java | 20 +-
.../management/internal/NotificationHub.java | 22 +-
.../internal/NotificationHubClient.java | 20 +-
.../management/internal/NotificationKey.java | 20 +-
.../gemfire/management/internal/OpenMethod.java | 22 +-
.../management/internal/OpenTypeConverter.java | 20 +-
.../management/internal/OpenTypeUtil.java | 20 +-
.../gemfire/management/internal/ProxyInfo.java | 20 +-
.../management/internal/ProxyInterface.java | 20 +-
.../management/internal/ProxyListener.java | 20 +-
.../management/internal/RemoteFilterChain.java | 20 +-
.../gemfire/management/internal/RestAgent.java | 21 +-
.../gemfire/management/internal/SSLUtil.java | 16 +
.../management/internal/StringBasedFilter.java | 20 +-
.../internal/SystemManagementService.java | 21 +-
.../management/internal/TableConverter.java | 22 +-
.../internal/beans/AggregateHandler.java | 20 +-
.../internal/beans/AsyncEventQueueMBean.java | 20 +-
.../beans/AsyncEventQueueMBeanBridge.java | 20 +-
.../internal/beans/BeanUtilFuncs.java | 20 +-
.../internal/beans/CacheServerBridge.java | 20 +-
.../internal/beans/CacheServerMBean.java | 20 +-
.../internal/beans/DiskRegionBridge.java | 22 +-
.../internal/beans/DiskStoreMBean.java | 20 +-
.../internal/beans/DiskStoreMBeanBridge.java | 20 +-
.../beans/DistributedLockServiceBridge.java | 20 +-
.../beans/DistributedLockServiceMBean.java | 20 +-
.../internal/beans/DistributedRegionBridge.java | 20 +-
.../internal/beans/DistributedRegionMBean.java | 20 +-
.../internal/beans/DistributedSystemBridge.java | 20 +-
.../internal/beans/DistributedSystemMBean.java | 20 +-
.../internal/beans/GatewayReceiverMBean.java | 20 +-
.../beans/GatewayReceiverMBeanBridge.java | 20 +-
.../internal/beans/GatewaySenderMBean.java | 20 +-
.../beans/GatewaySenderMBeanBridge.java | 20 +-
.../internal/beans/HDFSRegionBridge.java | 20 +-
.../management/internal/beans/LocatorMBean.java | 20 +-
.../internal/beans/LocatorMBeanBridge.java | 20 +-
.../internal/beans/LockServiceMBean.java | 20 +-
.../internal/beans/LockServiceMBeanBridge.java | 22 +-
.../internal/beans/MBeanAggregator.java | 20 +-
.../internal/beans/ManagementAdapter.java | 22 +-
.../internal/beans/ManagementListener.java | 20 +-
.../management/internal/beans/ManagerMBean.java | 20 +-
.../internal/beans/ManagerMBeanBridge.java | 20 +-
.../management/internal/beans/MemberMBean.java | 20 +-
.../internal/beans/MemberMBeanBridge.java | 21 +-
.../internal/beans/MetricsCalculator.java | 20 +-
.../internal/beans/PartitionedRegionBridge.java | 20 +-
.../internal/beans/QueryDataFunction.java | 20 +-
.../management/internal/beans/RegionMBean.java | 20 +-
.../internal/beans/RegionMBeanBridge.java | 20 +-
.../beans/RegionMBeanCompositeDataFactory.java | 20 +-
.../internal/beans/SequenceNumber.java | 20 +-
.../management/internal/beans/ServerBridge.java | 21 +-
.../stats/AggregateRegionStatsMonitor.java | 20 +-
.../internal/beans/stats/GCStatsMonitor.java | 20 +-
.../GatewayReceiverClusterStatsMonitor.java | 20 +-
.../stats/GatewaySenderClusterStatsMonitor.java | 20 +-
.../stats/IntegerStatsDeltaAggregator.java | 23 +-
.../beans/stats/LongStatsDeltaAggregator.java | 23 +-
.../internal/beans/stats/MBeanStatsMonitor.java | 20 +-
.../beans/stats/MemberClusterStatsMonitor.java | 20 +-
.../beans/stats/MemberLevelDiskMonitor.java | 20 +-
.../beans/stats/RegionClusterStatsMonitor.java | 20 +-
.../beans/stats/ServerClusterStatsMonitor.java | 20 +-
.../internal/beans/stats/StatType.java | 20 +-
.../internal/beans/stats/StatsAggregator.java | 20 +-
.../beans/stats/StatsAverageLatency.java | 20 +-
.../internal/beans/stats/StatsKey.java | 20 +-
.../internal/beans/stats/StatsLatency.java | 20 +-
.../internal/beans/stats/StatsRate.java | 20 +-
.../internal/beans/stats/VMStatsMonitor.java | 20 +-
.../cli/AbstractCliAroundInterceptor.java | 20 +-
.../internal/cli/CliAroundInterceptor.java | 20 +-
.../management/internal/cli/CliUtil.java | 20 +-
.../management/internal/cli/CommandManager.java | 20 +-
.../management/internal/cli/CommandRequest.java | 21 +-
.../internal/cli/CommandResponse.java | 22 +-
.../internal/cli/CommandResponseBuilder.java | 20 +-
.../internal/cli/CommandResponseWriter.java | 20 +-
.../internal/cli/GfshParseResult.java | 20 +-
.../management/internal/cli/GfshParser.java | 20 +-
.../management/internal/cli/Launcher.java | 20 +-
.../management/internal/cli/LogWrapper.java | 20 +-
.../internal/cli/MultipleValueAdapter.java | 21 +-
.../internal/cli/MultipleValueConverter.java | 21 +-
.../internal/cli/annotation/CliArgument.java | 20 +-
.../cli/commands/AbstractCommandsSupport.java | 20 +-
.../internal/cli/commands/ClientCommands.java | 20 +-
.../internal/cli/commands/ConfigCommands.java | 20 +-
.../CreateAlterDestroyRegionCommands.java | 32 +-
.../internal/cli/commands/DataCommands.java | 20 +-
.../internal/cli/commands/DeployCommands.java | 20 +-
.../cli/commands/DiskStoreCommands.java | 41 +-
.../cli/commands/DurableClientCommands.java | 20 +-
...ExportImportSharedConfigurationCommands.java | 21 +-
.../internal/cli/commands/FunctionCommands.java | 20 +-
.../internal/cli/commands/GfshHelpCommands.java | 20 +-
.../cli/commands/HDFSStoreCommands.java | 695 -------
.../internal/cli/commands/IndexCommands.java | 20 +-
.../cli/commands/LauncherLifecycleCommands.java | 20 +-
.../internal/cli/commands/MemberCommands.java | 20 +-
.../cli/commands/MiscellaneousCommands.java | 20 +-
.../internal/cli/commands/PDXCommands.java | 16 +
.../internal/cli/commands/QueueCommands.java | 20 +-
.../internal/cli/commands/RegionCommands.java | 20 +-
.../internal/cli/commands/ShellCommands.java | 27 +-
.../internal/cli/commands/StatusCommands.java | 21 +-
.../internal/cli/commands/WanCommands.java | 21 +-
.../cli/commands/dto/RegionAttributesInfo.java | 21 +-
.../cli/commands/dto/RegionDetails.java | 21 +-
.../cli/commands/dto/RegionMemberDetails.java | 21 +-
.../cli/converters/BooleanConverter.java | 22 +-
.../ClusterMemberIdNameConverter.java | 20 +-
.../converters/ConnectionEndpointConverter.java | 21 +-
.../internal/cli/converters/DirConverter.java | 20 +-
.../cli/converters/DirPathConverter.java | 20 +-
.../cli/converters/DiskStoreNameConverter.java | 20 +-
.../internal/cli/converters/EnumConverter.java | 20 +-
.../cli/converters/FilePathConverter.java | 20 +-
.../cli/converters/FilePathStringConverter.java | 20 +-
.../converters/GatewayReceiverIdsConverter.java | 21 +-
.../converters/GatewaySenderIdConverter.java | 20 +-
.../cli/converters/HdfsStoreNameConverter.java | 88 -
.../internal/cli/converters/HelpConverter.java | 20 +-
.../cli/converters/HintTopicConverter.java | 20 +-
.../cli/converters/IndexTypeConverter.java | 21 +-
.../LocatorDiscoveryConfigConverter.java | 20 +-
.../cli/converters/LocatorIdNameConverter.java | 20 +-
.../cli/converters/LogLevelConverter.java | 20 +-
.../cli/converters/MemberGroupConverter.java | 20 +-
.../cli/converters/MemberIdNameConverter.java | 20 +-
.../cli/converters/RegionPathConverter.java | 20 +-
.../cli/converters/StringArrayConverter.java | 20 +-
.../cli/converters/StringListConverter.java | 20 +-
.../cli/domain/AsyncEventQueueDetails.java | 21 +-
.../internal/cli/domain/CacheServerInfo.java | 21 +-
.../cli/domain/ConnectToLocatorResult.java | 20 +-
.../internal/cli/domain/DataCommandRequest.java | 21 +-
.../internal/cli/domain/DataCommandResult.java | 21 +-
.../internal/cli/domain/DiskStoreDetails.java | 18 +-
.../cli/domain/DurableCqNamesResult.java | 21 +-
.../cli/domain/EvictionAttributesInfo.java | 21 +-
.../domain/FixedPartitionAttributesInfo.java | 21 +-
.../internal/cli/domain/IndexDetails.java | 20 +-
.../internal/cli/domain/IndexInfo.java | 21 +-
.../cli/domain/MemberConfigurationInfo.java | 21 +-
.../internal/cli/domain/MemberInformation.java | 20 +-
.../internal/cli/domain/MemberResult.java | 21 +-
.../cli/domain/PartitionAttributesInfo.java | 21 +-
.../cli/domain/RegionAttributesInfo.java | 21 +-
.../internal/cli/domain/RegionDescription.java | 21 +-
.../cli/domain/RegionDescriptionPerMember.java | 21 +-
.../internal/cli/domain/RegionInformation.java | 20 +-
.../cli/domain/StackTracesPerMember.java | 21 +-
.../cli/domain/SubscriptionQueueSizeResult.java | 21 +-
.../cli/exceptions/CliCommandException.java | 20 +-
.../exceptions/CliCommandInvalidException.java | 20 +-
.../CliCommandMultiModeOptionException.java | 16 +
.../CliCommandNotAvailableException.java | 20 +-
.../exceptions/CliCommandOptionException.java | 20 +-
...CommandOptionHasMultipleValuesException.java | 20 +-
.../CliCommandOptionInvalidException.java | 20 +-
.../CliCommandOptionMissingException.java | 20 +-
.../CliCommandOptionNotApplicableException.java | 20 +-
...liCommandOptionValueConversionException.java | 20 +-
.../CliCommandOptionValueException.java | 20 +-
.../CliCommandOptionValueMissingException.java | 20 +-
.../internal/cli/exceptions/CliException.java | 20 +-
.../exceptions/CreateSubregionException.java | 20 +-
.../cli/exceptions/ExceptionGenerator.java | 20 +-
.../cli/exceptions/ExceptionHandler.java | 20 +-
.../cli/exceptions/IndexNotFoundException.java | 16 +
.../cli/functions/AlterHDFSStoreFunction.java | 228 ---
.../functions/AlterRuntimeConfigFunction.java | 21 +-
.../cli/functions/ChangeLogLevelFunction.java | 20 +-
.../cli/functions/CliFunctionResult.java | 21 +-
.../functions/CloseDurableClientFunction.java | 21 +-
.../cli/functions/CloseDurableCqFunction.java | 21 +-
.../cli/functions/ContunuousQueryFunction.java | 20 +-
.../CreateAsyncEventQueueFunction.java | 21 +-
.../functions/CreateDefinedIndexesFunction.java | 16 +
.../cli/functions/CreateDiskStoreFunction.java | 21 +-
.../cli/functions/CreateHDFSStoreFunction.java | 124 --
.../cli/functions/CreateIndexFunction.java | 21 +-
.../cli/functions/DataCommandFunction.java | 21 +-
.../internal/cli/functions/DeployFunction.java | 21 +-
.../functions/DescribeDiskStoreFunction.java | 18 +-
.../functions/DescribeHDFSStoreFunction.java | 16 +
.../cli/functions/DestroyDiskStoreFunction.java | 21 +-
.../cli/functions/DestroyHDFSStoreFunction.java | 100 -
.../cli/functions/DestroyIndexFunction.java | 21 +-
.../cli/functions/ExportConfigFunction.java | 23 +-
.../cli/functions/ExportDataFunction.java | 21 +-
.../ExportSharedConfigurationFunction.java | 21 +-
.../FetchRegionAttributesFunction.java | 20 +-
.../FetchSharedConfigurationStatusFunction.java | 21 +-
.../functions/GarbageCollectionFunction.java | 21 +-
.../GatewayReceiverCreateFunction.java | 21 +-
.../functions/GatewayReceiverFunctionArgs.java | 21 +-
.../functions/GatewaySenderCreateFunction.java | 21 +-
.../functions/GatewaySenderFunctionArgs.java | 21 +-
.../GetMemberConfigInformationFunction.java | 21 +-
.../functions/GetMemberInformationFunction.java | 21 +-
.../functions/GetRegionDescriptionFunction.java | 20 +-
.../cli/functions/GetRegionsFunction.java | 20 +-
.../cli/functions/GetStackTracesFunction.java | 21 +-
.../GetSubscriptionQueueSizeFunction.java | 21 +-
.../cli/functions/ImportDataFunction.java | 21 +-
...ortSharedConfigurationArtifactsFunction.java | 21 +-
.../functions/ListAsyncEventQueuesFunction.java | 18 +-
.../cli/functions/ListDeployedFunction.java | 21 +-
.../cli/functions/ListDiskStoresFunction.java | 18 +-
.../functions/ListDurableCqNamesFunction.java | 20 +-
.../cli/functions/ListFunctionFunction.java | 21 +-
.../cli/functions/ListHDFSStoresFunction.java | 102 -
.../cli/functions/ListIndexFunction.java | 20 +-
.../LoadSharedConfigurationFunction.java | 21 +-
.../internal/cli/functions/LogFileFunction.java | 23 +-
.../cli/functions/MemberRegionFunction.java | 23 +-
.../cli/functions/MembersForRegionFunction.java | 20 +-
.../internal/cli/functions/NetstatFunction.java | 20 +-
.../cli/functions/RebalanceFunction.java | 23 +-
.../cli/functions/RegionAlterFunction.java | 20 +-
.../cli/functions/RegionCreateFunction.java | 28 +-
.../cli/functions/RegionDestroyFunction.java | 20 +-
.../cli/functions/RegionFunctionArgs.java | 86 +-
.../cli/functions/ShutDownFunction.java | 23 +-
.../cli/functions/UndeployFunction.java | 21 +-
.../cli/functions/UnregisterFunction.java | 23 +-
.../cli/functions/UserFunctionExecution.java | 24 +-
.../management/internal/cli/help/CliTopic.java | 20 +-
.../internal/cli/help/format/Block.java | 20 +-
.../internal/cli/help/format/DataNode.java | 20 +-
.../internal/cli/help/format/Help.java | 20 +-
.../internal/cli/help/format/NewHelp.java | 20 +-
.../internal/cli/help/format/Row.java | 20 +-
.../internal/cli/help/utils/FormatOutput.java | 16 +
.../internal/cli/help/utils/HelpUtils.java | 20 +-
.../internal/cli/i18n/CliStrings.java | 134 +-
.../internal/cli/json/GfJsonArray.java | 20 +-
.../internal/cli/json/GfJsonException.java | 22 +-
.../internal/cli/json/GfJsonObject.java | 20 +-
.../management/internal/cli/json/TypedJson.java | 20 +-
.../internal/cli/modes/CommandModes.java | 18 +-
.../cli/multistep/CLIMultiStepHelper.java | 21 +-
.../internal/cli/multistep/CLIRemoteStep.java | 16 +
.../internal/cli/multistep/CLIStep.java | 16 +
.../cli/multistep/CLIStepExecption.java | 21 +-
.../cli/multistep/MultiStepCommand.java | 16 +
.../internal/cli/parser/Argument.java | 20 +-
.../internal/cli/parser/AvailabilityTarget.java | 20 +-
.../internal/cli/parser/CommandTarget.java | 22 +-
.../internal/cli/parser/GfshMethodTarget.java | 22 +-
.../internal/cli/parser/GfshOptionParser.java | 22 +-
.../internal/cli/parser/MethodParameter.java | 20 +-
.../management/internal/cli/parser/Option.java | 20 +-
.../internal/cli/parser/OptionSet.java | 20 +-
.../internal/cli/parser/Parameter.java | 20 +-
.../internal/cli/parser/ParserUtils.java | 20 +-
.../internal/cli/parser/SyntaxConstants.java | 22 +-
.../cli/parser/jopt/JoptOptionParser.java | 20 +-
.../preprocessor/EnclosingCharacters.java | 20 +-
.../cli/parser/preprocessor/Preprocessor.java | 20 +-
.../parser/preprocessor/PreprocessorUtils.java | 20 +-
.../internal/cli/parser/preprocessor/Stack.java | 20 +-
.../cli/parser/preprocessor/TrimmedInput.java | 20 +-
.../cli/remote/CommandExecutionContext.java | 20 +-
.../internal/cli/remote/CommandProcessor.java | 20 +-
.../cli/remote/CommandStatementImpl.java | 20 +-
.../cli/remote/MemberCommandService.java | 20 +-
.../cli/remote/RemoteExecutionStrategy.java | 20 +-
.../internal/cli/remote/WrapperThreadLocal.java | 20 +-
.../internal/cli/result/AbstractResultData.java | 20 +-
.../cli/result/CliJsonSerializable.java | 20 +-
.../cli/result/CliJsonSerializableFactory.java | 21 +-
.../cli/result/CliJsonSerializableIds.java | 20 +-
.../internal/cli/result/CommandResult.java | 20 +-
.../cli/result/CommandResultException.java | 21 +-
.../cli/result/CompositeResultData.java | 20 +-
.../internal/cli/result/ErrorResultData.java | 20 +-
.../internal/cli/result/FileResult.java | 20 +-
.../internal/cli/result/InfoResultData.java | 20 +-
.../internal/cli/result/ObjectResultData.java | 20 +-
.../internal/cli/result/ResultBuilder.java | 20 +-
.../internal/cli/result/ResultData.java | 20 +-
.../cli/result/ResultDataException.java | 20 +-
.../internal/cli/result/TableBuilder.java | 20 +-
.../internal/cli/result/TableBuilderHelper.java | 21 +-
.../internal/cli/result/TabularResultData.java | 20 +-
.../management/internal/cli/shell/Gfsh.java | 20 +-
.../internal/cli/shell/GfshConfig.java | 20 +-
.../cli/shell/GfshExecutionStrategy.java | 20 +-
.../cli/shell/JMXConnectionException.java | 20 +-
.../cli/shell/JMXInvocationException.java | 20 +-
.../internal/cli/shell/JmxOperationInvoker.java | 20 +-
.../internal/cli/shell/MultiCommandHelper.java | 16 +
.../internal/cli/shell/OperationInvoker.java | 20 +-
.../internal/cli/shell/jline/ANSIHandler.java | 20 +-
.../cli/shell/jline/CygwinMinttyTerminal.java | 21 +-
.../internal/cli/shell/jline/GfshHistory.java | 20 +-
.../shell/jline/GfshUnsupportedTerminal.java | 20 +-
.../cli/shell/unsafe/GfshSignalHandler.java | 21 +-
.../internal/cli/util/CLIConsoleBufferUtil.java | 21 +-
.../internal/cli/util/CauseFinder.java | 20 +-
.../cli/util/ClasspathScanLoadHelper.java | 20 +-
.../internal/cli/util/CommandStringBuilder.java | 20 +-
.../internal/cli/util/CommentSkipHelper.java | 20 +-
.../internal/cli/util/ConnectionEndpoint.java | 21 +-
.../internal/cli/util/DiskStoreCompacter.java | 20 +-
.../cli/util/DiskStoreNotFoundException.java | 18 +-
.../internal/cli/util/DiskStoreUpgrader.java | 21 +-
.../internal/cli/util/DiskStoreValidater.java | 21 +-
.../cli/util/EvictionAttributesInfo.java | 21 +-
.../cli/util/FixedPartitionAttributesInfo.java | 21 +-
.../internal/cli/util/GfshConsoleReader.java | 22 +-
.../cli/util/HDFSStoreNotFoundException.java | 18 +-
.../cli/util/JConsoleNotFoundException.java | 20 +-
.../management/internal/cli/util/JsonUtil.java | 20 +-
.../internal/cli/util/MemberInformation.java | 20 +-
.../cli/util/MemberNotFoundException.java | 18 +-
.../management/internal/cli/util/MergeLogs.java | 21 +-
.../internal/cli/util/ReadWriteFile.java | 21 +-
.../cli/util/RegionAttributesDefault.java | 21 +-
.../cli/util/RegionAttributesNames.java | 21 +-
.../internal/cli/util/RegionPath.java | 20 +-
.../cli/util/VisualVmNotFoundException.java | 20 +-
.../internal/cli/util/spring/Assert.java | 20 +-
.../internal/cli/util/spring/ObjectUtils.java | 21 +-
.../cli/util/spring/ReflectionUtils.java | 21 +-
.../internal/cli/util/spring/StringUtils.java | 21 +-
.../SharedConfigurationWriter.java | 21 +-
.../callbacks/ConfigurationChangeListener.java | 21 +-
.../configuration/domain/CacheElement.java | 21 +-
.../configuration/domain/Configuration.java | 21 +-
.../domain/ConfigurationChangeResult.java | 21 +-
.../domain/SharedConfigurationStatus.java | 16 +
.../configuration/domain/XmlEntity.java | 21 +-
.../configuration/functions/AddJarFunction.java | 21 +-
.../functions/AddXmlEntityFunction.java | 21 +-
.../functions/DeleteJarFunction.java | 21 +-
.../functions/DeleteXmlEntityFunction.java | 21 +-
.../functions/GetAllJarsFunction.java | 21 +-
.../functions/ModifyPropertiesFunction.java | 21 +-
.../handlers/ConfigurationRequestHandler.java | 21 +-
...SharedConfigurationStatusRequestHandler.java | 21 +-
.../messages/ConfigurationRequest.java | 21 +-
.../messages/ConfigurationResponse.java | 21 +-
.../SharedConfigurationStatusRequest.java | 21 +-
.../SharedConfigurationStatusResponse.java | 21 +-
.../configuration/utils/DtdResolver.java | 16 +
.../configuration/utils/XmlConstants.java | 21 +-
.../internal/configuration/utils/XmlUtils.java | 21 +-
.../internal/configuration/utils/ZipUtils.java | 21 +-
.../internal/messages/CompactRequest.java | 20 +-
.../internal/messages/CompactResponse.java | 20 +-
.../internal/security/AccessControl.java | 16 +
.../internal/security/AccessControlContext.java | 16 +
.../internal/security/AccessControlMXBean.java | 16 +
.../internal/security/CLIOperationContext.java | 16 +
.../internal/security/JMXOperationContext.java | 16 +
.../internal/security/JSONAuthorization.java | 16 +
.../internal/security/MBeanServerWrapper.java | 16 +
.../security/ManagementInterceptor.java | 16 +
.../management/internal/security/Resource.java | 16 +
.../internal/security/ResourceConstants.java | 16 +
.../internal/security/ResourceOperation.java | 16 +
.../security/ResourceOperationContext.java | 16 +
.../unsafe/ReadOpFileAccessController.java | 21 +-
.../controllers/AbstractCommandsController.java | 28 +-
.../AbstractMultiPartCommandsController.java | 21 +-
.../controllers/ClientCommandsController.java | 21 +-
.../controllers/ClusterCommandsController.java | 21 +-
.../controllers/ConfigCommandsController.java | 21 +-
.../web/controllers/DataCommandsController.java | 21 +-
.../controllers/DeployCommandsController.java | 21 +-
.../DiskStoreCommandsController.java | 21 +-
.../DurableClientCommandsController.java | 21 +-
.../controllers/FunctionCommandsController.java | 21 +-
.../HDFSStoreCommandsController.java | 229 ---
.../controllers/IndexCommandsController.java | 21 +-
.../LauncherLifecycleCommandsController.java | 21 +-
.../controllers/MemberCommandsController.java | 21 +-
.../MiscellaneousCommandsController.java | 21 +-
.../web/controllers/PdxCommandsController.java | 16 +
.../controllers/QueueCommandsController.java | 21 +-
.../controllers/RegionCommandsController.java | 21 +-
.../controllers/ShellCommandsController.java | 225 +--
.../web/controllers/WanCommandsController.java | 21 +-
.../EnvironmentVariablesHandlerInterceptor.java | 21 +-
.../support/MemberMXBeanAdapter.java | 21 +-
.../management/internal/web/domain/Link.java | 21 +-
.../internal/web/domain/LinkIndex.java | 21 +-
.../web/domain/QueryParameterSource.java | 21 +-
.../internal/web/http/ClientHttpRequest.java | 21 +-
.../internal/web/http/HttpHeader.java | 21 +-
.../internal/web/http/HttpMethod.java | 21 +-
.../SerializableObjectHttpMessageConverter.java | 21 +-
.../web/http/support/SimpleHttpRequester.java | 21 +-
.../internal/web/io/MultipartFileAdapter.java | 21 +-
.../web/io/MultipartFileResourceAdapter.java | 21 +-
.../web/shell/AbstractHttpOperationInvoker.java | 21 +-
.../web/shell/HttpOperationInvoker.java | 16 +
.../web/shell/MBeanAccessException.java | 21 +-
.../RestApiCallForCommandNotFoundException.java | 21 +-
.../web/shell/RestHttpOperationInvoker.java | 21 +-
.../web/shell/SimpleHttpOperationInvoker.java | 21 +-
.../shell/support/HttpInvocationHandler.java | 21 +-
.../shell/support/HttpMBeanProxyFactory.java | 21 +-
.../internal/web/util/ConvertUtils.java | 21 +-
.../management/internal/web/util/UriUtils.java | 21 +-
.../management/membership/ClientMembership.java | 21 +-
.../membership/ClientMembershipEvent.java | 21 +-
.../membership/ClientMembershipListener.java | 21 +-
.../ClientMembershipListenerAdapter.java | 21 +-
.../management/membership/MembershipEvent.java | 21 +-
.../membership/MembershipListener.java | 21 +-
.../UniversalMembershipListenerAdapter.java | 21 +-
.../memcached/GemFireMemcachedServer.java | 21 +-
.../com/gemstone/gemfire/pdx/FieldType.java | 21 +-
.../com/gemstone/gemfire/pdx/JSONFormatter.java | 16 +
.../gemfire/pdx/JSONFormatterException.java | 23 +-
.../gemfire/pdx/NonPortableClassException.java | 16 +
.../gemfire/pdx/PdxConfigurationException.java | 21 +-
.../pdx/PdxFieldAlreadyExistsException.java | 21 +-
.../pdx/PdxFieldDoesNotExistException.java | 21 +-
.../pdx/PdxFieldTypeMismatchException.java | 21 +-
.../gemfire/pdx/PdxInitializationException.java | 21 +-
.../com/gemstone/gemfire/pdx/PdxInstance.java | 21 +-
.../gemfire/pdx/PdxInstanceFactory.java | 21 +-
.../com/gemstone/gemfire/pdx/PdxReader.java | 21 +-
.../pdx/PdxRegistryMismatchException.java | 24 +-
.../gemstone/gemfire/pdx/PdxSerializable.java | 21 +-
.../gemfire/pdx/PdxSerializationException.java | 21 +-
.../com/gemstone/gemfire/pdx/PdxSerializer.java | 21 +-
.../gemstone/gemfire/pdx/PdxUnreadFields.java | 21 +-
.../com/gemstone/gemfire/pdx/PdxWriter.java | 21 +-
.../pdx/ReflectionBasedAutoSerializer.java | 21 +-
.../gemfire/pdx/WritablePdxInstance.java | 21 +-
.../pdx/internal/AutoSerializableManager.java | 21 +-
.../pdx/internal/CheckTypeRegistryState.java | 21 +-
.../pdx/internal/ClientTypeRegistration.java | 21 +-
.../gemfire/pdx/internal/ComparableEnum.java | 16 +
.../pdx/internal/ConvertableToBytes.java | 16 +
.../gemstone/gemfire/pdx/internal/DataSize.java | 21 +-
.../gemfire/pdx/internal/DefaultPdxField.java | 21 +-
.../gemstone/gemfire/pdx/internal/EnumId.java | 21 +-
.../gemstone/gemfire/pdx/internal/EnumInfo.java | 21 +-
.../pdx/internal/FieldNotFoundInPdxVersion.java | 16 +
.../gemfire/pdx/internal/InternalPdxReader.java | 21 +-
.../pdx/internal/LonerTypeRegistration.java | 21 +-
.../pdx/internal/NullTypeRegistration.java | 21 +-
.../gemstone/gemfire/pdx/internal/PdxField.java | 21 +-
.../gemfire/pdx/internal/PdxInputStream.java | 21 +-
.../gemfire/pdx/internal/PdxInstanceEnum.java | 21 +-
.../pdx/internal/PdxInstanceFactoryImpl.java | 21 +-
.../gemfire/pdx/internal/PdxInstanceImpl.java | 21 +-
.../pdx/internal/PdxInstanceInputStream.java | 21 +-
.../gemfire/pdx/internal/PdxOutputStream.java | 21 +-
.../gemfire/pdx/internal/PdxReaderImpl.java | 21 +-
.../gemfire/pdx/internal/PdxString.java | 23 +-
.../gemstone/gemfire/pdx/internal/PdxType.java | 21 +-
.../gemfire/pdx/internal/PdxUnreadData.java | 21 +-
.../gemfire/pdx/internal/PdxWriterImpl.java | 21 +-
.../pdx/internal/PeerTypeRegistration.java | 21 +-
.../pdx/internal/TrackingPdxReaderImpl.java | 21 +-
.../gemfire/pdx/internal/TypeRegistration.java | 21 +-
.../gemfire/pdx/internal/TypeRegistry.java | 21 +-
.../gemfire/pdx/internal/UnreadPdxType.java | 21 +-
.../internal/WeakConcurrentIdentityHashMap.java | 21 +-
.../pdx/internal/WritablePdxInstanceImpl.java | 21 +-
.../gemfire/pdx/internal/json/JsonHelper.java | 21 +-
.../pdx/internal/json/PdxInstanceHelper.java | 23 +-
.../pdx/internal/json/PdxListHelper.java | 23 +-
.../gemfire/pdx/internal/json/PdxToJSON.java | 23 +-
.../pdx/internal/unsafe/UnsafeWrapper.java | 21 +-
.../com/gemstone/gemfire/ra/GFConnection.java | 16 +
.../gemfire/ra/GFConnectionFactory.java | 16 +
.../gemfire/redis/GemFireRedisServer.java | 18 +-
.../gemfire/security/AccessControl.java | 21 +-
.../gemfire/security/AuthInitialize.java | 21 +-
.../security/AuthenticationFailedException.java | 21 +-
.../AuthenticationRequiredException.java | 21 +-
.../gemfire/security/Authenticator.java | 21 +-
.../security/GemFireSecurityException.java | 21 +-
.../security/NotAuthorizedException.java | 21 +-
.../internal/logging/log4j/log4j2-cli.xml | 17 -
.../internal/logging/log4j/log4j2-default.xml | 21 -
gemfire-core/src/main/resources/log4j2-cli.xml | 17 +
gemfire-core/src/main/resources/log4j2.xml | 22 +
.../batterytest/greplogs/ExpectedStrings.java | 21 +-
.../java/batterytest/greplogs/LogConsumer.java | 66 +-
.../src/test/java/cacheRunner/Portfolio.java | 16 +
.../src/test/java/cacheRunner/Position.java | 16 +
.../src/test/java/com/company/app/Customer.java | 21 +-
.../src/test/java/com/company/app/DBLoader.java | 21 +-
.../com/company/app/OrdersCacheListener.java | 21 +-
.../java/com/company/data/DatabaseLoader.java | 21 +-
.../java/com/company/data/MyDeclarable.java | 16 +
.../src/test/java/com/company/data/MySizer.java | 21 +-
.../com/company/data/MyTransactionListener.java | 21 +-
.../src/test/java/com/examples/LinkNode.java | 21 +-
.../src/test/java/com/examples/SuperClass.java | 21 +-
.../src/test/java/com/examples/TestObject.java | 21 +-
.../src/test/java/com/examples/ds/Address.java | 16 +
.../src/test/java/com/examples/ds/Company.java | 21 +-
.../java/com/examples/ds/CompanySerializer.java | 21 +-
.../src/test/java/com/examples/ds/Employee.java | 21 +-
.../com/examples/ds/PutDataSerializables.java | 21 +-
.../src/test/java/com/examples/ds/User.java | 21 +-
.../com/examples/snapshot/MyDataSerializer.java | 21 +-
.../java/com/examples/snapshot/MyObject.java | 23 +-
.../snapshot/MyObjectDataSerializable.java | 23 +-
.../java/com/examples/snapshot/MyObjectPdx.java | 16 +
.../snapshot/MyObjectPdxSerializable.java | 21 +-
.../com/examples/snapshot/MyPdxSerializer.java | 21 +-
.../java/com/gemstone/gemfire/AppObject.java | 18 +-
.../test/java/com/gemstone/gemfire/BadTest.java | 21 +-
.../com/gemstone/gemfire/CopyJUnitTest.java | 21 +-
.../com/gemstone/gemfire/DeltaTestImpl.java | 21 +-
.../gemfire/DiskInstantiatorsJUnitTest.java | 21 +-
.../com/gemstone/gemfire/GemFireTestCase.java | 21 +-
.../java/com/gemstone/gemfire/Invariant.java | 22 +-
.../com/gemstone/gemfire/InvariantResult.java | 22 +-
.../com/gemstone/gemfire/JUnitTestSetup.java | 21 +-
.../gemfire/JtaNoninvolvementJUnitTest.java | 21 +-
.../gemfire/LocalStatisticsJUnitTest.java | 21 +-
.../com/gemstone/gemfire/LonerDMJUnitTest.java | 21 +-
.../gemstone/gemfire/StatisticsTestCase.java | 21 +-
.../gemfire/StatisticsTypeJUnitTest.java | 21 +-
.../com/gemstone/gemfire/TXExpiryJUnitTest.java | 90 +-
.../java/com/gemstone/gemfire/TXJUnitTest.java | 21 +-
.../com/gemstone/gemfire/TXWriterJUnitTest.java | 21 +-
.../gemstone/gemfire/TXWriterOOMEJUnitTest.java | 21 +-
.../com/gemstone/gemfire/TXWriterTestCase.java | 16 +
.../gemstone/gemfire/TestDataSerializer.java | 21 +-
.../com/gemstone/gemfire/TimingTestCase.java | 22 +-
.../com/gemstone/gemfire/UnitTestDoclet.java | 21 +-
.../gemstone/gemfire/admin/AdminTestHelper.java | 16 +
.../BindDistributedSystemJUnitTest.java | 21 +-
.../internal/CacheHealthEvaluatorJUnitTest.java | 21 +-
.../internal/DistributedSystemTestCase.java | 21 +-
.../admin/internal/HealthEvaluatorTestCase.java | 21 +-
.../MemberHealthEvaluatorJUnitTest.java | 21 +-
.../cache/AttributesFactoryJUnitTest.java | 21 +-
.../gemfire/cache/Bug36619JUnitTest.java | 21 +-
.../gemfire/cache/Bug42039JUnitTest.java | 21 +-
.../gemfire/cache/Bug52289JUnitTest.java | 24 +-
.../gemfire/cache/CacheListenerJUnitTest.java | 21 +-
.../cache/CacheRegionClearStatsDUnitTest.java | 21 +-
.../gemstone/gemfire/cache/ClientHelper.java | 21 +-
.../cache/ClientServerTimeSyncDUnitTest.java | 16 +
.../cache/ConnectionPoolAndLoaderDUnitTest.java | 21 +-
.../cache/ConnectionPoolFactoryJUnitTest.java | 21 +-
.../gemfire/cache/OperationJUnitTest.java | 21 +-
.../gemfire/cache/PoolManagerJUnitTest.java | 21 +-
.../gemstone/gemfire/cache/ProxyJUnitTest.java | 21 +-
.../gemfire/cache/RegionFactoryJUnitTest.java | 21 +-
.../gemfire/cache/RoleExceptionJUnitTest.java | 21 +-
.../client/ClientCacheFactoryJUnitTest.java | 21 +-
.../client/ClientRegionFactoryJUnitTest.java | 21 +-
.../ClientServerRegisterInterestsDUnitTest.java | 16 +
.../internal/AutoConnectionSourceDUnitTest.java | 21 +-
.../AutoConnectionSourceImplJUnitTest.java | 21 +-
.../AutoConnectionSourceWithUDPDUnitTest.java | 21 +-
.../internal/CacheServerSSLConnectionDUnit.java | 648 -------
.../CacheServerSSLConnectionDUnitTest.java | 426 +++++
.../internal/ConnectionPoolImplJUnitTest.java | 21 +-
.../internal/LocatorLoadBalancingDUnitTest.java | 21 +-
.../cache/client/internal/LocatorTestBase.java | 21 +-
.../internal/OpExecutorImplJUnitTest.java | 21 +-
.../client/internal/QueueManagerJUnitTest.java | 21 +-
.../internal/SSLNoClientAuthDUnitTest.java | 280 +++
.../internal/ServerBlackListJUnitTest.java | 21 +-
.../locator/LocatorStatusResponseJUnitTest.java | 20 +-
.../pooling/ConnectionManagerJUnitTest.java | 21 +-
.../ColocatedRegionWithHDFSDUnitTest.java | 189 --
.../hdfs/internal/HDFSConfigJUnitTest.java | 520 ------
.../hdfs/internal/HDFSEntriesSetJUnitTest.java | 227 ---
.../internal/HdfsStoreMutatorJUnitTest.java | 191 --
.../hdfs/internal/RegionRecoveryDUnitTest.java | 415 -----
.../internal/RegionWithHDFSBasicDUnitTest.java | 1594 ----------------
.../RegionWithHDFSOffHeapBasicDUnitTest.java | 114 --
...RegionWithHDFSPersistenceBasicDUnitTest.java | 77 -
.../hdfs/internal/RegionWithHDFSTestBase.java | 715 -------
.../SignalledFlushObserverJUnitTest.java | 23 +-
.../SortedListForAsyncQueueJUnitTest.java | 31 +-
.../internal/hoplog/BaseHoplogTestCase.java | 389 ----
.../hoplog/CardinalityEstimatorJUnitTest.java | 188 --
.../hoplog/HDFSCacheLoaderJUnitTest.java | 106 --
.../hoplog/HDFSCompactionManagerJUnitTest.java | 449 -----
.../hoplog/HDFSRegionDirectorJUnitTest.java | 97 -
.../internal/hoplog/HDFSStatsJUnitTest.java | 250 ---
.../HDFSUnsortedHoplogOrganizerJUnitTest.java | 297 ---
.../HdfsSortedOplogOrganizerJUnitTest.java | 1045 -----------
.../hoplog/HfileSortedOplogJUnitTest.java | 540 ------
.../hoplog/SortedOplogListIterJUnitTest.java | 178 --
.../hoplog/TieredCompactionJUnitTest.java | 904 ---------
.../hoplog/mapreduce/GFKeyJUnitTest.java | 50 -
.../mapreduce/HDFSSplitIteratorJUnitTest.java | 265 ---
.../hoplog/mapreduce/HoplogUtilJUnitTest.java | 305 ---
.../management/MXMemoryPoolListenerExample.java | 21 +-
.../management/MemoryThresholdsDUnitTest.java | 31 +-
.../MemoryThresholdsOffHeapDUnitTest.java | 181 +-
.../management/ResourceManagerDUnitTest.java | 21 +-
.../ExceptionHandlingJUnitTest.java | 21 +-
.../mapInterface/MapFunctionalJUnitTest.java | 21 +-
.../mapInterface/PutAllGlobalLockJUnitTest.java | 21 +-
.../PutOperationContextJUnitTest.java | 16 +
.../GetOperationContextImplJUnitTest.java | 16 +
.../partition/PartitionManagerDUnitTest.java | 21 +-
.../PartitionRegionHelperDUnitTest.java | 21 +-
.../BaseLineAndCompareQueryPerfJUnitTest.java | 21 +-
.../query/Bug32947ValueConstraintJUnitTest.java | 21 +-
.../gemfire/cache/query/BugJUnitTest.java | 21 +-
.../gemfire/cache/query/CacheUtils.java | 21 +-
.../cache/query/PdxStringQueryJUnitTest.java | 21 +-
.../gemstone/gemfire/cache/query/PerfQuery.java | 22 +-
.../gemfire/cache/query/QueryJUnitTest.java | 21 +-
.../cache/query/QueryServiceJUnitTest.java | 21 +-
.../gemfire/cache/query/QueryTestUtils.java | 21 +-
.../cache/query/QueryTestUtilsJUnitTest.java | 21 +-
.../gemfire/cache/query/RegionJUnitTest.java | 21 +-
.../cache/query/TypedIteratorJUnitTest.java | 21 +-
.../com/gemstone/gemfire/cache/query/Utils.java | 21 +-
.../query/cq/dunit/CqQueryTestListener.java | 21 +-
.../gemfire/cache/query/data/Address.java | 21 +-
.../gemstone/gemfire/cache/query/data/City.java | 22 +-
.../cache/query/data/CollectionHolder.java | 22 +-
.../cache/query/data/ComparableWrapper.java | 22 +-
.../gemfire/cache/query/data/Country.java | 21 +-
.../gemstone/gemfire/cache/query/data/Data.java | 22 +-
.../gemfire/cache/query/data/District.java | 22 +-
.../gemfire/cache/query/data/Employee.java | 21 +-
.../gemfire/cache/query/data/Inventory.java | 21 +-
.../gemfire/cache/query/data/Keywords.java | 21 +-
.../gemfire/cache/query/data/Manager.java | 21 +-
.../gemfire/cache/query/data/Numbers.java | 21 +-
.../gemfire/cache/query/data/PhoneNo.java | 21 +-
.../gemfire/cache/query/data/Portfolio.java | 22 +-
.../gemfire/cache/query/data/PortfolioData.java | 21 +-
.../gemfire/cache/query/data/PortfolioNoDS.java | 16 +
.../gemfire/cache/query/data/PortfolioPdx.java | 22 +-
.../gemfire/cache/query/data/Position.java | 21 +-
.../gemfire/cache/query/data/PositionNoDS.java | 16 +
.../gemfire/cache/query/data/PositionPdx.java | 21 +-
.../query/data/ProhibitedSecurityQuote.java | 21 +-
.../gemfire/cache/query/data/Quote.java | 21 +-
.../gemfire/cache/query/data/Restricted.java | 21 +-
.../cache/query/data/SecurityMaster.java | 21 +-
.../gemfire/cache/query/data/State.java | 21 +-
.../gemfire/cache/query/data/Street.java | 21 +-
.../gemfire/cache/query/data/Student.java | 23 +-
.../gemfire/cache/query/data/Vehicle.java | 21 +-
.../gemfire/cache/query/data/Village.java | 21 +-
.../query/dunit/CloseCacheAuthorization.java | 16 +
.../query/dunit/CompactRangeIndexDUnitTest.java | 21 +-
.../cache/query/dunit/CqTimeTestListener.java | 21 +-
.../cache/query/dunit/GroupByDUnitImpl.java | 16 +
.../dunit/GroupByPartitionedQueryDUnitTest.java | 16 +
.../query/dunit/GroupByQueryDUnitTest.java | 16 +
.../cache/query/dunit/HashIndexDUnitTest.java | 21 +-
.../cache/query/dunit/HelperTestCase.java | 16 +
.../dunit/NonDistinctOrderByDUnitImpl.java | 16 +
.../NonDistinctOrderByPartitionedDUnitTest.java | 16 +
.../query/dunit/PdxStringQueryDUnitTest.java | 21 +-
.../dunit/QueryAPITestPartitionResolver.java | 22 +-
.../cache/query/dunit/QueryAuthorization.java | 21 +-
.../dunit/QueryDataInconsistencyDUnitTest.java | 24 +-
.../dunit/QueryIndexUsingXMLDUnitTest.java | 21 +-
.../QueryParamsAuthorizationDUnitTest.java | 21 +-
.../QueryUsingFunctionContextDUnitTest.java | 47 +-
.../query/dunit/QueryUsingPoolDUnitTest.java | 21 +-
.../cache/query/dunit/RemoteQueryDUnitTest.java | 21 +-
...esourceManagerWithQueryMonitorDUnitTest.java | 21 +-
.../query/dunit/SelectStarQueryDUnitTest.java | 21 +-
.../cache/query/facets/lang/Address.java | 23 +-
.../gemfire/cache/query/facets/lang/Course.java | 23 +-
.../cache/query/facets/lang/Department.java | 23 +-
.../query/facets/lang/DerivedEmployee.java | 22 +-
.../cache/query/facets/lang/Employee.java | 21 +-
.../cache/query/facets/lang/Faculty.java | 21 +-
.../cache/query/facets/lang/G_Student.java | 23 +-
.../gemfire/cache/query/facets/lang/Person.java | 23 +-
.../cache/query/facets/lang/Student.java | 23 +-
.../cache/query/facets/lang/UG_Student.java | 23 +-
.../gemfire/cache/query/facets/lang/Utils.java | 20 +-
.../ComparisonOperatorsJUnitTest.java | 21 +-
.../query/functional/ConstantsJUnitTest.java | 21 +-
.../query/functional/CountStarJUnitTest.java | 21 +-
.../CustomerOptimizationsJUnitTest.java | 21 +-
.../DistinctAndNonDistinctQueryJUnitTest.java | 29 +-
...ctResultsWithDupValuesInRegionJUnitTest.java | 21 +-
.../query/functional/FunctionJUnitTest.java | 21 +-
.../functional/GroupByPartitionedJUnitTest.java | 16 +
.../functional/GroupByReplicatedJUnitTest.java | 16 +
.../cache/query/functional/GroupByTestImpl.java | 21 +-
.../query/functional/GroupByTestInterface.java | 16 +
.../query/functional/INOperatorJUnitTest.java | 21 +-
.../functional/IUM6Bug32345ReJUnitTest.java | 21 +-
.../cache/query/functional/IUMJUnitTest.java | 21 +-
.../IUMRCompositeIteratorJUnitTest.java | 21 +-
.../IUMRMultiIndexesMultiRegionJUnitTest.java | 21 +-
.../IUMRShuffleIteratorsJUnitTest.java | 21 +-
.../functional/IUMRSingleRegionJUnitTest.java | 21 +-
...ependentOperandsInWhereClause2JUnitTest.java | 21 +-
.../IndexCreationDeadLockJUnitTest.java | 21 +-
.../functional/IndexCreationJUnitTest.java | 21 +-
.../IndexMaintenanceAsynchJUnitTest.java | 21 +-
.../functional/IndexOperatorJUnitTest.java | 21 +-
.../IndexPrimaryKeyUsageJUnitTest.java | 21 +-
.../IndexUsageInNestedQueryJUnitTest.java | 21 +-
.../IndexUsageWithAliasAsProjAtrbt.java | 21 +-
...IndexUsageWithAliasAsProjAtrbtJUnitTest.java | 21 +-
.../IndexUseMultFrmSnglCondJUnitTest.java | 21 +-
...ndexWithSngleFrmAndMultCondQryJUnitTest.java | 21 +-
.../functional/IteratorTypeDefEmpJUnitTest.java | 21 +-
.../functional/IteratorTypeDefJUnitTest.java | 21 +-
.../IteratorTypeDefaultTypesJUnitTest.java | 21 +-
.../functional/IumMultConditionJUnitTest.java | 21 +-
.../functional/JavaSerializationJUnitTest.java | 21 +-
.../functional/LikePredicateJUnitTest.java | 21 +-
.../query/functional/LimitClauseJUnitTest.java | 21 +-
.../functional/LogicalOperatorsJUnitTest.java | 21 +-
.../cache/query/functional/MiscJUnitTest.java | 21 +-
.../functional/MultiIndexCreationJUnitTest.java | 16 +
.../MultiRegionIndexUsageJUnitTest.java | 21 +-
.../functional/MultipleRegionsJUnitTest.java | 21 +-
.../NegativeNumberQueriesJUnitTest.java | 21 +-
.../query/functional/NestedQueryJUnitTest.java | 21 +-
.../NonDistinctOrderByPartitionedJUnitTest.java | 16 +
.../NonDistinctOrderByReplicatedJUnitTest.java | 16 +
.../NonDistinctOrderByTestImplementation.java | 21 +-
.../query/functional/NumericQueryJUnitTest.java | 21 +-
.../functional/OrderByPartitionedJUnitTest.java | 16 +
.../functional/OrderByReplicatedJUnitTest.java | 16 +
.../functional/OrderByTestImplementation.java | 21 +-
.../functional/ParameterBindingJUnitTest.java | 21 +-
.../PdxGroupByPartitionedJUnitTest.java | 16 +
.../PdxGroupByReplicatedJUnitTest.java | 16 +
.../query/functional/PdxGroupByTestImpl.java | 16 +
.../query/functional/PdxOrderByJUnitTest.java | 16 +
.../functional/QRegionInterfaceJUnitTest.java | 21 +-
.../QueryREUpdateInProgressJUnitTest.java | 21 +-
.../functional/QueryUndefinedJUnitTest.java | 21 +-
.../functional/ReservedKeywordsJUnitTest.java | 21 +-
.../ResultsDataSerializabilityJUnitTest.java | 21 +-
.../query/functional/SelectToDateJUnitTest.java | 21 +-
.../functional/StructMemberAccessJUnitTest.java | 21 +-
.../query/functional/StructSetOrResultsSet.java | 25 +-
.../query/functional/TestNewFunctionSSorRS.java | 21 +-
.../CompiledAggregateFunctionJUnitTest.java | 16 +
.../CompiledGroupBySelectJUnitTest.java | 16 +
.../CompiledJunctionInternalsJUnitTest.java | 21 +-
.../internal/CopyOnReadQueryJUnitTest.java | 21 +-
.../internal/ExecutionContextJUnitTest.java | 21 +-
.../query/internal/IndexManagerJUnitTest.java | 21 +-
.../internal/NWayMergeResultsJUnitTest.java | 16 +
.../internal/OrderByComparatorJUnitTest.java | 16 +
.../internal/ProjectionAttributeJUnitTest.java | 21 +-
.../query/internal/QCompilerJUnitTest.java | 21 +-
...ueryFromClauseCanonicalizationJUnitTest.java | 21 +-
.../QueryObjectSerializationJUnitTest.java | 21 +-
.../QueryObserverCallbackJUnitTest.java | 21 +-
.../query/internal/QueryTraceJUnitTest.java | 21 +-
.../query/internal/QueryUtilsJUnitTest.java | 21 +-
.../query/internal/ResultsBagJUnitTest.java | 21 +-
.../ResultsBagLimitBehaviourJUnitTest.java | 21 +-
.../ResultsCollectionWrapperLimitJUnitTest.java | 21 +-
.../SelectResultsComparatorJUnitTest.java | 21 +-
.../StructBagLimitBehaviourJUnitTest.java | 21 +-
.../query/internal/StructSetJUnitTest.java | 21 +-
.../internal/aggregate/AggregatorJUnitTest.java | 16 +
...syncIndexUpdaterThreadShutdownJUnitTest.java | 21 +-
.../index/AsynchIndexMaintenanceJUnitTest.java | 21 +-
.../CompactRangeIndexIndexMapJUnitTest.java | 21 +-
.../index/CompactRangeIndexJUnitTest.java | 21 +-
...rrentIndexInitOnOverflowRegionDUnitTest.java | 21 +-
...ndexOperationsOnOverflowRegionDUnitTest.java | 21 +-
...pdateWithInplaceObjectModFalseDUnitTest.java | 21 +-
...ConcurrentIndexUpdateWithoutWLDUnitTest.java | 21 +-
.../index/CopyOnReadIndexDUnitTest.java | 95 +-
.../index/CopyOnReadIndexJUnitTest.java | 21 +-
.../DeclarativeIndexCreationJUnitTest.java | 21 +-
.../internal/index/HashIndexJUnitTest.java | 21 +-
.../index/IndexCreationInternalsJUnitTest.java | 21 +-
.../internal/index/IndexElemArrayJUnitTest.java | 21 +-
.../internal/index/IndexHintJUnitTest.java | 16 +
.../query/internal/index/IndexJUnitTest.java | 21 +-
.../index/IndexMaintainceJUnitTest.java | 21 +-
.../index/IndexMaintenanceJUnitTest.java | 21 +-
.../index/IndexStatisticsJUnitTest.java | 21 +-
.../IndexTrackingQueryObserverDUnitTest.java | 21 +-
.../IndexTrackingQueryObserverJUnitTest.java | 21 +-
.../query/internal/index/IndexUseJUnitTest.java | 21 +-
.../IndexedMergeEquiJoinScenariosJUnitTest.java | 21 +-
...itializeIndexEntryDestroyQueryDUnitTest.java | 21 +-
.../internal/index/MapIndexStoreJUnitTest.java | 21 +-
.../MapRangeIndexMaintenanceJUnitTest.java | 21 +-
.../index/MultiIndexCreationDUnitTest.java | 16 +
.../NewDeclarativeIndexCreationJUnitTest.java | 21 +-
.../index/PdxCopyOnReadQueryJUnitTest.java | 16 +
...gRegionCreationIndexUpdateTypeJUnitTest.java | 21 +-
.../PutAllWithIndexPerfDUnitDisabledTest.java | 21 +-
.../internal/index/RangeIndexAPIJUnitTest.java | 23 +-
.../PRBasicIndexCreationDUnitTest.java | 20 +-
.../PRBasicIndexCreationDeadlockDUnitTest.java | 20 +-
.../PRBasicMultiIndexCreationDUnitTest.java | 20 +-
.../partitioned/PRBasicQueryDUnitTest.java | 20 +-
.../PRBasicRemoveIndexDUnitTest.java | 21 +-
.../PRColocatedEquiJoinDUnitTest.java | 21 +-
.../partitioned/PRIndexStatisticsJUnitTest.java | 21 +-
.../partitioned/PRInvalidQueryDUnitTest.java | 20 +-
.../partitioned/PRInvalidQueryJUnitTest.java | 21 +-
.../partitioned/PRQueryCacheCloseDUnitTest.java | 20 +-
.../PRQueryCacheClosedJUnitTest.java | 21 +-
.../query/partitioned/PRQueryDUnitHelper.java | 20 +-
.../query/partitioned/PRQueryDUnitTest.java | 20 +-
.../query/partitioned/PRQueryJUnitTest.java | 21 +-
.../partitioned/PRQueryNumThreadsJUnitTest.java | 21 +-
.../query/partitioned/PRQueryPerfDUnitTest.java | 20 +-
.../PRQueryRegionCloseDUnitTest.java | 20 +-
.../PRQueryRegionClosedJUnitTest.java | 21 +-
.../PRQueryRegionDestroyedDUnitTest.java | 20 +-
.../PRQueryRegionDestroyedJUnitTest.java | 21 +-
.../PRQueryRemoteNodeExceptionDUnitTest.java | 21 +-
.../gemfire/cache/query/transaction/Person.java | 21 +-
.../query/transaction/QueryAndJtaJUnitTest.java | 21 +-
.../internal/ConnectionCountProbeJUnitTest.java | 21 +-
.../cache/snapshot/CacheSnapshotJUnitTest.java | 21 +-
.../snapshot/ParallelSnapshotDUnitTest.java | 21 +-
.../gemfire/cache/snapshot/RegionGenerator.java | 21 +-
.../cache/snapshot/RegionSnapshotJUnitTest.java | 21 +-
.../snapshot/SnapshotByteArrayDUnitTest.java | 21 +-
.../cache/snapshot/SnapshotDUnitTest.java | 21 +-
.../snapshot/SnapshotPerformanceDUnitTest.java | 21 +-
.../cache/snapshot/SnapshotTestCase.java | 21 +-
.../cache/snapshot/WanSnapshotJUnitTest.java | 21 +-
.../cache/util/PasswordUtilJUnitTest.java | 21 +-
.../gemfire/cache30/Bug34387DUnitTest.java | 21 +-
.../gemfire/cache30/Bug34948DUnitTest.java | 21 +-
.../gemfire/cache30/Bug35214DUnitTest.java | 21 +-
.../gemfire/cache30/Bug38013DUnitTest.java | 21 +-
.../gemfire/cache30/Bug38741DUnitTest.java | 21 +-
.../cache30/Bug40255JUnitDisabledTest.java | 22 +-
.../cache30/Bug40662JUnitDisabledTest.java | 21 +-
.../gemfire/cache30/Bug44418JUnitTest.java | 21 +-
.../gemfire/cache30/CacheCloseDUnitTest.java | 21 +-
.../gemfire/cache30/CacheListenerTestCase.java | 21 +-
.../gemfire/cache30/CacheLoaderTestCase.java | 21 +-
.../gemfire/cache30/CacheLogRollDUnitTest.java | 21 +-
.../gemfire/cache30/CacheMapTxnDUnitTest.java | 22 +-
...cheRegionsReliablityStatsCheckDUnitTest.java | 21 +-
.../cache30/CacheSerializableRunnable.java | 21 +-
.../cache30/CacheStatisticsDUnitTest.java | 21 +-
.../gemstone/gemfire/cache30/CacheTestCase.java | 67 +-
.../gemfire/cache30/CacheWriterTestCase.java | 21 +-
.../cache30/CacheXMLPartitionResolver.java | 21 +-
.../gemfire/cache30/CacheXml30DUnitTest.java | 21 +-
.../gemfire/cache30/CacheXml40DUnitTest.java | 37 +-
.../gemfire/cache30/CacheXml41DUnitTest.java | 21 +-
.../gemfire/cache30/CacheXml45DUnitTest.java | 21 +-
.../gemfire/cache30/CacheXml51DUnitTest.java | 21 +-
.../gemfire/cache30/CacheXml55DUnitTest.java | 21 +-
.../gemfire/cache30/CacheXml57DUnitTest.java | 21 +-
.../gemfire/cache30/CacheXml58DUnitTest.java | 21 +-
.../gemfire/cache30/CacheXml60DUnitTest.java | 21 +-
.../gemfire/cache30/CacheXml61DUnitTest.java | 21 +-
.../gemfire/cache30/CacheXml65DUnitTest.java | 22 +-
.../gemfire/cache30/CacheXml66DUnitTest.java | 21 +-
.../gemfire/cache30/CacheXml70DUnitTest.java | 22 +-
.../gemfire/cache30/CacheXml80DUnitTest.java | 22 +-
.../gemfire/cache30/CacheXml81DUnitTest.java | 22 +-
.../gemfire/cache30/CacheXml90DUnitTest.java | 22 +-
.../gemfire/cache30/CacheXmlTestCase.java | 16 +
.../cache30/CachedAllEventsDUnitTest.java | 21 +-
.../gemfire/cache30/CallbackArgDUnitTest.java | 21 +-
.../cache30/CertifiableTestCacheListener.java | 24 +-
.../cache30/ClearMultiVmCallBkDUnitTest.java | 22 +-
.../gemfire/cache30/ClearMultiVmDUnitTest.java | 22 +-
.../cache30/ClientMembershipDUnitTest.java | 21 +-
.../ClientMembershipSelectorDUnitTest.java | 16 +
.../ClientRegisterInterestDUnitTest.java | 21 +-
...ClientRegisterInterestSelectorDUnitTest.java | 16 +
.../cache30/ClientServerCCEDUnitTest.java | 21 +-
.../gemfire/cache30/ClientServerTestCase.java | 21 +-
.../ConcurrentLeaveDuringGIIDUnitTest.java | 21 +-
...ibutedNoAckAsyncOverflowRegionDUnitTest.java | 22 +-
...iskDistributedNoAckAsyncRegionDUnitTest.java | 22 +-
.../DiskDistributedNoAckRegionTestCase.java | 22 +-
...ributedNoAckSyncOverflowRegionDUnitTest.java | 22 +-
.../gemfire/cache30/DiskRegionDUnitTest.java | 21 +-
.../gemfire/cache30/DiskRegionTestImpl.java | 22 +-
.../cache30/DistAckMapMethodsDUnitTest.java | 22 +-
...ckOverflowRegionCCECompressionDUnitTest.java | 21 +-
...istributedAckOverflowRegionCCEDUnitTest.java | 21 +-
...tedAckOverflowRegionCCEOffHeapDUnitTest.java | 16 +
...PersistentRegionCCECompressionDUnitTest.java | 21 +-
...tributedAckPersistentRegionCCEDUnitTest.java | 22 +-
...dAckPersistentRegionCCEOffHeapDUnitTest.java | 16 +
.../DistributedAckRegionCCEDUnitTest.java | 22 +-
...DistributedAckRegionCCEOffHeapDUnitTest.java | 16 +
...istributedAckRegionCompressionDUnitTest.java | 21 +-
.../cache30/DistributedAckRegionDUnitTest.java | 21 +-
.../DistributedAckRegionOffHeapDUnitTest.java | 16 +
.../DistributedNoAckRegionCCEDUnitTest.java | 23 +-
...stributedNoAckRegionCCEOffHeapDUnitTest.java | 16 +
...tributedNoAckRegionCompressionDUnitTest.java | 21 +-
.../DistributedNoAckRegionDUnitTest.java | 21 +-
.../DistributedNoAckRegionOffHeapDUnitTest.java | 16 +
.../gemfire/cache30/DynamicRegionDUnitTest.java | 21 +-
.../gemfire/cache30/GlobalLockingDUnitTest.java | 21 +-
.../cache30/GlobalRegionCCEDUnitTest.java | 22 +-
.../GlobalRegionCCEOffHeapDUnitTest.java | 16 +
.../GlobalRegionCompressionDUnitTest.java | 21 +-
.../gemfire/cache30/GlobalRegionDUnitTest.java | 21 +-
.../cache30/GlobalRegionOffHeapDUnitTest.java | 16 +
.../cache30/LRUEvictionControllerDUnitTest.java | 21 +-
.../gemfire/cache30/LocalRegionDUnitTest.java | 21 +-
.../MemLRUEvictionControllerDUnitTest.java | 21 +-
.../gemfire/cache30/MultiVMRegionTestCase.java | 120 +-
.../gemfire/cache30/MyGatewayEventFilter1.java | 21 +-
.../gemfire/cache30/MyGatewayEventFilter2.java | 23 +-
.../cache30/MyGatewayTransportFilter1.java | 21 +-
.../cache30/MyGatewayTransportFilter2.java | 21 +-
.../OffHeapLRUEvictionControllerDUnitTest.java | 21 +-
.../PRBucketSynchronizationDUnitTest.java | 21 +-
.../PartitionedRegionCompressionDUnitTest.java | 21 +-
.../cache30/PartitionedRegionDUnitTest.java | 21 +-
...tionedRegionMembershipListenerDUnitTest.java | 22 +-
.../PartitionedRegionOffHeapDUnitTest.java | 16 +
.../cache30/PreloadedRegionTestCase.java | 21 +-
.../gemfire/cache30/ProxyDUnitTest.java | 21 +-
.../cache30/PutAllCallBkRemoteVMDUnitTest.java | 22 +-
.../cache30/PutAllCallBkSingleVMDUnitTest.java | 22 +-
.../gemfire/cache30/PutAllMultiVmDUnitTest.java | 22 +-
.../gemfire/cache30/QueueMsgDUnitTest.java | 21 +-
.../cache30/RRSynchronizationDUnitTest.java | 21 +-
.../gemfire/cache30/ReconnectDUnitTest.java | 21 +-
.../ReconnectedCacheServerDUnitTest.java | 21 +-
.../cache30/RegionAttributesTestCase.java | 21 +-
.../cache30/RegionExpirationDUnitTest.java | 21 +-
.../RegionMembershipListenerDUnitTest.java | 21 +-
.../RegionReliabilityDistAckDUnitTest.java | 21 +-
.../RegionReliabilityDistNoAckDUnitTest.java | 21 +-
.../RegionReliabilityGlobalDUnitTest.java | 21 +-
.../RegionReliabilityListenerDUnitTest.java | 21 +-
.../cache30/RegionReliabilityTestCase.java | 105 +-
.../gemfire/cache30/RegionTestCase.java | 51 +-
.../gemfire/cache30/ReliabilityTestCase.java | 21 +-
.../cache30/RemoveAllMultiVmDUnitTest.java | 22 +-
.../gemfire/cache30/RequiredRolesDUnitTest.java | 21 +-
.../cache30/RolePerformanceDUnitTest.java | 21 +-
.../gemfire/cache30/SearchAndLoadDUnitTest.java | 21 +-
.../cache30/SlowRecDUnitDisabledTest.java | 21 +-
.../gemfire/cache30/TXDistributedDUnitTest.java | 21 +-
.../gemfire/cache30/TXOrderDUnitTest.java | 21 +-
.../cache30/TXRestrictionsDUnitTest.java | 21 +-
.../gemfire/cache30/TestCacheCallback.java | 21 +-
.../gemfire/cache30/TestCacheListener.java | 21 +-
.../gemfire/cache30/TestCacheLoader.java | 21 +-
.../gemfire/cache30/TestCacheWriter.java | 21 +-
.../gemfire/cache30/TestDiskRegion.java | 21 +-
.../gemstone/gemfire/cache30/TestHeapLRU.java | 21 +-
.../gemfire/cache30/TestPdxSerializer.java | 21 +-
.../cache30/TestTransactionListener.java | 21 +-
.../gemfire/cache30/TestTransactionWriter.java | 21 +-
.../AnalyzeSerializablesJUnitTest.java | 47 +-
.../codeAnalysis/ClassAndMethodDetails.java | 23 +-
.../gemfire/codeAnalysis/ClassAndMethods.java | 23 +-
.../codeAnalysis/ClassAndVariableDetails.java | 23 +-
.../gemfire/codeAnalysis/ClassAndVariables.java | 23 +-
.../codeAnalysis/CompiledClassUtils.java | 23 +-
.../codeAnalysis/decode/CompiledAttribute.java | 21 +-
.../codeAnalysis/decode/CompiledClass.java | 21 +-
.../codeAnalysis/decode/CompiledCode.java | 21 +-
.../codeAnalysis/decode/CompiledField.java | 21 +-
.../codeAnalysis/decode/CompiledMethod.java | 21 +-
.../gemfire/codeAnalysis/decode/cp/Cp.java | 21 +-
.../gemfire/codeAnalysis/decode/cp/CpClass.java | 21 +-
.../codeAnalysis/decode/cp/CpDouble.java | 21 +-
.../codeAnalysis/decode/cp/CpFieldref.java | 18 +-
.../gemfire/codeAnalysis/decode/cp/CpFloat.java | 18 +-
.../codeAnalysis/decode/cp/CpInteger.java | 18 +-
.../decode/cp/CpInterfaceMethodref.java | 18 +-
.../gemfire/codeAnalysis/decode/cp/CpLong.java | 21 +-
.../codeAnalysis/decode/cp/CpMethodref.java | 18 +-
.../codeAnalysis/decode/cp/CpNameAndType.java | 18 +-
.../codeAnalysis/decode/cp/CpString.java | 18 +-
.../gemfire/codeAnalysis/decode/cp/CpUtf8.java | 21 +-
.../distributed/AbstractLauncherJUnitTest.java | 20 +-
.../AbstractLauncherJUnitTestCase.java | 16 +
.../AbstractLauncherServiceStatusJUnitTest.java | 21 +-
.../AbstractLocatorLauncherJUnitTestCase.java | 16 +
.../AbstractServerLauncherJUnitTestCase.java | 16 +
.../gemfire/distributed/AuthInitializer.java | 23 +-
.../distributed/CommonLauncherTestSuite.java | 20 +-
.../distributed/DistributedMemberDUnitTest.java | 21 +-
.../DistributedSystemConnectPerf.java | 21 +-
.../distributed/DistributedSystemDUnitTest.java | 21 +-
.../distributed/DistributedTestSuite.java | 16 +
.../distributed/HostedLocatorsDUnitTest.java | 16 +
.../gemfire/distributed/JGroupsJUnitTest.java | 21 +-
.../LauncherMemberMXBeanJUnitTest.java | 16 +
.../gemfire/distributed/LauncherTestSuite.java | 16 +
.../gemfire/distributed/LocatorDUnitTest.java | 21 +-
.../gemfire/distributed/LocatorJUnitTest.java | 21 +-
.../distributed/LocatorLauncherJUnitTest.java | 45 +-
.../LocatorLauncherLocalFileJUnitTest.java | 16 +
.../LocatorLauncherLocalJUnitTest.java | 108 +-
.../LocatorLauncherRemoteFileJUnitTest.java | 20 +-
.../LocatorLauncherRemoteJUnitTest.java | 20 +-
.../gemfire/distributed/MyAuthenticator.java | 23 +-
.../gemfire/distributed/MyPrincipal.java | 18 +-
.../gemfire/distributed/RoleDUnitTest.java | 21 +-
.../distributed/ServerLauncherJUnitTest.java | 78 +-
.../ServerLauncherLocalFileJUnitTest.java | 20 +-
.../ServerLauncherLocalJUnitTest.java | 136 +-
.../ServerLauncherRemoteFileJUnitTest.java | 16 +
.../ServerLauncherRemoteJUnitTest.java | 32 +-
.../ServerLauncherWithSpringJUnitTest.java | 16 +
.../distributed/SystemAdminDUnitTest.java | 21 +-
.../AtomicLongWithTerminalStateJUnitTest.java | 21 +-
.../distributed/internal/Bug40751DUnitTest.java | 21 +-
.../ConsoleDistributionManagerDUnitTest.java | 21 +-
.../distributed/internal/DateMessage.java | 21 +-
.../internal/DistributionAdvisorDUnitTest.java | 21 +-
.../internal/DistributionManagerDUnitTest.java | 21 +-
...istributionManagerTimeDUnitDisabledTest.java | 21 +-
.../GemFireTimeSyncServiceDUnitTest.java | 21 +-
.../InternalDistributedSystemJUnitTest.java | 45 +-
.../gemfire/distributed/internal/LDM.java | 21 +-
.../internal/LocalDistributionManagerTest.java | 21 +-
.../internal/LocatorLoadSnapshotJUnitTest.java | 21 +-
.../internal/ProduceDateMessages.java | 21 +-
.../internal/ProductUseLogDUnitTest.java | 21 +-
.../internal/ProductUseLogJUnitTest.java | 21 +-
.../internal/ServerLocatorJUnitTest.java | 20 +-
.../internal/SharedConfigurationJUnitTest.java | 21 +-
.../internal/StartupMessageDataJUnitTest.java | 21 +-
.../deadlock/DeadlockDetectorJUnitTest.java | 21 +-
.../deadlock/DependencyGraphJUnitTest.java | 21 +-
.../GemFireDeadlockDetectorDUnitTest.java | 70 +-
.../deadlock/UnsafeThreadLocalJUnitTest.java | 21 +-
.../locks/CollaborationJUnitDisabledTest.java | 21 +-
.../internal/locks/DLockGrantorHelper.java | 21 +-
...entrantReadWriteWriteShareLockJUnitTest.java | 21 +-
.../membership/MembershipJUnitTest.java | 21 +-
.../jgroup/MembershipManagerHelper.java | 21 +-
.../StreamingOperationManyDUnitTest.java | 29 +-
.../StreamingOperationOneDUnitTest.java | 29 +-
.../tcpserver/LocatorVersioningJUnitTest.java | 17 +-
...cpServerBackwardCompatDUnitDisabledTest.java | 17 +-
.../tcpserver/TcpServerJUnitDisabledTest.java | 16 +
.../support/DistributedSystemAdapter.java | 21 +-
.../gemfire/disttx/CacheMapDistTXDUnitTest.java | 16 +
.../gemfire/disttx/DistTXDebugDUnitTest.java | 29 +-
.../disttx/DistTXDistributedTestSuite.java | 16 +
.../gemfire/disttx/DistTXExpiryJUnitTest.java | 16 +
.../gemfire/disttx/DistTXJUnitTest.java | 16 +
.../disttx/DistTXManagerImplJUnitTest.java | 16 +
.../gemfire/disttx/DistTXOrderDUnitTest.java | 16 +
.../disttx/DistTXPersistentDebugDUnitTest.java | 19 +-
.../DistTXReleasesOffHeapOnCloseJUnitTest.java | 16 +
.../disttx/DistTXRestrictionsDUnitTest.java | 16 +
.../disttx/DistTXWithDeltaDUnitTest.java | 16 +
.../gemfire/disttx/DistTXWriterJUnitTest.java | 16 +
.../disttx/DistTXWriterOOMEJUnitTest.java | 16 +
.../disttx/DistributedTransactionDUnitTest.java | 18 +-
.../gemfire/disttx/PRDistTXDUnitTest.java | 16 +
.../gemfire/disttx/PRDistTXJUnitTest.java | 16 +
.../disttx/PRDistTXWithVersionsDUnitTest.java | 16 +
...entPartitionedRegionWithDistTXDUnitTest.java | 16 +
.../gemfire/internal/ArrayEqualsJUnitTest.java | 21 +-
.../gemfire/internal/AvailablePortHelper.java | 21 +-
.../internal/AvailablePortJUnitTest.java | 21 +-
...wardCompatibilitySerializationJUnitTest.java | 21 +-
.../gemfire/internal/Bug49856JUnitTest.java | 21 +-
.../gemfire/internal/Bug51616JUnitTest.java | 16 +
.../gemfire/internal/ByteArrayData.java | 21 +-
.../gemstone/gemfire/internal/ClassBuilder.java | 21 +-
.../ClassNotFoundExceptionDUnitTest.java | 21 +-
.../internal/ClassPathLoaderJUnitTest.java | 21 +-
.../internal/CopyOnWriteHashSetJUnitTest.java | 21 +-
.../internal/DataSerializableJUnitTest.java | 21 +-
.../gemstone/gemfire/internal/FDDUnitTest.java | 23 +-
.../gemfire/internal/FileUtilJUnitTest.java | 21 +-
.../internal/GemFireStatSamplerJUnitTest.java | 21 +-
.../GemFireVersionIntegrationJUnitTest.java | 21 +-
.../internal/GemFireVersionJUnitTest.java | 21 +-
.../internal/HeapDataOutputStreamJUnitTest.java | 21 +-
.../gemfire/internal/InlineKeyJUnitTest.java | 21 +-
.../gemfire/internal/JSSESocketJUnitTest.java | 21 +-
.../internal/JarClassLoaderJUnitTest.java | 22 +-
.../gemfire/internal/JarDeployerDUnitTest.java | 22 +-
.../com/gemstone/gemfire/internal/JavaExec.java | 21 +-
.../gemfire/internal/LineWrapUnitJUnitTest.java | 21 +-
.../gemstone/gemfire/internal/LongBuffer.java | 21 +-
.../gemfire/internal/NanoTimerJUnitTest.java | 21 +-
.../gemfire/internal/ObjIdMapJUnitTest.java | 21 +-
.../internal/OneTaskOnlyDecoratorJUnitTest.java | 21 +-
.../internal/PdxDeleteFieldDUnitTest.java | 16 +
.../internal/PdxDeleteFieldJUnitTest.java | 16 +
.../gemfire/internal/PdxRenameDUnitTest.java | 16 +
.../gemfire/internal/PdxRenameJUnitTest.java | 16 +
.../PutAllOperationContextJUnitTest.java | 21 +-
.../internal/SSLConfigIntegrationJUnitTest.java | 16 +
.../gemfire/internal/SSLConfigJUnitTest.java | 20 +-
...hreadPoolExecutorWithKeepAliveJUnitTest.java | 21 +-
.../internal/SimpleStatSamplerJUnitTest.java | 21 +-
.../gemfire/internal/SocketCloserJUnitTest.java | 16 +
.../internal/SocketCloserWithWaitJUnitTest.java | 16 +
.../StatArchiveWriterReaderJUnitTest.java | 21 +-
.../gemfire/internal/StatSamplerJUnitTest.java | 21 +-
.../gemfire/internal/StatSamplerTestCase.java | 21 +-
.../internal/UniqueIdGeneratorJUnitTest.java | 21 +-
.../internal/cache/AbstractRegionJUnitTest.java | 21 +-
.../gemfire/internal/cache/BackupDUnitTest.java | 21 +-
.../gemfire/internal/cache/BackupJUnitTest.java | 21 +-
.../internal/cache/Bug33359DUnitTest.java | 21 +-
.../internal/cache/Bug33726DUnitTest.java | 21 +-
.../internal/cache/Bug33726JUnitTest.java | 21 +-
.../Bug34179TooManyFilesOpenJUnitTest.java | 21 +-
.../internal/cache/Bug34583JUnitTest.java | 21 +-
.../internal/cache/Bug37241DUnitTest.java | 21 +-
.../internal/cache/Bug37244JUnitTest.java | 21 +-
.../internal/cache/Bug37377DUnitTest.java | 21 +-
.../internal/cache/Bug37500JUnitTest.java | 21 +-
.../internal/cache/Bug39079DUnitTest.java | 21 +-
.../internal/cache/Bug40299DUnitTest.java | 21 +-
.../internal/cache/Bug40632DUnitTest.java | 21 +-
.../internal/cache/Bug41091DUnitTest.java | 21 +-
.../internal/cache/Bug41733DUnitTest.java | 21 +-
.../internal/cache/Bug41957DUnitTest.java | 21 +-
.../internal/cache/Bug42010StatsDUnitTest.java | 21 +-
.../internal/cache/Bug42055DUnitTest.java | 21 +-
.../internal/cache/Bug45164DUnitTest.java | 21 +-
.../internal/cache/Bug45934DUnitTest.java | 21 +-
.../internal/cache/Bug47667DUnitTest.java | 21 +-
.../internal/cache/Bug48182JUnitTest.java | 16 +
.../internal/cache/CacheAdvisorDUnitTest.java | 21 +-
.../cache/CacheLifecycleListenerJUnitTest.java | 21 +-
.../cache/ChunkValueWrapperJUnitTest.java | 16 +
.../internal/cache/ClearDAckDUnitTest.java | 21 +-
.../internal/cache/ClearGlobalDUnitTest.java | 21 +-
...ssagesRegionCreationAndDestroyJUnitTest.java | 21 +-
.../cache/ClientServerGetAllDUnitTest.java | 21 +-
...ServerInvalidAndDestroyedEntryDUnitTest.java | 21 +-
.../ClientServerTransactionCCEDUnitTest.java | 21 +-
.../cache/ClientServerTransactionDUnitTest.java | 43 +-
.../cache/ComplexDiskRegionJUnitTest.java | 21 +-
.../ConcurrentDestroySubRegionDUnitTest.java | 21 +-
...entFlushingAndRegionOperationsJUnitTest.java | 21 +-
.../cache/ConcurrentMapLocalJUnitTest.java | 21 +-
.../cache/ConcurrentMapOpsDUnitTest.java | 21 +-
.../ConcurrentRegionOperationsJUnitTest.java | 21 +-
...rentRollingAndRegionOperationsJUnitTest.java | 21 +-
.../internal/cache/ConflationJUnitTest.java | 21 +-
.../cache/ConnectDisconnectDUnitTest.java | 16 +
.../cache/CustomerIDPartitionResolver.java | 21 +-
.../internal/cache/DeltaFaultInDUnitTest.java | 21 +-
.../cache/DeltaPropagationDUnitTest.java | 21 +-
.../cache/DeltaPropagationStatsDUnitTest.java | 21 +-
.../internal/cache/DeltaSizingDUnitTest.java | 21 +-
.../gemfire/internal/cache/DiskIFJUnitTest.java | 21 +-
.../gemfire/internal/cache/DiskIdJUnitTest.java | 21 +-
.../internal/cache/DiskInitFileJUnitTest.java | 21 +-
.../cache/DiskOfflineCompactionJUnitTest.java | 21 +-
.../internal/cache/DiskOldAPIsJUnitTest.java | 21 +-
...iskRandomOperationsAndRecoveryJUnitTest.java | 21 +-
.../cache/DiskRegByteArrayDUnitTest.java | 21 +-
.../cache/DiskRegCacheXmlJUnitTest.java | 21 +-
.../DiskRegCachexmlGeneratorJUnitTest.java | 21 +-
.../internal/cache/DiskRegCbkChkJUnitTest.java | 21 +-
.../DiskRegOplogSwtchingAndRollerJUnitTest.java | 21 +-
.../cache/DiskRegRecoveryJUnitTest.java | 21 +-
.../cache/DiskRegionAsyncRecoveryJUnitTest.java | 21 +-
...RegionChangingRegionAttributesJUnitTest.java | 21 +-
.../cache/DiskRegionClearJUnitTest.java | 21 +-
.../internal/cache/DiskRegionHelperFactory.java | 21 +-
.../DiskRegionIllegalArguementsJUnitTest.java | 21 +-
...iskRegionIllegalCacheXMLvaluesJUnitTest.java | 21 +-
.../internal/cache/DiskRegionJUnitTest.java | 21 +-
.../internal/cache/DiskRegionProperties.java | 21 +-
.../internal/cache/DiskRegionTestingBase.java | 21 +-
.../cache/DiskStoreFactoryJUnitTest.java | 21 +-
.../cache/DiskWriteAttributesJUnitTest.java | 21 +-
...DistrbutedRegionProfileOffHeapDUnitTest.java | 16 +
.../cache/DistributedCacheTestCase.java | 21 +-
.../cache/EnumListenerEventJUnitTest.java | 21 +-
.../internal/cache/EventTrackerDUnitTest.java | 21 +-
.../cache/EvictionDUnitDisabledTest.java | 21 +-
.../cache/EvictionObjectSizerDUnitTest.java | 21 +-
.../internal/cache/EvictionStatsDUnitTest.java | 21 +-
.../internal/cache/EvictionTestBase.java | 21 +-
.../internal/cache/FaultingInJUnitTest.java | 21 +-
.../cache/FixedPRSinglehopDUnitTest.java | 21 +-
.../internal/cache/GIIDeltaDUnitTest.java | 23 +-
.../internal/cache/GIIFlowControlDUnitTest.java | 21 +-
.../internal/cache/GridAdvisorDUnitTest.java | 21 +-
.../internal/cache/HABug36773DUnitTest.java | 21 +-
.../HAOverflowMemObjectSizerDUnitTest.java | 21 +-
.../HDFSQueueRegionOperationsJUnitTest.java | 33 -
...FSQueueRegionOperationsOffHeapJUnitTest.java | 54 -
.../cache/HDFSRegionOperationsJUnitTest.java | 542 ------
.../HDFSRegionOperationsOffHeapJUnitTest.java | 78 -
.../cache/IncrementalBackupDUnitTest.java | 21 +-
.../cache/InterruptClientServerDUnitTest.java | 21 +-
.../internal/cache/InterruptDiskJUnitTest.java | 21 +-
...InterruptsConserveSocketsFalseDUnitTest.java | 16 +
.../internal/cache/InterruptsDUnitTest.java | 21 +-
.../internal/cache/IteratorDUnitTest.java | 21 +-
.../LIFOEvictionAlgoEnabledRegionJUnitTest.java | 21 +-
...victionAlgoMemoryEnabledRegionJUnitTest.java | 21 +-
.../internal/cache/MapClearGIIDUnitTest.java | 21 +-
.../internal/cache/MapInterface2JUnitTest.java | 21 +-
.../internal/cache/MapInterfaceJUnitTest.java | 21 +-
.../MultipleOplogsRollingFeatureJUnitTest.java | 21 +-
.../cache/NetSearchMessagingDUnitTest.java | 51 +-
.../cache/OffHeapEvictionDUnitTest.java | 23 +-
.../cache/OffHeapEvictionStatsDUnitTest.java | 21 +-
.../gemfire/internal/cache/OffHeapTestUtil.java | 21 +-
.../cache/OfflineSnapshotJUnitTest.java | 21 +-
.../gemfire/internal/cache/OldVLJUnitTest.java | 21 +-
.../cache/OldValueImporterTestBase.java | 16 +
.../cache/OplogEntryIdMapJUnitTest.java | 21 +-
.../cache/OplogEntryIdSetJUnitTest.java | 21 +-
.../gemfire/internal/cache/OplogJUnitTest.java | 67 +-
.../internal/cache/OplogRVVJUnitTest.java | 21 +-
.../cache/OrderedTombstoneMapJUnitTest.java | 21 +-
.../cache/P2PDeltaPropagationDUnitTest.java | 21 +-
.../internal/cache/PRBadToDataDUnitTest.java | 21 +-
.../cache/PRConcurrentMapOpsJUnitTest.java | 21 +-
.../cache/PRDataStoreMemoryJUnitTest.java | 21 +-
.../PRDataStoreMemoryOffHeapJUnitTest.java | 16 +
.../gemfire/internal/cache/PRTXJUnitTest.java | 21 +-
.../cache/PartitionAttributesImplJUnitTest.java | 16 +
.../cache/PartitionListenerDUnitTest.java | 21 +-
...dRegionAPIConserveSocketsFalseDUnitTest.java | 21 +-
.../cache/PartitionedRegionAPIDUnitTest.java | 20 +-
.../PartitionedRegionAsSubRegionDUnitTest.java | 20 +-
...gionBucketCreationDistributionDUnitTest.java | 20 +-
.../PartitionedRegionCacheCloseDUnitTest.java | 20 +-
...rtitionedRegionCacheLoaderForRootRegion.java | 21 +-
...artitionedRegionCacheLoaderForSubRegion.java | 21 +-
...rtitionedRegionCacheXMLExampleDUnitTest.java | 21 +-
.../PartitionedRegionCreationDUnitTest.java | 20 +-
.../PartitionedRegionCreationJUnitTest.java | 20 +-
.../cache/PartitionedRegionDUnitTestCase.java | 20 +-
.../PartitionedRegionDataStoreJUnitTest.java | 20 +-
...rtitionedRegionDelayedRecoveryDUnitTest.java | 21 +-
.../PartitionedRegionDestroyDUnitTest.java | 20 +-
.../PartitionedRegionEntryCountDUnitTest.java | 21 +-
.../PartitionedRegionEvictionDUnitTest.java | 21 +-
.../cache/PartitionedRegionHADUnitTest.java | 20 +-
...onedRegionHAFailureAndRecoveryDUnitTest.java | 20 +-
.../cache/PartitionedRegionHelperJUnitTest.java | 21 +-
.../PartitionedRegionInvalidateDUnitTest.java | 21 +-
...artitionedRegionLocalMaxMemoryDUnitTest.java | 20 +-
...nedRegionLocalMaxMemoryOffHeapDUnitTest.java | 16 +
.../PartitionedRegionMultipleDUnitTest.java | 20 +-
...rtitionedRegionOffHeapEvictionDUnitTest.java | 22 +-
.../cache/PartitionedRegionPRIDDUnitTest.java | 21 +-
.../cache/PartitionedRegionQueryDUnitTest.java | 21 +-
...artitionedRegionQueryEvaluatorJUnitTest.java | 21 +-
...artitionedRegionRedundancyZoneDUnitTest.java | 25 +-
...tionedRegionSerializableObjectJUnitTest.java | 21 +-
.../PartitionedRegionSingleHopDUnitTest.java | 80 +-
...RegionSingleHopWithServerGroupDUnitTest.java | 21 +-
...onedRegionSingleNodeOperationsJUnitTest.java | 20 +-
.../cache/PartitionedRegionSizeDUnitTest.java | 20 +-
.../cache/PartitionedRegionStatsDUnitTest.java | 20 +-
.../cache/PartitionedRegionStatsJUnitTest.java | 21 +-
.../cache/PartitionedRegionTestHelper.java | 20 +-
.../PartitionedRegionTestUtilsDUnitTest.java | 20 +-
.../PartitionedRegionWithSameNameDUnitTest.java | 21 +-
.../PersistentPartitionedRegionJUnitTest.java | 16 +
.../internal/cache/PutAllDAckDUnitTest.java | 21 +-
.../internal/cache/PutAllGlobalDUnitTest.java | 21 +-
.../cache/RegionEntryFlagsJUnitTest.java | 21 +-
.../cache/RemotePutReplyMessageJUnitTest.java | 16 +
.../cache/RemoteTransactionCCEDUnitTest.java | 16 +
.../cache/RemoteTransactionDUnitTest.java | 27 +-
.../internal/cache/RemoveAllDAckDUnitTest.java | 21 +-
.../internal/cache/RemoveDAckDUnitTest.java | 21 +-
.../internal/cache/RemoveGlobalDUnitTest.java | 21 +-
.../internal/cache/RunCacheInOldGemfire.java | 21 +-
.../cache/SimpleDiskRegionJUnitTest.java | 21 +-
.../internal/cache/SizingFlagDUnitTest.java | 21 +-
.../internal/cache/SnapshotTestUtil.java | 16 +
.../internal/cache/SystemFailureDUnitTest.java | 21 +-
.../internal/cache/TXManagerImplJUnitTest.java | 21 +-
.../cache/TXReservationMgrJUnitTest.java | 21 +-
.../gemfire/internal/cache/TestDelta.java | 21 +-
.../internal/cache/TestHelperForHydraTests.java | 16 +
.../internal/cache/TestNonSizerObject.java | 21 +-
.../internal/cache/TestObjectSizerImpl.java | 21 +-
.../gemfire/internal/cache/TestUtils.java | 21 +-
.../cache/TombstoneCreationJUnitTest.java | 21 +-
.../cache/TransactionsWithDeltaDUnitTest.java | 21 +-
.../internal/cache/UnitTestValueHolder.java | 18 +-
.../gemfire/internal/cache/UnzipUtil.java | 21 +-
.../internal/cache/UpdateVersionJUnitTest.java | 21 +-
.../gemfire/internal/cache/VLJUnitTest.java | 21 +-
.../cache/control/FilterByPathJUnitTest.java | 21 +-
.../cache/control/MemoryMonitorJUnitTest.java | 21 +-
.../control/MemoryMonitorOffHeapJUnitTest.java | 23 +-
.../control/MemoryThresholdsJUnitTest.java | 16 +
.../control/RebalanceOperationDUnitTest.java | 58 +-
.../control/TestMemoryThresholdListener.java | 21 +-
...skRegOverflowAsyncGetInMemPerfJUnitTest.java | 21 +-
...iskRegOverflowAsyncJUnitPerformanceTest.java | 21 +-
...lowSyncGetInMemPerfJUnitPerformanceTest.java | 21 +-
...DiskRegOverflowSyncJUnitPerformanceTest.java | 21 +-
...egionOverflowAsyncRollingOpLogJUnitTest.java | 21 +-
...RegionOverflowSyncRollingOpLogJUnitTest.java | 21 +-
.../DiskRegionPerfJUnitPerformanceTest.java | 21 +-
.../DiskRegionPersistOnlySyncJUnitTest.java | 21 +-
...DiskRegionRollOpLogJUnitPerformanceTest.java | 21 +-
...ltiThreadedOplogPerJUnitPerformanceTest.java | 21 +-
.../cache/execute/Bug51193DUnitTest.java | 16 +
.../ClientServerFunctionExecutionDUnitTest.java | 21 +-
.../execute/ColocationFailoverDUnitTest.java | 21 +-
.../cache/execute/CustomResultCollector.java | 21 +-
.../execute/CustomerIDPartitionResolver.java | 21 +-
...ributedRegionFunctionExecutionDUnitTest.java | 21 +-
.../FunctionExecution_ExceptionDUnitTest.java | 21 +-
.../execute/FunctionServiceStatsDUnitTest.java | 64 +-
.../cache/execute/LocalDataSetDUnitTest.java | 21 +-
.../cache/execute/LocalDataSetFunction.java | 21 +-
.../execute/LocalDataSetIndexingDUnitTest.java | 21 +-
.../LocalFunctionExecutionDUnitTest.java | 21 +-
.../MemberFunctionExecutionDUnitTest.java | 21 +-
.../MultiRegionFunctionExecutionDUnitTest.java | 21 +-
.../execute/MyFunctionExecutionException.java | 21 +-
.../cache/execute/MyTransactionFunction.java | 21 +-
.../OnGroupsFunctionExecutionDUnitTest.java | 51 +-
...ntServerFunctionExecutionNoAckDUnitTest.java | 21 +-
...tServerRegionFunctionExecutionDUnitTest.java | 21 +-
...egionFunctionExecutionFailoverDUnitTest.java | 21 +-
...onFunctionExecutionNoSingleHopDUnitTest.java | 21 +-
...onExecutionSelectorNoSingleHopDUnitTest.java | 21 +-
...gionFunctionExecutionSingleHopDUnitTest.java | 23 +-
.../cache/execute/PRClientServerTestBase.java | 21 +-
.../cache/execute/PRColocationDUnitTest.java | 21 +-
.../execute/PRCustomPartitioningDUnitTest.java | 21 +-
.../execute/PRFunctionExecutionDUnitTest.java | 21 +-
.../PRFunctionExecutionTimeOutDUnitTest.java | 21 +-
...ctionExecutionWithResultSenderDUnitTest.java | 21 +-
.../execute/PRPerformanceTestDUnitTest.java | 21 +-
.../cache/execute/PRTransactionDUnitTest.java | 21 +-
.../PRTransactionWithVersionsDUnitTest.java | 16 +
.../internal/cache/execute/PerfFunction.java | 21 +-
.../internal/cache/execute/PerfTxFunction.java | 21 +-
.../cache/execute/PerformanceTestFunction.java | 21 +-
.../execute/SingleHopGetAllPutAllDUnitTest.java | 21 +-
.../internal/cache/execute/TestFunction.java | 21 +-
.../internal/cache/execute/data/CustId.java | 21 +-
.../internal/cache/execute/data/Customer.java | 21 +-
.../internal/cache/execute/data/Order.java | 21 +-
.../internal/cache/execute/data/OrderId.java | 21 +-
.../internal/cache/execute/data/Shipment.java | 21 +-
.../internal/cache/execute/data/ShipmentId.java | 21 +-
.../SimpleExtensionPointJUnitTest.java | 21 +-
.../extension/mock/AbstractMockExtension.java | 21 +-
.../mock/AbstractMockExtensionXmlGenerator.java | 21 +-
.../mock/AlterMockCacheExtensionFunction.java | 21 +-
.../mock/AlterMockRegionExtensionFunction.java | 21 +-
.../mock/CreateMockCacheExtensionFunction.java | 21 +-
.../mock/CreateMockRegionExtensionFunction.java | 21 +-
.../mock/DestroyMockCacheExtensionFunction.java | 21 +-
.../DestroyMockRegionExtensionFunction.java | 21 +-
.../extension/mock/MockCacheExtension.java | 21 +-
.../mock/MockCacheExtensionXmlGenerator.java | 21 +-
.../extension/mock/MockExtensionCommands.java | 21 +-
.../extension/mock/MockExtensionXmlParser.java | 21 +-
.../extension/mock/MockRegionExtension.java | 21 +-
.../mock/MockRegionExtensionXmlGenerator.java | 21 +-
...gionFunctionFunctionInvocationException.java | 21 +-
.../functions/DistributedRegionFunction.java | 21 +-
.../cache/functions/LocalDataSetFunction.java | 21 +-
.../internal/cache/functions/TestFunction.java | 21 +-
.../ha/BlockingHARQAddOperationJUnitTest.java | 21 +-
.../cache/ha/BlockingHARQStatsJUnitTest.java | 21 +-
.../cache/ha/BlockingHARegionJUnitTest.java | 21 +-
.../ha/BlockingHARegionQueueJUnitTest.java | 21 +-
.../cache/ha/Bug36853EventsExpiryDUnitTest.java | 21 +-
.../internal/cache/ha/Bug48571DUnitTest.java | 21 +-
.../internal/cache/ha/Bug48879DUnitTest.java | 16 +
.../internal/cache/ha/ConflatableObject.java | 21 +-
.../cache/ha/EventIdOptimizationDUnitTest.java | 21 +-
.../cache/ha/EventIdOptimizationJUnitTest.java | 20 +-
.../internal/cache/ha/FailoverDUnitTest.java | 21 +-
.../internal/cache/ha/HABugInPutDUnitTest.java | 21 +-
.../internal/cache/ha/HAClearDUnitTest.java | 21 +-
.../cache/ha/HAConflationDUnitTest.java | 21 +-
.../internal/cache/ha/HADuplicateDUnitTest.java | 21 +-
.../cache/ha/HAEventIdPropagationDUnitTest.java | 21 +-
.../internal/cache/ha/HAExpiryDUnitTest.java | 21 +-
.../internal/cache/ha/HAGIIBugDUnitTest.java | 21 +-
.../internal/cache/ha/HAGIIDUnitTest.java | 25 +-
.../gemfire/internal/cache/ha/HAHelper.java | 21 +-
.../cache/ha/HARQAddOperationJUnitTest.java | 21 +-
.../cache/ha/HARQueueNewImplDUnitTest.java | 21 +-
.../internal/cache/ha/HARegionDUnitTest.java | 21 +-
.../internal/cache/ha/HARegionJUnitTest.java | 20 +-
.../cache/ha/HARegionQueueDUnitTest.java | 21 +-
.../cache/ha/HARegionQueueJUnitTest.java | 20 +-
...HARegionQueueStartStopJUnitDisabledTest.java | 21 +-
.../ha/HARegionQueueStartStopJUnitTest.java | 21 +-
.../cache/ha/HARegionQueueStatsJUnitTest.java | 20 +-
.../cache/ha/HASlowReceiverDUnitTest.java | 21 +-
.../ha/OperationsPropagationDUnitTest.java | 21 +-
.../internal/cache/ha/PutAllDUnitTest.java | 21 +-
.../cache/ha/StatsBugDUnitDisabledTest.java | 21 +-
.../cache/ha/TestBlockingHARegionQueue.java | 21 +-
.../cache/ha/ThreadIdentifierJUnitTest.java | 21 +-
.../cache/locks/TXLockServiceDUnitTest.java | 21 +-
.../internal/cache/lru/LRUClockJUnitTest.java | 21 +-
.../cache/partitioned/Bug39356DUnitTest.java | 21 +-
.../cache/partitioned/Bug43684DUnitTest.java | 21 +-
.../cache/partitioned/Bug47388DUnitTest.java | 21 +-
.../cache/partitioned/Bug51400DUnitTest.java | 21 +-
.../partitioned/ElidedPutAllDUnitTest.java | 21 +-
.../OfflineMembersDetailsJUnitTest.java | 21 +-
.../partitioned/PartitionResolverDUnitTest.java | 21 +-
.../PartitionedRegionLoadModelJUnitTest.java | 21 +-
.../PartitionedRegionLoaderWriterDUnitTest.java | 21 +-
...rtitionedRegionMetaDataCleanupDUnitTest.java | 21 +-
.../partitioned/PersistPRKRFDUnitTest.java | 21 +-
...tentColocatedPartitionedRegionDUnitTest.java | 21 +-
.../PersistentPartitionedRegionDUnitTest.java | 27 +-
...tentPartitionedRegionOldConfigDUnitTest.java | 21 +-
.../PersistentPartitionedRegionTestBase.java | 21 +-
...rtitionedRegionWithTransactionDUnitTest.java | 21 +-
.../PutPutReplyMessageJUnitTest.java | 16 +
.../cache/partitioned/ShutdownAllDUnitTest.java | 21 +-
...treamingPartitionOperationManyDUnitTest.java | 28 +-
...StreamingPartitionOperationOneDUnitTest.java | 29 +-
.../fixed/CustomerFixedPartitionResolver.java | 21 +-
.../fixed/FixedPartitioningDUnitTest.java | 21 +-
.../fixed/FixedPartitioningTestBase.java | 21 +-
...ngWithColocationAndPersistenceDUnitTest.java | 21 +-
.../cache/partitioned/fixed/MyDate1.java | 21 +-
.../cache/partitioned/fixed/MyDate2.java | 21 +-
.../cache/partitioned/fixed/MyDate3.java | 21 +-
.../fixed/QuarterPartitionResolver.java | 21 +-
.../SingleHopQuarterPartitionResolver.java | 21 +-
.../persistence/BackupInspectorJUnitTest.java | 21 +-
.../PersistentRVVRecoveryDUnitTest.java | 21 +-
.../PersistentRecoveryOrderDUnitTest.java | 21 +-
...rsistentRecoveryOrderOldConfigDUnitTest.java | 21 +-
.../PersistentReplicatedTestBase.java | 21 +-
.../TemporaryResultSetFactoryJUnitTest.java | 21 +-
.../cache/persistence/soplog/AppendLog.java | 21 +-
.../ArraySerializedComparatorJUnitTest.java | 21 +-
.../CompactionSortedOplogSetTestCase.java | 21 +-
.../persistence/soplog/CompactionTestCase.java | 21 +-
.../persistence/soplog/ComparisonTestCase.java | 21 +-
.../soplog/IndexComparatorJUnitTest.java | 21 +-
.../LexicographicalComparatorJUnitTest.java | 21 +-
.../soplog/RecoverableSortedOplogSet.java | 21 +-
.../soplog/SizeTieredCompactorJUnitTest.java | 21 +-
.../SizeTieredSortedOplogSetJUnitTest.java | 16 +
.../soplog/SortedBufferJUnitTest.java | 16 +
.../soplog/SortedOplogSetJUnitTest.java | 21 +-
.../soplog/SortedReaderTestCase.java | 21 +-
.../nofile/NoFileSortedOplogJUnitTest.java | 21 +-
.../GFSnapshotJUnitPerformanceTest.java | 21 +-
.../internal/cache/tier/Bug40396DUnitTest.java | 21 +-
.../tier/sockets/AcceptorImplJUnitTest.java | 21 +-
...mpatibilityHigherVersionClientDUnitTest.java | 21 +-
.../cache/tier/sockets/Bug36269DUnitTest.java | 21 +-
.../cache/tier/sockets/Bug36457DUnitTest.java | 21 +-
.../cache/tier/sockets/Bug36805DUnitTest.java | 21 +-
.../cache/tier/sockets/Bug36829DUnitTest.java | 21 +-
.../cache/tier/sockets/Bug36995DUnitTest.java | 23 +-
.../cache/tier/sockets/Bug37210DUnitTest.java | 43 +-
.../cache/tier/sockets/Bug37805DUnitTest.java | 21 +-
.../CacheServerMaxConnectionsJUnitTest.java | 21 +-
...heServerSelectorMaxConnectionsJUnitTest.java | 16 +
.../cache/tier/sockets/CacheServerTestUtil.java | 21 +-
.../CacheServerTransactionsDUnitTest.java | 21 +-
...acheServerTransactionsSelectorDUnitTest.java | 16 +
.../tier/sockets/ClearPropagationDUnitTest.java | 21 +-
.../tier/sockets/ClientConflationDUnitTest.java | 21 +-
.../sockets/ClientHealthMonitorJUnitTest.java | 21 +-
.../ClientHealthMonitorSelectorJUnitTest.java | 16 +
.../sockets/ClientInterestNotifyDUnitTest.java | 21 +-
.../tier/sockets/ClientServerMiscDUnitTest.java | 23 +-
.../ClientServerMiscSelectorDUnitTest.java | 21 +-
.../cache/tier/sockets/ConflationDUnitTest.java | 21 +-
.../tier/sockets/ConnectionProxyJUnitTest.java | 21 +-
.../DataSerializerPropogationDUnitTest.java | 21 +-
.../cache/tier/sockets/DeltaEOFException.java | 21 +-
.../DestroyEntryPropagationDUnitTest.java | 21 +-
.../sockets/DurableClientBug39997DUnitTest.java | 21 +-
.../DurableClientQueueSizeDUnitTest.java | 17 +-
.../DurableClientReconnectAutoDUnitTest.java | 21 +-
.../DurableClientReconnectDUnitTest.java | 21 +-
.../sockets/DurableClientStatsDUnitTest.java | 21 +-
.../sockets/DurableRegistrationDUnitTest.java | 21 +-
.../sockets/DurableResponseMatrixDUnitTest.java | 21 +-
.../sockets/EventIDVerificationDUnitTest.java | 21 +-
.../EventIDVerificationInP2PDUnitTest.java | 20 +-
.../cache/tier/sockets/FaultyDelta.java | 21 +-
.../tier/sockets/FilterProfileJUnitTest.java | 21 +-
.../ForceInvalidateEvictionDUnitTest.java | 21 +-
...ForceInvalidateOffHeapEvictionDUnitTest.java | 21 +-
.../cache/tier/sockets/HABug36738DUnitTest.java | 21 +-
.../cache/tier/sockets/HAInterestBaseTest.java | 21 +-
.../sockets/HAInterestDistributedTestCase.java | 16 +
.../tier/sockets/HAInterestPart1DUnitTest.java | 22 +-
.../tier/sockets/HAInterestPart2DUnitTest.java | 45 +-
.../sockets/HAStartupAndFailoverDUnitTest.java | 21 +-
.../internal/cache/tier/sockets/HaHelper.java | 16 +
.../tier/sockets/InterestListDUnitTest.java | 21 +-
.../sockets/InterestListEndpointDUnitTest.java | 21 +-
.../InterestListEndpointPRDUnitTest.java | 21 +-
.../InterestListEndpointSelectorDUnitTest.java | 16 +
.../sockets/InterestListFailoverDUnitTest.java | 21 +-
.../sockets/InterestListRecoveryDUnitTest.java | 21 +-
.../sockets/InterestRegrListenerDUnitTest.java | 21 +-
.../sockets/InterestResultPolicyDUnitTest.java | 21 +-
.../sockets/NewRegionAttributesDUnitTest.java | 21 +-
.../tier/sockets/ObjectPartListJUnitTest.java | 21 +-
.../tier/sockets/RedundancyLevelJUnitTest.java | 20 +-
.../sockets/RedundancyLevelPart1DUnitTest.java | 21 +-
.../sockets/RedundancyLevelPart2DUnitTest.java | 21 +-
.../sockets/RedundancyLevelPart3DUnitTest.java | 21 +-
.../tier/sockets/RedundancyLevelTestBase.java | 21 +-
.../tier/sockets/RegionCloseDUnitTest.java | 21 +-
...erInterestBeforeRegionCreationDUnitTest.java | 21 +-
.../sockets/RegisterInterestKeysDUnitTest.java | 21 +-
.../RegisterInterestKeysPRDUnitTest.java | 21 +-
.../sockets/ReliableMessagingDUnitTest.java | 21 +-
.../sockets/UnregisterInterestDUnitTest.java | 21 +-
.../sockets/UpdatePropagationDUnitTest.java | 21 +-
.../sockets/UpdatePropagationPRDUnitTest.java | 21 +-
.../VerifyEventIDGenerationInP2PDUnitTest.java | 20 +-
...UpdatesFromNonInterestEndPointDUnitTest.java | 21 +-
.../cache/versions/RVVExceptionJUnitTest.java | 21 +-
.../versions/RegionVersionHolderJUnitTest.java | 21 +-
.../RegionVersionHolderRandomJUnitTest.java | 21 +-
...RegionVersionHolderSmallBitSetJUnitTest.java | 21 +-
.../versions/RegionVersionVectorJUnitTest.java | 21 +-
.../cache/wan/CompressionConstants.java | 21 +-
.../cache/wan/CompressionInputStream.java | 21 +-
.../cache/wan/CompressionOutputStream.java | 21 +-
.../cache/wan/CustomAsyncEventListener.java | 21 +-
.../gemfire/internal/cache/wan/Filter70.java | 21 +-
.../cache/wan/MyAsyncEventListener.java | 21 +-
.../cache/wan/MyAsyncEventListener2.java | 21 +-
.../cache/wan/MyDistributedSystemListener.java | 21 +-
.../cache/wan/MyGatewaySenderEventListener.java | 21 +-
.../wan/MyGatewaySenderEventListener2.java | 21 +-
.../cache/wan/MyGatewayTransportFilter1.java | 21 +-
.../cache/wan/MyGatewayTransportFilter2.java | 21 +-
.../cache/wan/MyGatewayTransportFilter3.java | 21 +-
.../cache/wan/MyGatewayTransportFilter4.java | 21 +-
.../internal/cache/wan/QueueListener.java | 21 +-
.../AsyncEventQueueValidationsJUnitTest.java | 21 +-
.../xmlcache/AbstractXmlParserJUnitTest.java | 21 +-
.../cache/xmlcache/CacheXmlParserJUnitTest.java | 21 +-
.../xmlcache/CacheXmlVersionJUnitTest.java | 17 +-
.../PivotalEntityResolverJUnitTest.java | 21 +-
.../cache/xmlcache/RegionCreationJUnitTest.java | 21 +-
.../xmlcache/XmlGeneratorUtilsJUnitTest.java | 21 +-
.../classpathloaderjunittest/DoesExist.java | 16 +
.../CompressionCacheConfigDUnitTest.java | 21 +-
.../CompressionCacheListenerDUnitTest.java | 21 +-
...ompressionCacheListenerOffHeapDUnitTest.java | 16 +
.../CompressionRegionConfigDUnitTest.java | 22 +-
.../CompressionRegionFactoryDUnitTest.java | 21 +-
.../CompressionRegionOperationsDUnitTest.java | 21 +-
...ressionRegionOperationsOffHeapDUnitTest.java | 16 +
.../compression/CompressionStatsDUnitTest.java | 21 +-
.../compression/SnappyCompressorJUnitTest.java | 23 +-
.../datasource/AbstractPoolCacheJUnitTest.java | 21 +-
.../internal/datasource/CleanUpJUnitTest.java | 21 +-
.../ConnectionPoolCacheImplJUnitTest.java | 21 +-
.../datasource/ConnectionPoolingJUnitTest.java | 21 +-
.../datasource/DataSourceFactoryJUnitTest.java | 21 +-
.../internal/datasource/RestartJUnitTest.java | 21 +-
.../internal/i18n/BasicI18nJUnitTest.java | 21 +-
.../io/CompositeOutputStreamJUnitTest.java | 21 +-
.../gemfire/internal/jndi/ContextJUnitTest.java | 21 +-
.../internal/jta/BlockingTimeOutJUnitTest.java | 21 +-
.../gemfire/internal/jta/CacheUtils.java | 21 +-
.../internal/jta/DataSourceJTAJUnitTest.java | 21 +-
.../internal/jta/ExceptionJUnitTest.java | 21 +-
.../jta/GlobalTransactionJUnitTest.java | 21 +-
.../gemstone/gemfire/internal/jta/JTAUtils.java | 21 +-
.../internal/jta/JtaIntegrationJUnitTest.java | 16 +
.../gemstone/gemfire/internal/jta/SyncImpl.java | 21 +-
.../internal/jta/TransactionImplJUnitTest.java | 21 +-
.../jta/TransactionManagerImplJUnitTest.java | 21 +-
.../jta/TransactionTimeOutJUnitTest.java | 21 +-
.../jta/UserTransactionImplJUnitTest.java | 21 +-
.../internal/jta/dunit/CommitThread.java | 21 +-
.../internal/jta/dunit/ExceptionsDUnitTest.java | 21 +-
.../jta/dunit/IdleTimeOutDUnitTest.java | 21 +-
.../jta/dunit/LoginTimeOutDUnitTest.java | 21 +-
.../jta/dunit/MaxPoolSizeDUnitTest.java | 21 +-
.../internal/jta/dunit/RollbackThread.java | 21 +-
.../jta/dunit/TransactionTimeOutDUnitTest.java | 21 +-
.../dunit/TxnManagerMultiThreadDUnitTest.java | 21 +-
.../internal/jta/dunit/TxnTimeOutDUnitTest.java | 21 +-
.../internal/jta/functional/CacheJUnitTest.java | 21 +-
.../jta/functional/TestXACacheLoader.java | 21 +-
.../internal/lang/ClassUtilsJUnitTest.java | 21 +-
.../internal/lang/InOutParameterJUnitTest.java | 21 +-
.../internal/lang/InitializerJUnitTest.java | 21 +-
.../internal/lang/ObjectUtilsJUnitTest.java | 21 +-
.../internal/lang/StringUtilsJUnitTest.java | 21 +-
.../internal/lang/SystemUtilsJUnitTest.java | 21 +-
.../internal/lang/ThreadUtilsJUnitTest.java | 58 +-
.../DistributedSystemLogFileJUnitTest.java | 16 +
.../logging/LocatorLogFileJUnitTest.java | 16 +
.../logging/LogServiceIntegrationJUnitTest.java | 114 +-
.../LogServiceIntegrationTestSupport.java | 16 +
.../internal/logging/LogServiceJUnitTest.java | 74 +-
.../LogServiceUserDirIntegrationJUnitTest.java | 70 -
.../LogWriterDisabledPerformanceTest.java | 16 +
.../logging/LogWriterImplJUnitTest.java | 16 +
.../logging/LogWriterPerformanceTest.java | 16 +
.../logging/LoggingIntegrationTestSuite.java | 22 +-
.../logging/LoggingPerformanceTestCase.java | 16 +
.../internal/logging/LoggingUnitTestSuite.java | 31 +-
.../logging/MergeLogFilesJUnitTest.java | 25 +-
.../gemfire/internal/logging/NullLogWriter.java | 16 +
.../internal/logging/SortLogFileJUnitTest.java | 21 +-
.../internal/logging/TestLogWriterFactory.java | 16 +
.../logging/log4j/AlertAppenderJUnitTest.java | 16 +
.../logging/log4j/ConfigLocatorJUnitTest.java | 16 +
.../log4j/FastLoggerIntegrationJUnitTest.java | 20 +-
.../logging/log4j/FastLoggerJUnitTest.java | 16 +
.../FastLoggerWithDefaultConfigJUnitTest.java | 20 +-
.../log4j/LocalizedMessageJUnitTest.java | 16 +
.../log4j/Log4J2DisabledPerformanceTest.java | 16 +
.../logging/log4j/Log4J2PerformanceTest.java | 16 +
.../log4j/Log4jIntegrationTestSuite.java | 16 +
.../logging/log4j/Log4jUnitTestSuite.java | 16 +
.../log4j/LogWriterAppenderJUnitTest.java | 16 +
.../LogWriterLoggerDisabledPerformanceTest.java | 16 +
.../log4j/LogWriterLoggerPerformanceTest.java | 16 +
.../internal/net/SocketUtilsJUnitTest.java | 21 +-
.../offheap/ByteArrayMemoryChunkJUnitTest.java | 16 +
.../offheap/ConcurrentBagJUnitTest.java | 16 +
.../internal/offheap/DataTypeJUnitTest.java | 16 +
.../DirectByteBufferMemoryChunkJUnitTest.java | 16 +
.../offheap/FreeListOffHeapRegionJUnitTest.java | 16 +
.../HeapByteBufferMemoryChunkJUnitTest.java | 16 +
.../internal/offheap/InlineKeyJUnitTest.java | 16 +
.../offheap/MemoryChunkJUnitTestBase.java | 16 +
.../offheap/NullOffHeapMemoryStats.java | 16 +
.../offheap/NullOutOfOffHeapMemoryListener.java | 16 +
.../internal/offheap/OffHeapIndexJUnitTest.java | 16 +
.../internal/offheap/OffHeapRegionBase.java | 16 +
.../offheap/OffHeapStorageJUnitTest.java | 16 +
.../offheap/OffHeapValidationJUnitTest.java | 16 +
.../OffHeapWriteObjectAsByteArrayJUnitTest.java | 16 +
.../OldFreeListOffHeapRegionJUnitTest.java | 16 +
.../offheap/OutOfOffHeapMemoryDUnitTest.java | 43 +-
...mpleMemoryAllocatorFillPatternJUnitTest.java | 16 +
.../offheap/SimpleMemoryAllocatorJUnitTest.java | 16 +
...moryAllocatorLifecycleListenerJUnitTest.java | 16 +
.../TxReleasesOffHeapOnCloseJUnitTest.java | 16 +
.../offheap/UnsafeMemoryChunkJUnitTest.java | 16 +
.../BlockingProcessStreamReaderJUnitTest.java | 16 +
.../LocalProcessControllerJUnitTest.java | 21 +-
.../process/LocalProcessLauncherDUnitTest.java | 21 +-
.../process/LocalProcessLauncherJUnitTest.java | 21 +-
...NonBlockingProcessStreamReaderJUnitTest.java | 16 +
.../internal/process/PidFileJUnitTest.java | 16 +
.../ProcessControllerFactoryJUnitTest.java | 16 +
.../process/ProcessStreamReaderTestCase.java | 22 +-
.../gemfire/internal/process/mbean/Process.java | 16 +
.../internal/process/mbean/ProcessMBean.java | 16 +
...tractSignalNotificationHandlerJUnitTest.java | 21 +-
.../internal/size/ObjectSizerJUnitTest.java | 21 +-
.../internal/size/ObjectTraverserJUnitTest.java | 21 +-
.../internal/size/ObjectTraverserPerf.java | 21 +-
.../size/SizeClassOnceObjectSizerJUnitTest.java | 21 +-
.../gemfire/internal/size/SizeTestUtil.java | 16 +
.../size/WellKnownClassSizerJUnitTest.java | 21 +-
.../internal/statistics/DummyStatistics.java | 21 +-
.../statistics/SampleCollectorJUnitTest.java | 21 +-
.../statistics/StatMonitorHandlerJUnitTest.java | 21 +-
.../statistics/StatisticsDUnitTest.java | 21 +-
.../statistics/StatisticsMonitorJUnitTest.java | 21 +-
.../internal/statistics/TestSampleHandler.java | 21 +-
.../statistics/TestStatArchiveWriter.java | 21 +-
.../statistics/TestStatisticsManager.java | 21 +-
.../statistics/TestStatisticsSampler.java | 21 +-
.../statistics/ValueMonitorJUnitTest.java | 21 +-
.../internal/stats50/AtomicStatsJUnitTest.java | 21 +-
.../util/AbortableTaskServiceJUnitTest.java | 21 +-
.../internal/util/ArrayUtilsJUnitTest.java | 18 +-
.../gemfire/internal/util/BytesJUnitTest.java | 21 +-
.../internal/util/CollectionUtilsJUnitTest.java | 18 +-
.../internal/util/DelayedActionJUnitTest.java | 21 +-
.../gemfire/internal/util/IOUtilsJUnitTest.java | 21 +-
.../gemfire/internal/util/SerializableImpl.java | 21 +-
.../util/SerializableImplWithValue.java | 21 +-
.../gemfire/internal/util/Valuable.java | 21 +-
.../CompactConcurrentHashSetJUnitTest.java | 16 +
.../ConcurrentHashMapIteratorJUnitTest.java | 21 +-
.../concurrent/ReentrantSemaphoreJUnitTest.java | 21 +-
.../SemaphoreReadWriteLockJUnitTest.java | 21 +-
.../cm/ConcurrentHashMapJUnitTest.java | 21 +-
.../concurrent/cm/CountedMapLoopsJUnitTest.java | 21 +-
.../concurrent/cm/IntMapCheckJUnitTest.java | 21 +-
.../util/concurrent/cm/LoopHelpers.java | 21 +-
.../util/concurrent/cm/MapCheckJUnitTest.java | 21 +-
.../util/concurrent/cm/MapLoopsJUnitTest.java | 21 +-
.../util/concurrent/cm/RLJBarJUnitTest.java | 21 +-
.../concurrent/cm/StringMapLoopsJUnitTest.java | 21 +-
.../management/CacheManagementDUnitTest.java | 22 +-
.../management/ClientHealthStatsDUnitTest.java | 22 +-
.../gemfire/management/CompositeStats.java | 21 +-
.../gemfire/management/CompositeTestMBean.java | 21 +-
.../gemfire/management/CompositeTestMXBean.java | 16 +
.../management/CompositeTypeTestDUnitTest.java | 21 +-
.../gemfire/management/CustomMBean.java | 22 +-
.../gemfire/management/CustomMXBean.java | 20 +-
.../management/DLockManagementDUnitTest.java | 20 +-
.../DataBrowserJSONValidationJUnitTest.java | 21 +-
.../management/DiskManagementDUnitTest.java | 20 +-
.../management/DistributedSystemDUnitTest.java | 20 +-
.../management/LocatorManagementDUnitTest.java | 21 +-
.../gemstone/gemfire/management/MBeanUtil.java | 20 +-
.../gemfire/management/ManagementTestBase.java | 21 +-
.../MemberMBeanAttributesDUnitTest.java | 20 +-
.../management/OffHeapManagementDUnitTest.java | 32 +-
.../gemfire/management/QueryDataDUnitTest.java | 21 +-
.../management/RegionManagementDUnitTest.java | 20 +-
.../gemfire/management/TypedJsonJUnitTest.java | 21 +-
...ersalMembershipListenerAdapterDUnitTest.java | 21 +-
.../stats/AsyncEventQueueStatsJUnitTest.java | 21 +-
.../bean/stats/CacheServerStatsJUnitTest.java | 21 +-
.../bean/stats/DiskStatsJUnitTest.java | 21 +-
.../stats/DistributedSystemStatsDUnitTest.java | 21 +-
.../stats/DistributedSystemStatsJUnitTest.java | 21 +-
.../stats/GatewayReceiverStatsJUnitTest.java | 21 +-
.../bean/stats/GatewaySenderStatsJUnitTest.java | 21 +-
.../HDFSRegionMBeanAttributeJUnitTest.java | 169 --
.../bean/stats/MBeanStatsTestCase.java | 21 +-
.../bean/stats/MemberLevelStatsJUnitTest.java | 21 +-
.../bean/stats/RegionStatsJUnitTest.java | 21 +-
.../bean/stats/StatsRateJUnitTest.java | 21 +-
.../internal/JettyHelperJUnitTest.java | 21 +-
.../cli/ClasspathScanLoadHelperJUnitTest.java | 21 +-
.../internal/cli/CliUtilDUnitTest.java | 21 +-
.../internal/cli/CommandManagerJUnitTest.java | 21 +-
.../cli/CommandSeparatorEscapeJUnitTest.java | 16 +
.../internal/cli/DataCommandJsonJUnitTest.java | 16 +
.../internal/cli/GfshParserJUnitTest.java | 21 +-
.../cli/annotations/CliArgumentJUnitTest.java | 21 +-
.../AbstractCommandsSupportJUnitTest.java | 21 +-
.../commands/DiskStoreCommandsJUnitTest.java | 21 +-
.../commands/HDFSStoreCommandsJUnitTest.java | 838 ---------
.../HTTPServiceSSLSupportJUnitTest.java | 20 +-
.../cli/commands/IndexCommandsJUnitTest.java | 21 +-
.../RegionPathConverterJUnitTest.java | 21 +-
.../internal/cli/domain/AbstractImpl.java | 16 +
.../management/internal/cli/domain/Impl1.java | 16 +
.../management/internal/cli/domain/Impl12.java | 16 +
.../internal/cli/domain/Interface1.java | 16 +
.../internal/cli/domain/Interface2.java | 16 +
.../management/internal/cli/domain/Stock.java | 21 +-
.../management/internal/cli/dto/Car.java | 16 +
.../management/internal/cli/dto/Key1.java | 21 +-
.../management/internal/cli/dto/Key2.java | 21 +-
.../internal/cli/dto/ObjectWithCharAttr.java | 21 +-
.../management/internal/cli/dto/Value1.java | 21 +-
.../management/internal/cli/dto/Value2.java | 21 +-
.../AlterHDFSStoreFunctionJUnitTest.java | 324 ----
.../CreateHDFSStoreFunctionJUnitTest.java | 307 ---
.../DescribeDiskStoreFunctionJUnitTest.java | 21 +-
.../DescribeHDFSStoreFunctionJUnitTest.java | 364 ----
.../DestroyHDFSStoreFunctionJUnitTest.java | 305 ---
.../ListDiskStoresFunctionJUnitTest.java | 21 +-
.../ListHDFSStoresFunctionJUnitTest.java | 319 ----
.../functions/ListIndexFunctionJUnitTest.java | 21 +-
.../cli/parser/ParserUtilsJUnitTest.java | 21 +-
.../preprocessor/PreprocessorJUnitTest.java | 21 +-
.../PreprocessorUtilsJUnitTest.java | 21 +-
.../cli/shell/GfshConfigInitFileJUnitTest.java | 16 +
.../shell/GfshExecutionStrategyJUnitTest.java | 21 +-
.../cli/shell/GfshInitFileJUnitTest.java | 16 +
.../SharedConfigurationDUnitTest.java | 21 +-
.../configuration/ZipUtilsJUnitTest.java | 21 +-
.../domain/CacheElementJUnitTest.java | 21 +-
.../utils/XmlUtilsAddNewNodeJUnitTest.java | 21 +-
.../configuration/utils/XmlUtilsJUnitTest.java | 21 +-
.../internal/pulse/TestClientIdsDUnitTest.java | 22 +-
.../internal/pulse/TestFunctionsDUnitTest.java | 22 +-
.../internal/pulse/TestHeapDUnitTest.java | 23 +-
.../internal/pulse/TestLocatorsDUnitTest.java | 22 +-
.../pulse/TestSubscriptionsDUnitTest.java | 20 +-
.../internal/security/JSONAuthCodeTest.java | 16 +
.../security/JSONAuthorizationTest.java | 16 +
.../security/ResourceOperationJUnit.java | 16 +
.../ReadOpFileAccessControllerJUnitTest.java | 21 +-
.../WanCommandsControllerJUnitTest.java | 16 +
.../gemfire/management/model/EmptyObject.java | 21 +-
.../gemstone/gemfire/management/model/Item.java | 21 +-
.../gemfire/management/model/Order.java | 21 +-
.../gemfire/management/model/SubOrder.java | 21 +-
.../DomainObjectsAsValuesJUnitTest.java | 21 +-
.../GemcachedBinaryClientJUnitTest.java | 21 +-
.../GemcachedDevelopmentJUnitTest.java | 21 +-
.../gemfire/memcached/IntegrationJUnitTest.java | 21 +-
.../gemfire/pdx/AutoSerializableJUnitTest.java | 21 +-
.../gemfire/pdx/ByteSourceJUnitTest.java | 16 +
.../ClientsWithVersioningRetryDUnitTest.java | 21 +-
.../com/gemstone/gemfire/pdx/DSInsidePdx.java | 23 +-
.../pdx/DistributedSystemIdDUnitTest.java | 21 +-
.../com/gemstone/gemfire/pdx/DomainObject.java | 21 +-
.../gemstone/gemfire/pdx/DomainObjectBad.java | 16 +
.../gemfire/pdx/DomainObjectClassLoadable.java | 16 +
.../gemfire/pdx/DomainObjectPdxAuto.java | 21 +-
...DomainObjectPdxAutoNoDefaultConstructor.java | 21 +-
.../java/com/gemstone/gemfire/pdx/Employee.java | 23 +-
.../pdx/JSONPdxClientServerDUnitTest.java | 23 +-
.../com/gemstone/gemfire/pdx/NestedPdx.java | 21 +-
.../gemfire/pdx/NonDelegatingLoader.java | 23 +-
.../OffHeapByteBufferByteSourceJUnitTest.java | 16 +
.../gemfire/pdx/OffHeapByteSourceJUnitTest.java | 16 +
.../pdx/PDXAsyncEventQueueDUnitTest.java | 22 +-
.../gemfire/pdx/PdxAttributesJUnitTest.java | 21 +-
.../gemfire/pdx/PdxClientServerDUnitTest.java | 21 +-
.../pdx/PdxDeserializationDUnitTest.java | 21 +-
.../pdx/PdxFormatterPutGetJUnitTest.java | 21 +-
.../com/gemstone/gemfire/pdx/PdxInsideDS.java | 23 +-
.../pdx/PdxInstanceFactoryJUnitTest.java | 21 +-
.../gemfire/pdx/PdxInstanceJUnitTest.java | 21 +-
.../gemfire/pdx/PdxSerializableDUnitTest.java | 21 +-
.../gemfire/pdx/PdxSerializableJUnitTest.java | 21 +-
.../gemfire/pdx/PdxStringJUnitTest.java | 21 +-
.../gemfire/pdx/PdxTypeExportDUnitTest.java | 21 +-
.../gemfire/pdx/SeparateClassloaderPdx.java | 23 +-
.../com/gemstone/gemfire/pdx/SimpleClass.java | 23 +-
.../com/gemstone/gemfire/pdx/SimpleClass1.java | 21 +-
.../com/gemstone/gemfire/pdx/SimpleClass2.java | 21 +-
.../gemfire/pdx/TestObjectForPdxFormatter.java | 21 +-
.../gemfire/pdx/VersionClassLoader.java | 22 +-
.../gemstone/gemfire/redis/AuthJUnitTest.java | 18 +-
.../gemfire/redis/ConcurrentStartTest.java | 16 +
.../gemstone/gemfire/redis/HashesJUnitTest.java | 16 +
.../gemstone/gemfire/redis/ListsJUnitTest.java | 16 +
.../gemfire/redis/RedisDistDUnitTest.java | 16 +
.../gemstone/gemfire/redis/SetsJUnitTest.java | 16 +
.../gemfire/redis/SortedSetsJUnitTest.java | 20 +-
.../gemfire/redis/StringsJunitTest.java | 16 +
.../web/controllers/AddFreeItemToOrders.java | 21 +-
.../rest/internal/web/controllers/Customer.java | 21 +-
.../internal/web/controllers/DateTimeUtils.java | 16 +
.../rest/internal/web/controllers/Gender.java | 16 +
.../internal/web/controllers/GetAllEntries.java | 21 +-
.../web/controllers/GetDeliveredOrders.java | 21 +-
.../internal/web/controllers/GetRegions.java | 21 +-
.../web/controllers/GetValueForKey.java | 21 +-
.../rest/internal/web/controllers/Item.java | 21 +-
.../rest/internal/web/controllers/Order.java | 21 +-
.../rest/internal/web/controllers/Person.java | 21 +-
.../web/controllers/PutKeyFunction.java | 21 +-
.../web/controllers/RestAPITestBase.java | 16 +
.../internal/web/controllers/RestTestUtils.java | 21 +-
.../gemfire/test/golden/ExecutableProcess.java | 16 +
.../gemfire/test/golden/FailOutputTestCase.java | 16 +
.../golden/FailWithErrorInOutputJUnitTest.java | 16 +
.../FailWithExtraLineInOutputJUnitTest.java | 16 +
...WithLineMissingFromEndOfOutputJUnitTest.java | 16 +
...hLineMissingFromMiddleOfOutputJUnitTest.java | 16 +
.../FailWithLoggerErrorInOutputJUnitTest.java | 16 +
.../FailWithLoggerFatalInOutputJUnitTest.java | 16 +
.../FailWithLoggerWarnInOutputJUnitTest.java | 16 +
.../golden/FailWithProblemInOutputTestCase.java | 16 +
.../golden/FailWithSevereInOutputJUnitTest.java | 16 +
...hTimeoutOfWaitForOutputToMatchJUnitTest.java | 16 +
.../FailWithWarningInOutputJUnitTest.java | 16 +
.../gemfire/test/golden/GoldenComparator.java | 16 +
.../test/golden/GoldenStringComparator.java | 16 +
.../gemfire/test/golden/GoldenTestCase.java | 16 +
.../golden/GoldenTestFrameworkTestSuite.java | 16 +
.../gemfire/test/golden/PassJUnitTest.java | 16 +
.../golden/PassWithExpectedErrorJUnitTest.java | 16 +
.../golden/PassWithExpectedProblemTestCase.java | 16 +
.../golden/PassWithExpectedSevereJUnitTest.java | 16 +
.../PassWithExpectedWarningJUnitTest.java | 16 +
.../test/golden/RegexGoldenComparator.java | 16 +
.../test/golden/StringGoldenComparator.java | 16 +
.../gemfire/test/process/MainLauncher.java | 16 +
.../test/process/MainLauncherJUnitTest.java | 16 +
.../gemfire/test/process/OutputFormatter.java | 16 +
.../test/process/ProcessOutputReader.java | 16 +
.../test/process/ProcessStreamReader.java | 16 +
.../process/ProcessTestFrameworkTestSuite.java | 16 +
.../gemfire/test/process/ProcessWrapper.java | 16 +
.../test/process/ProcessWrapperJUnitTest.java | 16 +
.../gemstone/gemfire/util/JSR166TestCase.java | 22 +-
.../gemstone/gemfire/util/test/TestUtil.java | 16 +
.../protocols/CacheTimeSlowDownDUnitTest.java | 17 +-
.../GemFireTimeSyncProtocolDUnitTest.java | 17 +-
.../JGroupsFailureDetectionJUnitTest.java | 16 +
.../protocols/JGroupsVersioningJUnitTest.java | 21 +-
.../com/gemstone/persistence/admin/Logger.java | 21 +-
.../gemstone/persistence/logging/Formatter.java | 21 +-
.../gemstone/persistence/logging/Handler.java | 21 +-
.../com/gemstone/persistence/logging/Level.java | 21 +-
.../gemstone/persistence/logging/LogRecord.java | 21 +-
.../gemstone/persistence/logging/Logger.java | 21 +-
.../persistence/logging/SimpleFormatter.java | 21 +-
.../persistence/logging/StreamHandler.java | 21 +-
.../test/java/com/gemstone/sequence/Arrow.java | 21 +-
.../java/com/gemstone/sequence/Lifeline.java | 21 +-
.../com/gemstone/sequence/LifelineState.java | 21 +-
.../java/com/gemstone/sequence/LineMapper.java | 21 +-
.../com/gemstone/sequence/SequenceDiagram.java | 21 +-
.../com/gemstone/sequence/SequencePanel.java | 21 +-
.../com/gemstone/sequence/StateColorMap.java | 21 +-
.../java/com/gemstone/sequence/TimeAxis.java | 21 +-
.../com/gemstone/sequence/ZoomingPanel.java | 21 +-
.../sequence/gemfire/DefaultLineMapper.java | 21 +-
.../gemfire/GemfireSequenceDisplay.java | 21 +-
.../sequence/gemfire/HydraLineMapper.java | 21 +-
.../sequence/gemfire/SelectGraphDialog.java | 21 +-
.../com/main/MyDistributedSystemListener.java | 21 +-
.../com/main/WANBootStrapping_Site1_Add.java | 21 +-
.../com/main/WANBootStrapping_Site1_Remove.java | 21 +-
.../com/main/WANBootStrapping_Site2_Add.java | 21 +-
.../com/main/WANBootStrapping_Site2_Remove.java | 21 +-
.../src/test/java/dunit/AsyncInvocation.java | 21 +-
.../src/test/java/dunit/BounceResult.java | 16 +
gemfire-core/src/test/java/dunit/DUnitEnv.java | 21 +-
.../test/java/dunit/DistributedTestCase.java | 21 +-
gemfire-core/src/test/java/dunit/Host.java | 21 +-
.../src/test/java/dunit/RMIException.java | 21 +-
.../src/test/java/dunit/RemoteDUnitVMIF.java | 16 +
.../src/test/java/dunit/RepeatableRunnable.java | 16 +
.../test/java/dunit/SerializableCallable.java | 21 +-
.../test/java/dunit/SerializableRunnable.java | 21 +-
gemfire-core/src/test/java/dunit/VM.java | 21 +-
.../src/test/java/dunit/standalone/ChildVM.java | 25 +-
.../java/dunit/standalone/DUnitLauncher.java | 25 +-
.../java/dunit/standalone/ProcessManager.java | 36 +-
.../java/dunit/standalone/RemoteDUnitVM.java | 21 +-
.../dunit/standalone/StandAloneDUnitEnv.java | 21 +-
.../test/java/dunit/tests/BasicDUnitTest.java | 21 +-
.../src/test/java/dunit/tests/TestFailure.java | 21 +-
.../src/test/java/dunit/tests/VMDUnitTest.java | 21 +-
gemfire-core/src/test/java/hydra/GsRandom.java | 21 +-
.../test/java/hydra/HydraRuntimeException.java | 21 +-
gemfire-core/src/test/java/hydra/Log.java | 21 +-
.../src/test/java/hydra/LogVersionHelper.java | 21 +-
.../src/test/java/hydra/MethExecutor.java | 21 +-
.../src/test/java/hydra/MethExecutorResult.java | 21 +-
.../src/test/java/hydra/SchedulingOrder.java | 21 +-
.../src/test/java/hydra/log/AnyLogWriter.java | 21 +-
.../java/hydra/log/CircularOutputStream.java | 21 +-
.../parReg/query/unittest/NewPortfolio.java | 21 +-
.../java/parReg/query/unittest/Position.java | 22 +-
.../src/test/java/perffmwk/Formatter.java | 22 +-
.../templates/security/DummyAuthenticator.java | 21 +-
.../templates/security/DummyAuthorization.java | 21 +-
.../security/FunctionSecurityPrmsHolder.java | 21 +-
.../security/LdapUserAuthenticator.java | 21 +-
.../java/templates/security/PKCSAuthInit.java | 21 +-
.../templates/security/PKCSAuthenticator.java | 21 +-
.../java/templates/security/PKCSPrincipal.java | 21 +-
.../security/UserPasswordAuthInit.java | 21 +-
.../templates/security/UsernamePrincipal.java | 21 +-
.../templates/security/XmlAuthorization.java | 21 +-
.../templates/security/XmlErrorHandler.java | 21 +-
.../src/test/java/util/TestException.java | 21 +-
.../cache/client/internal/cacheserver.cer | Bin 0 -> 782 bytes
.../cache/client/internal/cacheserver.keystore | Bin 0 -> 1253 bytes
.../client/internal/cacheserver.truststore | Bin 0 -> 844 bytes
.../gemfire/cache/client/internal/client.cer | Bin 0 -> 782 bytes
.../cache/client/internal/client.keystore | Bin 0 -> 1251 bytes
.../cache/client/internal/client.truststore | Bin 0 -> 846 bytes
.../cache/client/internal/default.keystore | Bin 0 -> 1115 bytes
.../cache/client/internal/trusted.keystore | Bin 0 -> 1078 bytes
.../sanctionedDataSerializables.txt | 1755 ++++++++----------
.../codeAnalysis/sanctionedSerializables.txt | 27 +-
gemfire-jgroups/build.gradle | 8 +-
.../org/jgroups/ShunnedAddressException.java | 16 +
.../com/gemstone/org/jgroups/SuspectMember.java | 16 +-
.../org/jgroups/debug/JChannelTestHook.java | 16 +
.../gemstone/org/jgroups/protocols/AUTH.java | 16 +
.../gemstone/org/jgroups/protocols/FRAG3.java | 17 +-
.../org/jgroups/spi/GFBasicAdapter.java | 16 +
.../gemstone/org/jgroups/spi/GFPeerAdapter.java | 16 +
.../org/jgroups/stack/BoundedLinkedHashMap.java | 21 +-
.../org/jgroups/stack/GFBasicAdapterImpl.java | 16 +
.../org/jgroups/stack/GFPeerAdapterImpl.java | 16 +
.../org/jgroups/stack/GossipClient.java | 6 +-
.../org/jgroups/stack/SockCreatorImpl.java | 21 +-
.../org/jgroups/util/ConnectionWatcher.java | 16 +
.../org/jgroups/util/ExternalStrings.java | 21 +-
.../gemstone/org/jgroups/util/GFLogWriter.java | 16 +
.../org/jgroups/util/GFStringIdImpl.java | 16 +
.../gemstone/org/jgroups/util/SockCreator.java | 24 +-
.../org/jgroups/util/StreamableFixedID.java | 16 +
.../com/gemstone/org/jgroups/util/StringId.java | 21 +-
.../org/jgroups/util/VersionedStreamable.java | 16 +
.../gemstone/org/jgroups/JChannelJUnitTest.java | 16 +
.../test/junit/categories/DistributedTest.java | 16 +
.../categories/DistributedTransactionsTest.java | 16 +
.../test/junit/categories/HoplogTest.java | 7 -
.../test/junit/categories/IntegrationTest.java | 16 +
.../test/junit/categories/PerformanceTest.java | 16 +
.../gemfire/test/junit/categories/UnitTest.java | 16 +
.../gemfire/test/junit/categories/WanTest.java | 16 +
.../test/junit/rules/ExpectedTimeout.java | 16 +
.../junit/rules/ExpectedTimeoutJUnitTest.java | 16 +
.../gemfire/cache/lucene/LuceneIndex.java | 21 +-
.../gemfire/cache/lucene/LuceneQuery.java | 16 +
.../cache/lucene/LuceneQueryFactory.java | 16 +
.../cache/lucene/LuceneResultStruct.java | 16 +
.../gemfire/cache/lucene/LuceneService.java | 16 +
gemfire-rebalancer/build.gradle | 11 +-
.../gemfire/cache/util/AutoBalancer.java | 190 +-
.../util/AutoBalancerIntegrationJUnitTest.java | 190 ++
.../cache/util/AutoBalancerJUnitTest.java | 410 ++--
gemfire-spark-connector/doc/1_building.md | 2 +
.../connector/internal/RegionMetadata.java | 16 +
.../gemfirefunctions/QueryFunction.java | 18 +-
.../RetrieveRegionFunction.java | 16 +
.../RetrieveRegionMetadataFunction.java | 16 +
.../StructStreamingResultSender.java | 16 +
.../gemfire/spark/connector/Employee.java | 16 +
.../spark/connector/JavaApiIntegrationTest.java | 16 +
.../gemfire/spark/connector/Portfolio.java | 16 +
.../gemfire/spark/connector/Position.java | 16 +
.../spark/connector/BasicIntegrationTest.scala | 16 +
.../RDDJoinRegionIntegrationTest.scala | 16 +
.../RetrieveRegionIntegrationTest.scala | 16 +
.../gemfire/spark/connector/package.scala | 16 +
.../connector/testkit/GemFireCluster.scala | 16 +
.../spark/connector/testkit/GemFireRunner.scala | 16 +
.../spark/connector/testkit/IOUtils.scala | 16 +
.../spark/streaming/ManualClockHelper.scala | 16 +
.../spark/streaming/TestInputDStream.scala | 16 +
.../javaapi/GemFireJavaDStreamFunctions.java | 16 +
.../GemFireJavaPairDStreamFunctions.java | 16 +
.../javaapi/GemFireJavaPairRDDFunctions.java | 16 +
.../javaapi/GemFireJavaRDDFunctions.java | 16 +
.../javaapi/GemFireJavaSQLContextFunctions.java | 16 +
.../GemFireJavaSparkContextFunctions.java | 16 +
.../connector/javaapi/GemFireJavaUtil.java | 16 +
.../spark/connector/GemFireConnection.scala | 16 +
.../spark/connector/GemFireConnectionConf.scala | 16 +
.../connector/GemFireConnectionManager.scala | 16 +
.../connector/GemFireFunctionDeployer.scala | 16 +
.../connector/GemFireKryoRegistrator.scala | 16 +
.../connector/GemFirePairRDDFunctions.scala | 16 +
.../spark/connector/GemFireRDDFunctions.scala | 16 +
.../connector/GemFireSQLContextFunctions.scala | 16 +
.../GemFireSparkContextFunctions.scala | 16 +
.../internal/DefaultGemFireConnection.scala | 16 +
.../DefaultGemFireConnectionManager.scala | 16 +
.../connector/internal/LocatorHelper.scala | 16 +
.../StructStreamingResultCollector.scala | 16 +
.../connector/internal/oql/QueryParser.scala | 16 +
.../spark/connector/internal/oql/QueryRDD.scala | 18 +-
.../internal/oql/QueryResultCollector.scala | 18 +-
.../connector/internal/oql/RDDConverter.scala | 18 +-
.../connector/internal/oql/RowBuilder.scala | 16 +
.../connector/internal/oql/SchemaBuilder.scala | 16 +
.../internal/oql/UndefinedSerializer.scala | 16 +
.../connector/internal/rdd/GemFireJoinRDD.scala | 16 +
.../internal/rdd/GemFireOuterJoinRDD.scala | 16 +
.../internal/rdd/GemFireRDDPartition.scala | 16 +
.../internal/rdd/GemFireRDDPartitioner.scala | 16 +
.../rdd/GemFireRDDPartitionerImpl.scala | 16 +
.../internal/rdd/GemFireRDDWriter.scala | 16 +
.../internal/rdd/GemFireRegionRDD.scala | 16 +
.../javaapi/GemFireJavaRegionRDD.scala | 16 +
.../spark/connector/javaapi/JavaAPIHelper.scala | 16 +
.../gemfire/spark/connector/package.scala | 16 +
.../streaming/GemFireDStreamFunctions.scala | 18 +-
.../spark/connector/streaming/package.scala | 16 +
.../gemfire/spark/connector/JavaAPITest.java | 18 +-
.../connector/GemFireFunctionDeployerTest.scala | 16 +
.../DefaultGemFireConnectionManagerTest.scala | 16 +
...tStreamingResultSenderAndCollectorTest.scala | 16 +
.../internal/oql/QueryParserTest.scala | 18 +-
.../connector/ConnectorImplicitsTest.scala | 16 +
.../connector/GemFireConnectionConfTest.scala | 16 +
.../connector/GemFireDStreamFunctionsTest.scala | 16 +
.../connector/GemFireRDDFunctionsTest.scala | 16 +
.../spark/connector/LocatorHelperTest.scala | 16 +
.../rdd/GemFireRDDPartitionerTest.scala | 16 +
.../connector/rdd/GemFireRegionRDDTest.scala | 16 +
.../basic-demos/src/main/java/demo/Emp.java | 16 +
.../src/main/java/demo/OQLJavaDemo.java | 16 +
.../src/main/java/demo/PairRDDSaveJavaDemo.java | 16 +
.../src/main/java/demo/RDDSaveJavaDemo.java | 16 +
.../src/main/java/demo/RegionToRDDJavaDemo.java | 16 +
.../src/main/scala/demo/NetworkWordCount.scala | 16 +
.../project/Dependencies.scala | 16 +
.../project/GemFireSparkBuild.scala | 16 +
gemfire-spark-connector/project/Settings.scala | 16 +
gemfire-web-api/build.gradle | 46 +-
.../web/controllers/AbstractBaseController.java | 21 +-
.../web/controllers/BaseControllerAdvice.java | 21 +-
.../web/controllers/CommonCrudController.java | 21 +-
.../controllers/FunctionAccessController.java | 21 +-
.../web/controllers/PdxBasedCrudController.java | 21 +-
.../web/controllers/QueryAccessController.java | 21 +-
.../web/controllers/support/JSONTypes.java | 16 +
.../controllers/support/QueryResultTypes.java | 21 +-
.../web/controllers/support/RegionData.java | 21 +-
.../controllers/support/RegionEntryData.java | 21 +-
.../support/RestServersResultCollector.java | 16 +
.../web/controllers/support/UpdateOp.java | 21 +-
.../DataTypeNotSupportedException.java | 21 +-
.../web/exception/GemfireRestException.java | 21 +-
.../web/exception/MalformedJsonException.java | 21 +-
.../web/exception/RegionNotFoundException.java | 21 +-
.../exception/ResourceNotFoundException.java | 21 +-
...stomMappingJackson2HttpMessageConverter.java | 16 +
.../web/swagger/config/RestApiPathProvider.java | 16 +
.../web/swagger/config/SwaggerConfig.java | 16 +
.../rest/internal/web/util/ArrayUtils.java | 21 +-
.../rest/internal/web/util/DateTimeUtils.java | 21 +-
.../internal/web/util/IdentifiableUtils.java | 21 +-
.../rest/internal/web/util/JSONUtils.java | 21 +-
.../rest/internal/web/util/JsonWriter.java | 21 +-
.../rest/internal/web/util/NumberUtils.java | 21 +-
.../rest/internal/web/util/ValidationUtils.java | 21 +-
gemfire-web/build.gradle | 32 +-
.../internal/web/AbstractWebTestCase.java | 21 +-
.../ShellCommandsControllerJUnitTest.java | 68 +-
...entVariablesHandlerInterceptorJUnitTest.java | 21 +-
.../internal/web/domain/LinkIndexJUnitTest.java | 21 +-
.../internal/web/domain/LinkJUnitTest.java | 21 +-
.../domain/QueryParameterSourceJUnitTest.java | 21 +-
.../web/http/ClientHttpRequestJUnitTest.java | 21 +-
...ableObjectHttpMessageConverterJUnitTest.java | 21 +-
.../RestHttpOperationInvokerJUnitTest.java | 21 +-
.../SimpleHttpOperationInvokerJUnitTest.java | 21 +-
.../web/util/ConvertUtilsJUnitTest.java | 21 +-
.../internal/web/util/UriUtilsJUnitTest.java | 21 +-
gradle/dependency-versions.properties | 64 +
gradle/wrapper/gradle-wrapper.jar | Bin 51018 -> 53637 bytes
gradle/wrapper/gradle-wrapper.properties | 4 +-
gradlew | 12 +-
settings.gradle | 1 +
5014 files changed, 78666 insertions(+), 43006 deletions(-)
----------------------------------------------------------------------
[25/50] [abbrv] incubator-geode git commit: Making lucene indexed
fields their own XML element.
Posted by as...@apache.org.
Making lucene indexed fields their own XML element.
Rather than <lucene:index fields="x,y"> fields are now listed as their
own individual elements, for example
<lucene:index>
<lucene:field name="x"/>
</lucene:index>
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/71cd7c6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/71cd7c6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/71cd7c6c
Branch: refs/heads/develop
Commit: 71cd7c6c8c5e7d8baf451f5d5f4b1edbcf699370
Parents: 5011ee5
Author: Dan Smith <up...@apache.org>
Authored: Thu Oct 8 16:16:56 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Thu Oct 8 17:30:18 2015 -0700
----------------------------------------------------------------------
.../cache/lucene/internal/LuceneIndexImpl.java | 2 +-
.../internal/xml/LuceneIndexCreation.java | 20 +++++++----
.../internal/xml/LuceneIndexXmlGenerator.java | 9 +++--
.../lucene/internal/xml/LuceneXmlConstants.java | 2 +-
.../lucene/internal/xml/LuceneXmlParser.java | 36 ++++++++++++++++----
.../lucene/lucene-1.0.xsd | 8 ++++-
.../xml/LuceneIndexXmlGeneratorJUnitTest.java | 23 +++++++++++--
.../xml/LuceneIndexXmlParserJUnitTest.java | 16 +++++++--
...erIntegrationJUnitTest.createIndex.cache.xml | 12 +++++--
...serIntegrationJUnitTest.parseIndex.cache.xml | 12 +++++--
10 files changed, 114 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71cd7c6c/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
index 3964053..257861b 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
@@ -85,7 +85,7 @@ public abstract class LuceneIndexImpl implements InternalLuceneIndex {
protected void addExtension(PartitionedRegion dataRegion) {
LuceneIndexCreation creation = new LuceneIndexCreation();
creation.setName(this.getName());
- creation.setFieldNames(this.getFieldNames());
+ creation.addFieldNames(this.getFieldNames());
creation.setRegion(dataRegion);
creation.setFieldFieldAnalyzerMap(this.getFieldAnalyzerMap());
dataRegion.getExtensionPoint().addExtension(creation, creation);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71cd7c6c/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
index abb147a..5520f96 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
@@ -1,6 +1,9 @@
package com.gemstone.gemfire.cache.lucene.internal.xml;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
import java.util.Map;
+import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
@@ -16,7 +19,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
public class LuceneIndexCreation implements LuceneIndex, Extension<Region<?, ?>> {
private Region region;
private String name;
- private String[] fieldNames;
+ private Set<String> fieldNames = new LinkedHashSet<String>();
private Map<String, Analyzer> fieldFieldAnalyzerMap;
@@ -28,10 +31,6 @@ public class LuceneIndexCreation implements LuceneIndex, Extension<Region<?, ?>>
this.name = name;
}
- public void setFieldNames(String[] fieldNames) {
- this.fieldNames = fieldNames;
- }
-
public Map<String, Analyzer> getFieldFieldAnalyzerMap() {
return fieldFieldAnalyzerMap;
}
@@ -51,7 +50,7 @@ public class LuceneIndexCreation implements LuceneIndex, Extension<Region<?, ?>>
}
public String[] getFieldNames() {
- return fieldNames;
+ return fieldNames.toArray(new String[fieldNames.size()]);
}
@Override
@@ -73,4 +72,13 @@ public class LuceneIndexCreation implements LuceneIndex, Extension<Region<?, ?>>
//TODO - should this be a different method than the public API here?
service.createIndex(getName(), getRegionPath(), getFieldNames());
}
+
+ public void addField(String name) {
+ this.fieldNames.add(name);
+ }
+
+ public void addFieldNames(String[] fieldNames) {
+ this.fieldNames.addAll(Arrays.asList(fieldNames));
+
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71cd7c6c/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
index 161e981..dcfbec6 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
@@ -34,8 +34,13 @@ public class LuceneIndexXmlGenerator implements XmlGenerator<Region<?, ?>> {
AttributesImpl attr = new AttributesImpl();
//TODO - should the type be xs:string ?
XmlGeneratorUtils.addAttribute(attr, NAME, index.getName());
- XmlGeneratorUtils.addAttribute(attr, FIELDS, String.join(",", index.getFieldNames()));
- XmlGeneratorUtils.emptyElement(cacheXmlGenerator.getContentHandler(), PREFIX, INDEX, attr);
+ XmlGeneratorUtils.startElement(handler, PREFIX, INDEX, attr);
+ for(String field : index.getFieldNames()) {
+ AttributesImpl fieldAttr = new AttributesImpl();
+ XmlGeneratorUtils.addAttribute(fieldAttr, NAME, field);
+ XmlGeneratorUtils.emptyElement(handler, PREFIX, FIELD, fieldAttr);
+ }
+ XmlGeneratorUtils.endElement(handler, PREFIX, INDEX);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71cd7c6c/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java
index 97193b8..45c08b6 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java
@@ -7,6 +7,6 @@ public class LuceneXmlConstants {
public static final String NAME = "name";
public static final String REGION = "index";
public static final String INDEX = "index";
- public static final String FIELDS = "fields";
+ public static final String FIELD = "field";
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71cd7c6c/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java
index 8630a44..e11814a 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java
@@ -27,28 +27,52 @@ public class LuceneXmlParser extends AbstractXmlParser {
if(INDEX.equals(localName)) {
startIndex(atts);
}
+ if(FIELD.equals(localName)) {
+ startField(atts);
+ }
+ }
+
+ private void startField(Attributes atts) {
+ //Ignore any whitespace noise between fields
+ if(stack.peek() instanceof StringBuffer) {
+ stack.pop();
+ }
+ LuceneIndexCreation creation = (LuceneIndexCreation) stack.peek();
+ String name = atts.getValue(NAME);
+ creation.addField(name);
}
private void startIndex(Attributes atts) {
final RegionCreation region = (RegionCreation) stack.peek();
RegionAttributesCreation rac = (RegionAttributesCreation) region.getAttributes();
String name = atts.getValue(NAME);
- String[] fields = atts.getValue(FIELDS).split(" *, *");
rac.addAsyncEventQueueId(LuceneServiceImpl.getUniqueIndexName(name, region.getFullPath()));
-
LuceneIndexCreation indexCreation = new LuceneIndexCreation();
indexCreation.setName(name);
- indexCreation.setFieldNames(fields);
indexCreation.setRegion(region);
region.getExtensionPoint().addExtension(indexCreation, indexCreation);
- //TODO support nested field objects by adding the creation object to the stack
- //stack.push(indexCreation)
+ stack.push(indexCreation);
}
@Override
public void endElement(String uri, String localName, String qName)
throws SAXException {
- //Nothing to do.
+ if(!NAMESPACE.equals(uri)) {
+ return;
+ }
+ if(INDEX.equals(localName)) {
+ endIndex();
+ }
+ }
+
+ private void endIndex() {
+ //Ignore any whitespace noise between fields
+ if(stack.peek() instanceof StringBuffer) {
+ stack.pop();
+ }
+
+ //Remove the index creation from the stack
+ stack.pop();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71cd7c6c/gemfire-lucene/src/main/resources/META-INF/schemas/geode.incubator.apache.org/lucene/lucene-1.0.xsd
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/resources/META-INF/schemas/geode.incubator.apache.org/lucene/lucene-1.0.xsd b/gemfire-lucene/src/main/resources/META-INF/schemas/geode.incubator.apache.org/lucene/lucene-1.0.xsd
index 66a4aad..88df552 100644
--- a/gemfire-lucene/src/main/resources/META-INF/schemas/geode.incubator.apache.org/lucene/lucene-1.0.xsd
+++ b/gemfire-lucene/src/main/resources/META-INF/schemas/geode.incubator.apache.org/lucene/lucene-1.0.xsd
@@ -29,8 +29,14 @@ XML schema for Lucene indexes in Geode.
</xsd:annotation>
<xsd:element name="index">
<xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="field" maxOccurs="unbounded">
+ <xsd:complexType>
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
<xsd:attribute name="name" type="xsd:string"/>
- <xsd:attribute name="fields" type="xsd:string"/>
</xsd:complexType>
</xsd:element>
</xsd:schema>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71cd7c6c/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
index a31e7e1..3db5d73 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
@@ -3,6 +3,10 @@ package com.gemstone.gemfire.cache.lucene.internal.xml;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
@@ -26,7 +30,8 @@ public class LuceneIndexXmlGeneratorJUnitTest {
public void generateWithFields() throws SAXException {
LuceneIndex index = Mockito.mock(LuceneIndex.class);
Mockito.when(index.getName()).thenReturn("index");
- Mockito.when(index.getFieldNames()).thenReturn(new String[] {"a", "b"});
+ String[] fields = new String[] {"field1", "field2"};
+ Mockito.when(index.getFieldNames()).thenReturn(fields);
LuceneIndexXmlGenerator generator = new LuceneIndexXmlGenerator(index);
CacheXmlGenerator cacheXmlGenerator = Mockito.mock(CacheXmlGenerator.class);
@@ -34,11 +39,23 @@ public class LuceneIndexXmlGeneratorJUnitTest {
Mockito.when(cacheXmlGenerator.getContentHandler()).thenReturn(handler);
generator.generate(cacheXmlGenerator);
- ArgumentCaptor<Attributes> captor = new ArgumentCaptor<>();
+ ArgumentCaptor<Attributes> captor = ArgumentCaptor.forClass(Attributes.class);
Mockito.verify(handler).startElement(eq(""), eq("index"), eq("lucene:index"), captor.capture());
Attributes value = captor.getValue();
assertEquals("index", value.getValue(LuceneXmlConstants.NAME));
- assertEquals("a,b", value.getValue(LuceneXmlConstants.FIELDS));
+
+ captor = ArgumentCaptor.forClass(Attributes.class);
+ Mockito.verify(handler, Mockito.times(2)).startElement(eq(""), eq("field"), eq("lucene:field"), captor.capture());
+ Set<String> foundFields = new HashSet<String>();
+ for(Attributes fieldAttr : captor.getAllValues()) {
+ foundFields.add(fieldAttr.getValue(LuceneXmlConstants.NAME));
+ }
+
+ HashSet<String> expected = new HashSet<String>(Arrays.asList(fields));
+ assertEquals(expected, foundFields);
+
+ Mockito.verify(handler, Mockito.times(2)).endElement(eq(""), eq("field"), eq("lucene:field"));
+ Mockito.verify(handler).endElement(eq(""), eq("index"), eq("lucene:index"));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71cd7c6c/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
index 808c11e..ff271dd 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
@@ -28,13 +28,25 @@ public class LuceneIndexXmlParserJUnitTest {
stack.push(rc);
parser.setStack(stack);
XmlGeneratorUtils.addAttribute(attrs, LuceneXmlConstants.NAME, "index");
- XmlGeneratorUtils.addAttribute(attrs, LuceneXmlConstants.FIELDS, "a,b,c");
parser.startElement(LuceneXmlConstants.NAMESPACE, LuceneXmlConstants.INDEX, null, attrs);
+
+ AttributesImpl field1 = new AttributesImpl();
+ XmlGeneratorUtils.addAttribute(field1, LuceneXmlConstants.NAME, "field1");
+ AttributesImpl field2 = new AttributesImpl();
+ XmlGeneratorUtils.addAttribute(field2, LuceneXmlConstants.NAME, "field2");
+
+ parser.startElement(LuceneXmlConstants.NAMESPACE, LuceneXmlConstants.FIELD, null, field1);
+ parser.endElement(LuceneXmlConstants.NAMESPACE, LuceneXmlConstants.FIELD, null);
+ parser.startElement(LuceneXmlConstants.NAMESPACE, LuceneXmlConstants.FIELD, null, field2);
+ parser.endElement(LuceneXmlConstants.NAMESPACE, LuceneXmlConstants.FIELD, null);
+
+
parser.endElement(LuceneXmlConstants.NAMESPACE, LuceneXmlConstants.INDEX, null);
+ assertEquals(rc, stack.peek());
LuceneIndexCreation index = (LuceneIndexCreation) rc.getExtensionPoint().getExtensions().iterator().next();
assertEquals("index", index.getName());
- assertArrayEquals(new String[] {"a", "b", "c"}, index.getFieldNames());
+ assertArrayEquals(new String[] {"field1", "field2"}, index.getFieldNames());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71cd7c6c/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml b/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml
index 8350650..7f804e0 100644
--- a/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml
+++ b/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml
@@ -10,7 +10,15 @@
version="9.0">
<region name="region" refid="PARTITION">
- <lucene:index name="index1" fields="a, b,c,d"/>
- <lucene:index name="index2" fields="f,g"/>
+ <lucene:index name="index1">
+ <lucene:field name="a"/>
+ <lucene:field name="b"/>
+ <lucene:field name="c"/>
+ <lucene:field name="d"/>
+ </lucene:index>
+ <lucene:index name="index2">
+ <lucene:field name="f"/>
+ <lucene:field name="g"/>
+ </lucene:index>
</region>
</cache>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71cd7c6c/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml b/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml
index 8350650..7f804e0 100644
--- a/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml
+++ b/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml
@@ -10,7 +10,15 @@
version="9.0">
<region name="region" refid="PARTITION">
- <lucene:index name="index1" fields="a, b,c,d"/>
- <lucene:index name="index2" fields="f,g"/>
+ <lucene:index name="index1">
+ <lucene:field name="a"/>
+ <lucene:field name="b"/>
+ <lucene:field name="c"/>
+ <lucene:field name="d"/>
+ </lucene:index>
+ <lucene:index name="index2">
+ <lucene:field name="f"/>
+ <lucene:field name="g"/>
+ </lucene:index>
</region>
</cache>
\ No newline at end of file
[33/50] [abbrv] incubator-geode git commit: Adding a TODO to
LuceneIndexCreation about the attributes mutator
Posted by as...@apache.org.
Adding a TODO to LuceneIndexCreation about the attributes mutator
We may need to do something different for replicated regions than what
is being done here in onCreate.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7d50cf15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7d50cf15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7d50cf15
Branch: refs/heads/develop
Commit: 7d50cf15b2d2bac36a046bb817d45b89bdcd69e7
Parents: 5d7535a
Author: Dan Smith <up...@apache.org>
Authored: Thu Oct 15 16:20:54 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Fri Oct 16 12:46:55 2015 -0700
----------------------------------------------------------------------
.../gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d50cf15/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
index 3609ae8..b2f2645 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
@@ -75,6 +75,8 @@ public class LuceneIndexCreation implements LuceneIndex, Extension<Region<?, ?>>
String aeqId = LuceneServiceImpl.getUniqueIndexName(getName(), getRegionPath());
//Here, it is safe to add the aeq with the mutator, because onCreate is
//fired in a special place before the region is initialized.
+ //TODO - this may only work for PRs. We need to intercept the attributes
+ //before the region is created with a RegionListener.
region.getAttributesMutator().addAsyncEventQueueId(aeqId);
service.afterDataRegionCreated(getName(), new StandardAnalyzer(), getRegionPath(), getFieldNames());
}
[36/50] [abbrv] incubator-geode git commit: Adding a junit test for
LuceneResultStructImpl
Posted by as...@apache.org.
Adding a junit test for LuceneResultStructImpl
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/5c09e688
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/5c09e688
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/5c09e688
Branch: refs/heads/develop
Commit: 5c09e6886801ba925a6107d6b1412fc4cfc2ed32
Parents: 8b56020
Author: Dan Smith <up...@apache.org>
Authored: Fri Oct 16 13:04:47 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Fri Oct 16 13:54:53 2015 -0700
----------------------------------------------------------------------
.../LuceneResultStructImpJUnitTest.java | 32 ++++++++++++++++++++
1 file changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5c09e688/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpJUnitTest.java
new file mode 100644
index 0000000..bc9ad33
--- /dev/null
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpJUnitTest.java
@@ -0,0 +1,32 @@
+package com.gemstone.gemfire.cache.lucene.internal;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
+@Category(UnitTest.class)
+public class LuceneResultStructImpJUnitTest {
+
+ @Test
+ public void hashCodeAndEquals() {
+
+ //Create 2 equal structs
+ LuceneResultStructImpl<String, String> result1 = new LuceneResultStructImpl<String, String>("key1", "value1", 5);
+ LuceneResultStructImpl<String, String> result2 = new LuceneResultStructImpl<String, String>("key1", "value1", 5);
+ assertEquals(result1, result1);
+ assertEquals(result1, result2);
+ assertEquals(result1.hashCode(), result2.hashCode());
+
+ //And some unequal ones
+ LuceneResultStructImpl<String, String> result3 = new LuceneResultStructImpl<String, String>("key2", "value1", 5);
+ LuceneResultStructImpl<String, String> result4 = new LuceneResultStructImpl<String, String>("key1", "value2", 5);
+ LuceneResultStructImpl<String, String> result5 = new LuceneResultStructImpl<String, String>("key1", "value1", 6);
+ assertNotEquals(result1, result3);
+ assertNotEquals(result1, result4);
+ assertNotEquals(result1, result5);
+ }
+
+}
[04/50] [abbrv] incubator-geode git commit: Changing how
PartitionRepositoryManager handles destroyed buckets
Posted by as...@apache.org.
Changing how PartitionRepositoryManager handles destroyed buckets
This class was using a weak hash map with BucketRegions as keys. Instead
of that, use the bucket id as the key. I added support to
IndexRepository for the repository to indicate if the underlying
BucketRegion has been destroyed. If the IndexRepository is destroyed, we
will create a new IndexRepository in PartitionRepositoryManager.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/dc3e8f75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/dc3e8f75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/dc3e8f75
Branch: refs/heads/develop
Commit: dc3e8f75c4bb26d0b3223709acffa426e208f301
Parents: 3ad1fe7
Author: Dan Smith <up...@apache.org>
Authored: Tue Sep 22 14:22:35 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Tue Sep 22 14:25:14 2015 -0700
----------------------------------------------------------------------
.../internal/PartitionedRepositoryManager.java | 33 +++++++++++++-------
.../internal/repository/IndexRepository.java | 7 +++++
.../repository/IndexRepositoryImpl.java | 12 +++++--
.../PartitionedRepositoryManagerJUnitTest.java | 26 +++++++++++++++
.../IndexRepositoryImplJUnitTest.java | 9 ++++--
5 files changed, 70 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dc3e8f75/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
index e301482..bcec1c9 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
import com.gemstone.gemfire.internal.cache.BucketRegion;
import com.gemstone.gemfire.internal.cache.LocalDataSet;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
-import com.gemstone.gemfire.internal.util.concurrent.CopyOnWriteWeakHashMap;
+import com.gemstone.gemfire.internal.util.concurrent.CopyOnWriteHashMap;
/**
* Manages index repositories for partitioned regions.
@@ -38,7 +38,7 @@ public class PartitionedRepositoryManager implements RepositoryManager {
*
* It is weak so that the old BucketRegion will be garbage collected.
*/
- CopyOnWriteWeakHashMap<BucketRegion, IndexRepository> indexRepositories = new CopyOnWriteWeakHashMap<BucketRegion, IndexRepository>();
+ CopyOnWriteHashMap<Integer, IndexRepository> indexRepositories = new CopyOnWriteHashMap<Integer, IndexRepository>();
/** The user region for this index */
private final PartitionedRegion userRegion;
@@ -73,7 +73,7 @@ public class PartitionedRepositoryManager implements RepositoryManager {
throw new BucketNotFoundException("User bucket was not found for region " + region + "key " + key + " callbackarg " + callbackArg);
}
- return getRepository(userBucket);
+ return getRepository(userBucket.getId());
}
@Override
@@ -90,7 +90,7 @@ public class PartitionedRepositoryManager implements RepositoryManager {
if(userBucket == null) {
throw new BucketNotFoundException("User bucket was not found for region " + region + "bucket id " + bucketId);
} else {
- repos.add(getRepository(userBucket));
+ repos.add(getRepository(userBucket.getId()));
}
}
@@ -100,15 +100,24 @@ public class PartitionedRepositoryManager implements RepositoryManager {
/**
* Return the repository for a given user bucket
*/
- private IndexRepository getRepository(BucketRegion userBucket) throws BucketNotFoundException {
- IndexRepository repo = indexRepositories.get(userBucket);
+ private IndexRepository getRepository(Integer bucketId) throws BucketNotFoundException {
+ IndexRepository repo = indexRepositories.get(bucketId);
+
+ //Remove the repository if it has been destroyed (due to rebalancing)
+ if(repo != null && repo.isClosed()) {
+ indexRepositories.remove(bucketId, repo);
+ repo = null;
+ }
+
if(repo == null) {
try {
- RegionDirectory dir = new RegionDirectory(getMatchingBucket(userBucket, fileRegion), getMatchingBucket(userBucket, chunkRegion));
+ BucketRegion fileBucket = getMatchingBucket(fileRegion, bucketId);
+ BucketRegion chunkBucket = getMatchingBucket(chunkRegion, bucketId);
+ RegionDirectory dir = new RegionDirectory(fileBucket, chunkBucket);
IndexWriterConfig config = new IndexWriterConfig(analyzer);
IndexWriter writer = new IndexWriter(dir, config);
- repo = new IndexRepositoryImpl(writer, serializer);
- IndexRepository oldRepo = indexRepositories.putIfAbsent(userBucket, repo);
+ repo = new IndexRepositoryImpl(fileBucket, writer, serializer);
+ IndexRepository oldRepo = indexRepositories.putIfAbsent(bucketId, repo);
if(oldRepo != null) {
repo = oldRepo;
}
@@ -123,10 +132,10 @@ public class PartitionedRepositoryManager implements RepositoryManager {
/**
* Find the bucket in region2 that matches the bucket id from region1.
*/
- private BucketRegion getMatchingBucket(BucketRegion region1, PartitionedRegion region2) throws BucketNotFoundException {
- BucketRegion result = region2.getDataStore().getLocalBucketById(region1.getId());
+ private BucketRegion getMatchingBucket(PartitionedRegion region, Integer bucketId) throws BucketNotFoundException {
+ BucketRegion result = region.getDataStore().getLocalBucketById(bucketId);
if(result == null) {
- throw new BucketNotFoundException("Bucket not found for region " + region2 + " bucekt id " + region1.getId());
+ throw new BucketNotFoundException("Bucket not found for region " + region + " bucekt id " + bucketId);
}
return result;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dc3e8f75/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepository.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepository.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepository.java
index 549bf21..b852b82 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepository.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepository.java
@@ -45,4 +45,11 @@ public interface IndexRepository {
* @throws IOException
*/
void commit() throws IOException;
+
+ /**
+ * Check to see if this repository is closed due to
+ * underlying resources being closed or destroyed
+ * @return true if this repository is closed.
+ */
+ public boolean isClosed();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dc3e8f75/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java
index 5c248cf..fbbc5db 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java
@@ -11,6 +11,7 @@ import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.SearcherManager;
import org.apache.lucene.search.TopDocs;
+import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.LuceneSerializer;
import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.SerializerUtil;
@@ -26,8 +27,10 @@ public class IndexRepositoryImpl implements IndexRepository {
private final IndexWriter writer;
private final LuceneSerializer serializer;
private final SearcherManager searcherManager;
+ private Region<?,?> region;
- public IndexRepositoryImpl(IndexWriter writer, LuceneSerializer serializer) throws IOException {
+ public IndexRepositoryImpl(Region<?,?> region, IndexWriter writer, LuceneSerializer serializer) throws IOException {
+ this.region = region;
this.writer = writer;
searcherManager = new SearcherManager(writer, APPLY_ALL_DELETES, null);
this.serializer = serializer;
@@ -83,6 +86,9 @@ public class IndexRepositoryImpl implements IndexRepository {
public LuceneSerializer getSerializer() {
return serializer;
}
-
-
+
+ @Override
+ public boolean isClosed() {
+ return region.isDestroyed();
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dc3e8f75/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
index db1085a..367f4f2 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
@@ -83,6 +83,32 @@ public class PartitionedRepositoryManagerJUnitTest {
}
/**
+ * Test what happens when a bucket is destroyed.
+ */
+ @Test
+ public void destroyBucket() throws BucketNotFoundException, IOException {
+ PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer, new StandardAnalyzer());
+
+ BucketRegion mockBucket0 = getMockBucket(0);
+
+ IndexRepositoryImpl repo0 = (IndexRepositoryImpl) repoManager.getRepository(userRegion, 0, null);
+
+ assertNotNull(repo0);
+ checkRepository(repo0, 0);
+
+ BucketRegion fileBucket0 = fileBuckets.get(0);
+
+ //Simulate rebalancing of a bucket by marking the old bucket is destroyed
+ //and creating a new bucket
+ Mockito.when(fileBucket0.isDestroyed()).thenReturn(true);
+ mockBucket0 = getMockBucket(0);
+
+ IndexRepositoryImpl newRepo0 = (IndexRepositoryImpl) repoManager.getRepository(userRegion, 0, null);
+ assertNotEquals(repo0, newRepo0);
+ checkRepository(newRepo0, 0);
+ }
+
+ /**
* Test that we get the expected exception when a user bucket is missing
*/
@Test(expected = BucketNotFoundException.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dc3e8f75/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
index 0b4a4cd..3a25c97 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
@@ -1,6 +1,6 @@
package com.gemstone.gemfire.cache.lucene.internal.repository;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
import java.io.IOException;
import java.io.Serializable;
@@ -18,7 +18,9 @@ import org.apache.lucene.queryparser.classic.QueryParser;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.mockito.Mockito;
+import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.lucene.internal.directory.RegionDirectory;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
@@ -38,6 +40,7 @@ public class IndexRepositoryImplJUnitTest {
private HeterogenousLuceneSerializer mapper;
private StandardAnalyzer analyzer = new StandardAnalyzer();
private IndexWriter writer;
+ private Region region;
@Before
public void setUp() throws IOException {
@@ -48,7 +51,9 @@ public class IndexRepositoryImplJUnitTest {
writer = new IndexWriter(dir, config);
String[] indexedFields= new String[] {"s", "i", "l", "d", "f", "s2", "missing"};
mapper = new HeterogenousLuceneSerializer(indexedFields);
- repo = new IndexRepositoryImpl(writer, mapper);
+ region = Mockito.mock(Region.class);
+ Mockito.when(region.isDestroyed()).thenReturn(false);
+ repo = new IndexRepositoryImpl(region, writer, mapper);
}
@Test
[35/50] [abbrv] incubator-geode git commit: Passing the
totalNumBuckets to the lucene index regions
Posted by as...@apache.org.
Passing the totalNumBuckets to the lucene index regions
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8b56020d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8b56020d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8b56020d
Branch: refs/heads/develop
Commit: 8b56020d1e6968e6a2a91bec20f00565ed168d9f
Parents: 7d50cf1
Author: Dan Smith <up...@apache.org>
Authored: Fri Oct 16 12:46:37 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Fri Oct 16 12:46:55 2015 -0700
----------------------------------------------------------------------
.../cache/lucene/internal/LuceneIndexForPartitionedRegion.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8b56020d/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
index d0bb328..0e5b424 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
@@ -2,6 +2,7 @@ package com.gemstone.gemfire.cache.lucene.internal;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.PartitionAttributes;
import com.gemstone.gemfire.cache.PartitionAttributesFactory;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.RegionShortcut;
@@ -64,9 +65,11 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
// create PR fileRegion, but not to create its buckets for now
final String fileRegionName = LuceneServiceImpl.getUniqueIndexName(indexName, regionPath)+".files";
fileRegion = cache.<String, File> getRegion(fileRegionName);
+ PartitionAttributes partitionAttributes = dataRegion.getPartitionAttributes();
if (null == fileRegion) {
fileRegion = cache.<String, File> createRegionFactory(regionShortCut)
.setPartitionAttributes(new PartitionAttributesFactory<String, File>().setColocatedWith(regionPath)
+ .setTotalNumBuckets(partitionAttributes.getTotalNumBuckets())
.create())
.create(fileRegionName);
}
@@ -77,6 +80,7 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
if (null == chunkRegion) {
chunkRegion = cache.<ChunkKey, byte[]> createRegionFactory(regionShortCut)
.setPartitionAttributes(new PartitionAttributesFactory<ChunkKey, byte[]>().setColocatedWith(fileRegionName)
+ .setTotalNumBuckets(partitionAttributes.getTotalNumBuckets())
.create())
.create(chunkRegionName);
}
[20/50] [abbrv] incubator-geode git commit: GEODE-11: Add test to
compare inter-buckets scores
Posted by as...@apache.org.
GEODE-11: Add test to compare inter-buckets scores
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/75abaf5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/75abaf5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/75abaf5a
Branch: refs/heads/develop
Commit: 75abaf5adfbdbf23bbc8f1542be4001eec2a7176
Parents: 8fa82ab
Author: Ashvin Agrawal <as...@apache.org>
Authored: Wed Sep 30 15:33:53 2015 -0700
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Wed Sep 30 20:10:54 2015 -0700
----------------------------------------------------------------------
.../DistributedScoringJUnitTest.java | 136 +++++++++++++++++++
1 file changed, 136 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/75abaf5a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
new file mode 100644
index 0000000..d18c520
--- /dev/null
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
@@ -0,0 +1,136 @@
+package com.gemstone.gemfire.cache.lucene.internal.distributed;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.queryparser.classic.QueryParser;
+import org.apache.lucene.search.Query;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.Mockito;
+
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.lucene.internal.directory.RegionDirectory;
+import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey;
+import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
+import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepositoryImpl;
+import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
+@Category(UnitTest.class)
+public class DistributedScoringJUnitTest {
+ class TestType {
+ String txt;
+
+ public TestType(String txt) {
+ this.txt = txt;
+ }
+ }
+
+ String[] indexedFields = new String[] { "txt" };
+ HeterogenousLuceneSerializer mapper = new HeterogenousLuceneSerializer(indexedFields);
+
+ final StandardAnalyzer analyzer = new StandardAnalyzer();
+ Region<String, String> region;
+
+ @Before
+ public void createMocks() {
+ region = Mockito.mock(Region.class);
+ Mockito.when(region.isDestroyed()).thenReturn(false);
+ }
+
+ /*
+ * The goal of this test is to verify fair scoring if entries are uniformly distributed. It compares ordered results
+ * from a single IndexRepository (IR) with merged-ordered results from multiple repositories (ir1, ir2, ir3). The
+ * records inserted in IR are same as the combined records in irX. This simulates merging of results from buckets of a
+ * region.
+ */
+ @Test
+ public void uniformDistributionProducesComparableScores() throws Exception {
+ // the strings below have been grouped to be split between three index repositories
+ String[] testStrings = {
+ "hello world",
+ "foo bar",
+ "just any string",
+
+ "hello world is usually the first program",
+ "water on mars",
+ "test world",
+
+ "hello",
+ "test hello test",
+ "find the aliens", };
+
+ QueryParser parser = new QueryParser("txt", analyzer);
+ Query query = parser.parse("hello world");
+
+ IndexRepositoryImpl singleIndexRepo = createIndexRepo();
+ populateIndex(testStrings, singleIndexRepo, 0, testStrings.length);
+
+ TopEntriesCollector collector = new TopEntriesCollector();
+ singleIndexRepo.query(query, 100, collector);
+ List<EntryScore> singleResult = collector.getEntries().getHits();
+
+ IndexRepositoryImpl distIR1 = createIndexRepo();
+ populateIndex(testStrings, distIR1, 0, testStrings.length / 3);
+
+ IndexRepositoryImpl distIR2 = createIndexRepo();
+ populateIndex(testStrings, distIR2, testStrings.length / 3, (testStrings.length * 2) / 3);
+
+ IndexRepositoryImpl distIR3 = createIndexRepo();
+ populateIndex(testStrings, distIR3, (testStrings.length * 2) / 3, testStrings.length);
+
+ ArrayList<TopEntriesCollector> collectors = new ArrayList<>();
+ TopEntriesCollectorManager manager = new TopEntriesCollectorManager();
+
+ TopEntriesCollector collector1 = manager.newCollector("");
+ distIR1.query(query, 100, collector1);
+ collectors.add(collector1);
+
+ TopEntriesCollector collector2 = manager.newCollector("");
+ distIR2.query(query, 100, collector2);
+ collectors.add(collector2);
+
+ TopEntriesCollector collector3 = manager.newCollector("");
+ distIR3.query(query, 100, collector3);
+ collectors.add(collector3);
+
+ List<EntryScore> distResult = manager.reduce(collectors).getEntries().getHits();
+
+ Assert.assertEquals(singleResult.size(), distResult.size());
+ Assert.assertTrue(singleResult.size() > 0);
+
+ for (Iterator single = distResult.iterator(), dist = singleResult.iterator(); single.hasNext() && dist.hasNext();) {
+ EntryScore singleScore = (EntryScore) single.next();
+ EntryScore distScore = (EntryScore) dist.next();
+ Assert.assertEquals(singleScore.getKey(), distScore.getKey());
+ }
+ }
+
+ private void populateIndex(String[] testStrings, IndexRepositoryImpl repo, int start, int end) throws IOException {
+ for (int i = start; i < end; i++) {
+ String key = "key-" + i;
+ repo.create(key, new TestType(testStrings[i]));
+ }
+ repo.commit();
+ }
+
+ private IndexRepositoryImpl createIndexRepo() throws IOException {
+ ConcurrentHashMap<String, File> fileRegion = new ConcurrentHashMap<String, File>();
+ ConcurrentHashMap<ChunkKey, byte[]> chunkRegion = new ConcurrentHashMap<ChunkKey, byte[]>();
+ RegionDirectory dir = new RegionDirectory(fileRegion, chunkRegion);
+
+ IndexWriterConfig config = new IndexWriterConfig(analyzer);
+ IndexWriter writer = new IndexWriter(dir, config);
+
+ return new IndexRepositoryImpl(region, writer, mapper);
+ }
+}
\ No newline at end of file
[40/50] [abbrv] incubator-geode git commit: GEODE-11: Pass limit to
Collectors while searching
Posted by as...@apache.org.
GEODE-11: Pass limit to Collectors while searching
User provides result limit while creating query. Query needs to relay the limit
information to CollectorManager and ResultCollector before executing search so
that the result list is trimmed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b59c57d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b59c57d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b59c57d5
Branch: refs/heads/develop
Commit: b59c57d553d61689711c8e0e8532bede3a1a4322
Parents: 28a0eb8
Author: Ashvin Agrawal <as...@apache.org>
Authored: Sat Oct 17 15:24:59 2015 -0700
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Sat Oct 17 15:24:59 2015 -0700
----------------------------------------------------------------------
.../lucene/internal/LuceneQueryFactoryImpl.java | 10 +--
.../cache/lucene/internal/LuceneQueryImpl.java | 7 +--
.../TopEntriesFunctionCollector.java | 2 +-
.../internal/LuceneQueryImplJUnitTest.java | 66 +++++++++++++-------
.../distributed/LuceneFunctionJUnitTest.java | 9 +--
5 files changed, 51 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b59c57d5/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
index 2a602a5..b377949 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
@@ -1,10 +1,5 @@
package com.gemstone.gemfire.cache.lucene.internal;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.lucene.queryparser.classic.ParseException;
-
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.lucene.LuceneQuery;
@@ -34,13 +29,12 @@ public class LuceneQueryFactoryImpl implements LuceneQueryFactory {
}
@Override
- public <K, V> LuceneQuery<K, V> create(String indexName, String regionName,
- String queryString) {
+ public <K, V> LuceneQuery<K, V> create(String indexName, String regionName, String queryString) {
return create(indexName, regionName, new StringQueryProvider(queryString));
}
public <K, V> LuceneQuery<K, V> create(String indexName, String regionName, LuceneQueryProvider provider) {
- Region region = cache.getRegion(regionName);
+ Region<K, V> region = cache.getRegion(regionName);
LuceneQueryImpl<K, V> luceneQuery = new LuceneQueryImpl<K, V>(indexName, region, provider, projectionFields, limit, pageSize);
return luceneQuery;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b59c57d5/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
index c3e367b..222acdc 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
@@ -36,9 +36,9 @@ public class LuceneQueryImpl<K, V> implements LuceneQuery<K, V> {
@Override
public LuceneQueryResults<K, V> search() {
- LuceneFunctionContext<TopEntriesCollector> context = new LuceneFunctionContext<>(query, indexName,
- new TopEntriesCollectorManager());
- TopEntriesFunctionCollector collector = new TopEntriesFunctionCollector();
+ TopEntriesCollectorManager manager = new TopEntriesCollectorManager(null, limit);
+ LuceneFunctionContext<TopEntriesCollector> context = new LuceneFunctionContext<>(query, indexName, manager, limit);
+ TopEntriesFunctionCollector collector = new TopEntriesFunctionCollector(context);
ResultCollector<TopEntriesCollector, TopEntries> rc = (ResultCollector<TopEntriesCollector, TopEntries>) FunctionService.onRegion(region)
.withArgs(context)
@@ -65,5 +65,4 @@ public class LuceneQueryImpl<K, V> implements LuceneQuery<K, V> {
public String[] getProjectedFieldNames() {
return this.projectedFieldNames;
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b59c57d5/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
index 032e136..96ec296 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
@@ -43,7 +43,7 @@ public class TopEntriesFunctionCollector implements ResultCollector<TopEntriesCo
private TopEntriesCollector mergedResults;
public TopEntriesFunctionCollector() {
- this(null, null);
+ this(null);
}
public TopEntriesFunctionCollector(LuceneFunctionContext<TopEntriesCollector> context) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b59c57d5/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java
index d3ffd19..e26ab00 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java
@@ -1,6 +1,7 @@
package com.gemstone.gemfire.cache.lucene.internal;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.util.List;
@@ -17,62 +18,81 @@ import com.gemstone.gemfire.cache.execute.FunctionAdapter;
import com.gemstone.gemfire.cache.execute.FunctionContext;
import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.cache.lucene.LuceneQueryResults;
+import com.gemstone.gemfire.cache.lucene.LuceneResultStruct;
import com.gemstone.gemfire.cache.lucene.internal.distributed.LuceneFunction;
import com.gemstone.gemfire.cache.lucene.internal.distributed.LuceneFunctionContext;
import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesCollector;
+import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesCollectorManager;
+import com.gemstone.gemfire.cache.lucene.internal.repository.IndexResultCollector;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class LuceneQueryImplJUnitTest {
-
+ private static int LIMIT = 123;
private Cache cache;
private Region<Object, Object> region;
+
@Before
public void createCache() {
cache = new CacheFactory().set("mcast-port", "0").create();
region = cache.createRegionFactory(RegionShortcut.REPLICATE).create("region");
}
-
+
@After
public void removeCache() {
FunctionService.unregisterFunction(LuceneFunction.ID);
cache.close();
}
+
@Test
public void test() {
- //Register a fake function to observe the function invocation
+ // Register a fake function to observe the function invocation
FunctionService.unregisterFunction(LuceneFunction.ID);
TestLuceneFunction function = new TestLuceneFunction();
FunctionService.registerFunction(function);
-
-
+
StringQueryProvider provider = new StringQueryProvider();
- LuceneQueryImpl query = new LuceneQueryImpl("index", region, provider, null, 100, 20);
- LuceneQueryResults results = query.search();
- List nextPage = results.getNextPage();
- assertEquals(3, nextPage.size());
- assertEquals(.3f, results.getMaxScore(), 0.01);
+ LuceneQueryImpl<Object, Object> query = new LuceneQueryImpl<>("index", region, provider, null, LIMIT, 20);
+ LuceneQueryResults<Object, Object> results = query.search();
+
assertTrue(function.wasInvoked);
-
- LuceneFunctionContext args = (LuceneFunctionContext) function.args;
- assertEquals(provider.getQueryString(), ((StringQueryProvider) args.getQueryProvider()).getQueryString());
- assertEquals("index", args.getIndexName());
- assertEquals(100, args.getLimit());
+ assertEquals(2f * LIMIT, results.getMaxScore(), 0.01);
+ int resultCount = 0;
+ while (results.hasNextPage()) {
+ List<LuceneResultStruct<Object, Object>> nextPage = results.getNextPage();
+ resultCount += nextPage.size();
+ if (results.hasNextPage()) {
+ assertEquals(20, nextPage.size());
+ }
+ }
+ assertEquals(LIMIT, resultCount);
+
+ LuceneFunctionContext<? extends IndexResultCollector> funcArgs = function.args;
+ assertEquals(provider.getQueryString(), ((StringQueryProvider) funcArgs.getQueryProvider()).getQueryString());
+ assertEquals("index", funcArgs.getIndexName());
+ assertEquals(LIMIT, funcArgs.getLimit());
}
private static class TestLuceneFunction extends FunctionAdapter {
-
+ private static final long serialVersionUID = 1L;
private boolean wasInvoked;
- private Object args;
+ private LuceneFunctionContext<? extends IndexResultCollector> args;
@Override
public void execute(FunctionContext context) {
- this.args = context.getArguments();
+ this.args = (LuceneFunctionContext<?>) context.getArguments();
+ TopEntriesCollectorManager manager = (TopEntriesCollectorManager) args.getCollectorManager();
+
+ assertEquals(LIMIT, manager.getLimit());
+
wasInvoked = true;
- TopEntriesCollector lastResult = new TopEntriesCollector();
- lastResult.collect(3, .3f);
- lastResult.collect(2, .2f);
- lastResult.collect(1, .1f);
+ TopEntriesCollector lastResult = new TopEntriesCollector(null, 2 * LIMIT);
+ // put more than LIMIT entries. The resultCollector should trim the results
+ for (int i = LIMIT * 2; i >= 0; i--) {
+ lastResult.collect(i, i * 1f);
+ }
+ assertEquals(LIMIT * 2, lastResult.getEntries().getHits().size());
+
context.getResultSender().lastResult(lastResult);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b59c57d5/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
index 431ed4c..419aa26 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
@@ -1,6 +1,6 @@
package com.gemstone.gemfire.cache.lucene.internal.distributed;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.util.ArrayList;
@@ -21,11 +21,9 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
import com.gemstone.gemfire.cache.execute.ResultSender;
import com.gemstone.gemfire.cache.lucene.LuceneQueryFactory;
import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider;
-import com.gemstone.gemfire.cache.lucene.LuceneService;
import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneIndex;
import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneService;
import com.gemstone.gemfire.cache.lucene.internal.StringQueryProvider;
@@ -36,7 +34,6 @@ import com.gemstone.gemfire.cache.query.QueryException;
import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
import com.gemstone.gemfire.internal.cache.InternalCache;
import com.gemstone.gemfire.internal.cache.execute.InternalRegionFunctionContext;
-import com.gemstone.gemfire.internal.cache.extension.ExtensionPoint;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
@Category(UnitTest.class)
@@ -63,7 +60,7 @@ public class LuceneFunctionJUnitTest {
InternalLuceneIndex mockIndex;
ArrayList<IndexRepository> repos;
- LuceneFunctionContext searchArgs;
+ LuceneFunctionContext<IndexResultCollector> searchArgs;
LuceneQueryProvider queryProvider;
Query query;
@@ -381,7 +378,6 @@ public class LuceneFunctionJUnitTest {
searchArgs = new LuceneFunctionContext<IndexResultCollector>(queryProvider, "indexName");
- final ExtensionPoint mockExtensionPoint = mocker.mock(ExtensionPoint.class);
mocker.checking(new Expectations() {{
allowing(mockRegion).getCache();
will(returnValue(mockCache));
@@ -395,7 +391,6 @@ public class LuceneFunctionJUnitTest {
will(returnValue(mockRepoManager));
allowing(mockIndex).getFieldNames();
will(returnValue(new String[] {"gemfire"}));
-
}});
query = queryProvider.getQuery(mockIndex);
[47/50] [abbrv] incubator-geode git commit: GEODE-11: Move Lucene
dependency version info to versions file
Posted by as...@apache.org.
GEODE-11: Move Lucene dependency version info to versions file
See commit dc5d343 or GEODE 227 for additional details.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/37cc70ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/37cc70ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/37cc70ed
Branch: refs/heads/develop
Commit: 37cc70edf7c6e519684b1ce9903a364c251d7d22
Parents: 300397c
Author: Ashvin Agrawal <as...@apache.org>
Authored: Mon Nov 9 10:32:16 2015 -0800
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Mon Nov 9 10:33:45 2015 -0800
----------------------------------------------------------------------
gemfire-lucene/build.gradle | 22 +++++++++++-----------
gradle/dependency-versions.properties | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/37cc70ed/gemfire-lucene/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-lucene/build.gradle b/gemfire-lucene/build.gradle
index 40313c5..6c3adda 100644
--- a/gemfire-lucene/build.gradle
+++ b/gemfire-lucene/build.gradle
@@ -2,27 +2,27 @@ dependencies {
provided project(':gemfire-core')
provided project(':gemfire-common')
- compile 'org.apache.lucene:lucene-analyzers-common:5.3.0'
- compile 'org.apache.lucene:lucene-core:5.3.0'
- compile 'org.apache.lucene:lucene-queries:5.3.0'
- compile 'org.apache.lucene:lucene-queryparser:5.3.0'
+ compile 'org.apache.lucene:lucene-analyzers-common:' + project.'lucene.version'
+ compile 'org.apache.lucene:lucene-core:' + project.'lucene.version'
+ compile 'org.apache.lucene:lucene-queries:' + project.'lucene.version'
+ compile 'org.apache.lucene:lucene-queryparser:' + project.'lucene.version'
provided project(path: ':gemfire-junit', configuration: 'testOutput')
//Lucene test framework.
- testCompile 'org.apache.lucene:lucene-test-framework:5.3.0'
- testCompile 'org.apache.lucene:lucene-codecs:5.3.0'
+ testCompile 'org.apache.lucene:lucene-test-framework:' + project.'lucene.version'
+ testCompile 'org.apache.lucene:lucene-codecs:' + project.'lucene.version'
testCompile project(path: ':gemfire-core', configuration: 'testOutput', transitive: false)
- //Dependency ot lucene-test-framework. Can we turn on transitive depencies for
+ //Dependency of lucene-test-framework. Can we turn on transitive dependencies for
//the test framework somehow? We've disabled them globally in the parent
//build.gadle.
testCompile 'com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.1.6'
// the following test dependencies are needed for mocking cache instance
- testRuntime 'org.apache.hadoop:hadoop-common:2.4.1'
- testRuntime 'org.apache.hadoop:hadoop-hdfs:2.4.1'
- testRuntime 'com.google.guava:guava:11.0.2'
- testRuntime 'commons-collections:commons-collections:3.2.1'
+ testRuntime 'org.apache.hadoop:hadoop-common:' + project.'hadoop.version'
+ testRuntime 'org.apache.hadoop:hadoop-hdfs:' + project.'hadoop.version'
+ testRuntime 'com.google.guava:guava:' + project.'guava.version'
+ testRuntime 'commons-collections:commons-collections:' + project.'commons-collections.version'
}
//The lucene integration tests don't have any issues that requiring forking
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/37cc70ed/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
index 5fc6fbc..8be0f15 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -40,7 +40,7 @@ json4s.version = 3.2.4
junit.version = 4.12
JUnitParams.version = 1.0.4
log4j.version = 2.1
-lucene.version = 5.0.0
+lucene.version = 5.3.0
mockito-core.version = 1.10.19
multithreadedtc.version = 1.01
mx4j.version = 3.0.1
[13/50] [abbrv] incubator-geode git commit: Refactoring
LuceneFunction, LuceneQueryProvider, and LuceneQueryFactory
Posted by as...@apache.org.
Refactoring LuceneFunction, LuceneQueryProvider, and LuceneQueryFactory
LuceneFunction had a static RepositoryManager, I changed the code to get
look up the RepositoryManager from the LuceneService.
As part of that work, I noticed StringQueryProvider really needed access
to the index to lookup the field names, analyzer, etc. So I changed the
getQuery method to take an index, and removed the unneeded string
parameters.
Finally, I removed some of the mocking from
LuceneFunctionReadPathDUnitTest, which exposed some other issues:
* I switched RepositoryManager.getRepositories back to using a
RegionFunctionContext, because apparently context.getDataSet is *not*
the local data set.
* I canonicalized the regionPaths in LuceneService
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8fb4ad7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8fb4ad7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8fb4ad7a
Branch: refs/heads/develop
Commit: 8fb4ad7a23db081377e1a93b7da839809095eb70
Parents: 58f13e2
Author: Dan Smith <up...@apache.org>
Authored: Wed Sep 23 13:37:05 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Wed Sep 23 15:42:38 2015 -0700
----------------------------------------------------------------------
.../internal/cache/GemFireCacheImpl.java | 2 +-
.../gemfire/internal/cache/InternalCache.java | 3 +-
.../internal/cache/xmlcache/CacheCreation.java | 2 +-
.../cache/lucene/LuceneQueryFactory.java | 16 ----
.../cache/lucene/LuceneQueryProvider.java | 3 +-
.../cache/lucene/LuceneServiceProvider.java | 3 +-
.../lucene/internal/InternalLuceneIndex.java | 10 +++
.../lucene/internal/InternalLuceneService.java | 9 ++
.../cache/lucene/internal/LuceneIndexImpl.java | 3 +-
.../lucene/internal/LuceneQueryFactoryImpl.java | 31 ++-----
.../cache/lucene/internal/LuceneQueryImpl.java | 11 +--
.../lucene/internal/LuceneServiceImpl.java | 20 +++--
.../internal/PartitionedRepositoryManager.java | 13 +--
.../lucene/internal/StringQueryProvider.java | 45 ++--------
.../internal/distributed/LuceneFunction.java | 26 +++---
.../distributed/LuceneFunctionContext.java | 26 ++++--
.../internal/repository/RepositoryManager.java | 2 +-
.../internal/LuceneServiceImplJUnitTest.java | 12 +--
.../PartitionedRepositoryManagerJUnitTest.java | 13 ++-
.../internal/StringQueryProviderJUnitTest.java | 22 ++---
.../LuceneFunctionContextJUnitTest.java | 8 +-
.../distributed/LuceneFunctionJUnitTest.java | 95 +++++++++++++-------
.../LuceneFunctionReadPathDUnitTest.java | 80 ++++++++---------
.../TopEntriesFunctionCollectorJUnitTest.java | 6 +-
.../IndexRepositoryImplJUnitTest.java | 6 ++
25 files changed, 239 insertions(+), 228 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
index ed83a76..6fe639b 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
@@ -238,7 +238,7 @@ import com.sun.jna.Platform;
* @author Darrel Schneider
*/
@SuppressWarnings("deprecation")
-public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePerfStats, DistributionAdvisee, Extensible<Cache> {
+public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePerfStats, DistributionAdvisee {
private static final Logger logger = LogService.getLogger();
// moved *SERIAL_NUMBER stuff to DistributionAdvisor
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCache.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCache.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCache.java
index 7c1fa8e..cf1a4dc 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCache.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCache.java
@@ -14,6 +14,7 @@ import com.gemstone.gemfire.cache.hdfs.internal.HDFSStoreImpl;
import com.gemstone.gemfire.cache.hdfs.internal.hoplog.HDFSStoreDirector;
import com.gemstone.gemfire.cache.query.internal.cq.CqService;
import com.gemstone.gemfire.distributed.DistributedMember;
+import com.gemstone.gemfire.internal.cache.extension.Extensible;
/**
* The InternalCache interface is contract for implementing classes for defining internal cache operations that should
@@ -23,7 +24,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
* @see com.gemstone.gemfire.cache.Cache
* @since 7.0
*/
-public interface InternalCache extends Cache {
+public interface InternalCache extends Cache, Extensible<Cache> {
public DistributedMember getMyId();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
index 04630ba..2e2ec2b 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
@@ -126,7 +126,7 @@ import com.gemstone.gemfire.pdx.internal.TypeRegistry;
*
* @since 3.0
*/
-public class CacheCreation implements InternalCache, Extensible<Cache> {
+public class CacheCreation implements InternalCache {
/** The amount of time to wait for a distributed lock */
private int lockTimeout = GemFireCacheImpl.DEFAULT_LOCK_TIMEOUT;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
index 1775b40..55f1b3a 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
@@ -1,6 +1,5 @@
package com.gemstone.gemfire.cache.lucene;
-import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.queryparser.classic.ParseException;
/**
@@ -50,21 +49,6 @@ public interface LuceneQueryFactory {
LuceneQueryFactory setProjectionFields(String... fieldNames);
/**
- * Create wrapper object for lucene's QueryParser object.
- * The queryString is using lucene QueryParser's syntax. QueryParser is for easy-to-use
- * with human understandable syntax.
- *
- * @param regionName region name
- * @param indexName index name
- * @param queryString query string in lucene QueryParser's syntax
- * @param analyzer lucene Analyzer to parse the queryString
- * @return LuceneQuery object
- * @throws ParseException
- */
- public LuceneQuery create(String indexName, String regionName, String queryString,
- Analyzer analyzer) throws ParseException;
-
- /**
* Create wrapper object for lucene's QueryParser object using default standard analyzer.
* The queryString is using lucene QueryParser's syntax. QueryParser is for easy-to-use
* with human understandable syntax.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
index 767bfa8..a113fab 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
@@ -17,7 +17,8 @@ import com.gemstone.gemfire.cache.query.QueryException;
public interface LuceneQueryProvider extends Serializable {
/**
* @return A Lucene Query object which could be used for executing Lucene Search on indexed data
+ * @param The local lucene index the query is being constructed against.
* @throws QueryException if the provider fails to construct the query object
*/
- public Query getQuery() throws QueryException;
+ public Query getQuery(LuceneIndex index) throws QueryException;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java
index b276b48..7d90b7d 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java
@@ -1,6 +1,7 @@
package com.gemstone.gemfire.cache.lucene;
import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneService;
import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl;
import com.gemstone.gemfire.internal.cache.extension.Extensible;
@@ -17,7 +18,7 @@ public class LuceneServiceProvider {
public static LuceneService get(Cache cache) {
synchronized(LuceneService.class) {
Extensible<Cache> extensible = (Extensible<Cache>) cache;
- LuceneServiceImpl service = (LuceneServiceImpl) extensible.getExtensionPoint().getExtension(LuceneService.class);
+ InternalLuceneService service = (InternalLuceneService) extensible.getExtensionPoint().getExtension(LuceneService.class);
if(service == null) {
service = new LuceneServiceImpl(cache);
extensible.getExtensionPoint().addExtension(LuceneService.class, service);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneIndex.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneIndex.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneIndex.java
new file mode 100644
index 0000000..ab2c924
--- /dev/null
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneIndex.java
@@ -0,0 +1,10 @@
+package com.gemstone.gemfire.cache.lucene.internal;
+
+import com.gemstone.gemfire.cache.lucene.LuceneIndex;
+import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
+
+public interface InternalLuceneIndex extends LuceneIndex {
+
+ public RepositoryManager getRepositoryManager();
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneService.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneService.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneService.java
new file mode 100644
index 0000000..d09ef19
--- /dev/null
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneService.java
@@ -0,0 +1,9 @@
+package com.gemstone.gemfire.cache.lucene.internal;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.lucene.LuceneService;
+import com.gemstone.gemfire.internal.cache.extension.Extension;
+
+public interface InternalLuceneService extends LuceneService, Extension<Cache> {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
index 799ef27..1a91292 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
@@ -7,12 +7,11 @@ import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.lucene.LuceneIndex;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
-public abstract class LuceneIndexImpl implements LuceneIndex {
+public abstract class LuceneIndexImpl implements InternalLuceneIndex {
static private final boolean CREATE_CACHE = Boolean.getBoolean("lucene.createCache");
static private final boolean USE_FS = Boolean.getBoolean("lucene.useFileSystem");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
index f5d38bc..9210929 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
@@ -15,9 +15,9 @@ import com.gemstone.gemfire.cache.lucene.LuceneQueryFactory;
import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider;
public class LuceneQueryFactoryImpl implements LuceneQueryFactory {
- private int limit_attr = DEFAULT_LIMIT;
- private int pageSize_attr = DEFAULT_PAGESIZE;
- private Set<String> projection_fields_attr = new HashSet<String>();
+ private int limit = DEFAULT_LIMIT;
+ private int pageSize = DEFAULT_PAGESIZE;
+ private Set<String> projectionFields = new HashSet<String>();
/* reference to the index. One index could have multiple Queries, but one Query must belong
* to one index
@@ -26,38 +26,25 @@ public class LuceneQueryFactoryImpl implements LuceneQueryFactory {
@Override
public LuceneQueryFactory setPageSize(int pageSize) {
- this.pageSize_attr = pageSize;
+ this.pageSize = pageSize;
return this;
}
@Override
public LuceneQueryFactory setResultLimit(int limit) {
- this.limit_attr = limit;
+ this.limit = limit;
return this;
}
@Override
public LuceneQuery create(String indexName, String regionName,
- String queryString, Analyzer analyzer) throws ParseException {
- QueryParser parser = new QueryParser(null, analyzer);
- Query query = parser.parse(queryString);
- LuceneQueryImpl luceneQuery = new LuceneQueryImpl(indexName, regionName, limit_attr, pageSize_attr, projection_fields_attr, query);
- return luceneQuery;
- }
-
- @Override
- public LuceneQuery create(String indexName, String regionName,
String queryString) throws ParseException {
- StandardAnalyzer analyzer = new StandardAnalyzer();
- return create(indexName, regionName, queryString, analyzer);
+ return create(indexName, regionName, new StringQueryProvider(queryString));
}
public LuceneQuery create(String indexName, String regionName, LuceneQueryProvider provider) {
-// LuceneQueryImpl luceneQuery = new LuceneQueryImpl(indexName, regionName, limit_attr, pageSize_attr,
-// resultType_attr, projection_fields_attr, query);
-// return luceneQuery;
- // TODO Auto-generated method stub
- return null;
+ LuceneQueryImpl luceneQuery = new LuceneQueryImpl(indexName, regionName, provider, projectionFields, limit, pageSize);
+ return luceneQuery;
}
@@ -69,7 +56,7 @@ public class LuceneQueryFactoryImpl implements LuceneQueryFactory {
public LuceneQueryFactory setProjectionFields(String... fieldNames) {
if (fieldNames != null) {
for (String fieldName:fieldNames) {
- this.projection_fields_attr.add(fieldName);
+ this.projectionFields.add(fieldName);
}
}
return this;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
index e93692f..714df95 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
@@ -6,6 +6,7 @@ import org.apache.lucene.search.Query;
import com.gemstone.gemfire.cache.lucene.LuceneQuery;
import com.gemstone.gemfire.cache.lucene.LuceneQueryFactory;
+import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider;
import com.gemstone.gemfire.cache.lucene.LuceneQueryResults;
public class LuceneQueryImpl implements LuceneQuery {
@@ -18,16 +19,16 @@ public class LuceneQueryImpl implements LuceneQuery {
private Set<String> projectedFieldNames;
/* the lucene Query object to be wrapped here */
- private Query query;
+ private LuceneQueryProvider query;
- LuceneQueryImpl(String indexName, String regionName, int limit, int pageSize,
- Set<String> projectionFieldNames, Query query) {
+ LuceneQueryImpl(String indexName, String regionName, LuceneQueryProvider provider, Set<String> projectionFields,
+ int limit, int pageSize) {
this.indexName = indexName;
this.regionName = regionName;
this.limit = limit;
this.pageSize = pageSize;
- this.projectedFieldNames = projectionFieldNames;
- this.query = query;
+ this.projectedFieldNames = projectionFields;
+ this.query = provider;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
index 1d7178a..cb6e5fc 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
@@ -14,7 +14,6 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.cache.lucene.LuceneIndex;
import com.gemstone.gemfire.cache.lucene.LuceneQueryFactory;
-import com.gemstone.gemfire.cache.lucene.LuceneService;
import com.gemstone.gemfire.cache.lucene.internal.distributed.EntryScore;
import com.gemstone.gemfire.cache.lucene.internal.distributed.LuceneFunction;
import com.gemstone.gemfire.cache.lucene.internal.distributed.LuceneFunctionContext;
@@ -28,7 +27,6 @@ import com.gemstone.gemfire.internal.DataSerializableFixedID;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.extension.Extensible;
-import com.gemstone.gemfire.internal.cache.extension.Extension;
import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.logging.LogService;
@@ -40,7 +38,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
*
* @since 8.5
*/
-public class LuceneServiceImpl implements LuceneService, Extension<Cache> {
+public class LuceneServiceImpl implements InternalLuceneService {
private final Cache cache;
private final HashMap<String, LuceneIndex> indexMap;
@@ -80,7 +78,7 @@ public class LuceneServiceImpl implements LuceneService, Extension<Cache> {
// for this API, set index to use the default StandardAnalyzer for each field
index.setAnalyzer(null);
index.initialize();
- registerIndex(getUniqueIndexName(indexName, regionPath), index);
+ registerIndex(index);
return index;
}
@@ -90,6 +88,9 @@ public class LuceneServiceImpl implements LuceneService, Extension<Cache> {
logger.info("Data region "+regionPath+" not found");
return null;
}
+ //Convert the region name into a canonical form
+
+ regionPath = dataregion.getFullPath();
LuceneIndexImpl index = null;
if (dataregion instanceof PartitionedRegion) {
// partitioned region
@@ -103,7 +104,11 @@ public class LuceneServiceImpl implements LuceneService, Extension<Cache> {
@Override
public LuceneIndex getIndex(String indexName, String regionPath) {
- return indexMap.get(getUniqueIndexName(indexName, regionPath));
+ Region region = cache.getRegion(regionPath);
+ if(region == null) {
+ return null;
+ }
+ return indexMap.get(getUniqueIndexName(indexName, region.getFullPath()));
}
@Override
@@ -124,7 +129,7 @@ public class LuceneServiceImpl implements LuceneService, Extension<Cache> {
}
index.setAnalyzer(analyzer);
index.initialize();
- registerIndex(getUniqueIndexName(indexName, regionPath), index);
+ registerIndex(index);
return index;
}
@@ -152,7 +157,8 @@ public class LuceneServiceImpl implements LuceneService, Extension<Cache> {
}
- public void registerIndex(final String regionAndIndex, LuceneIndex index){
+ public void registerIndex(LuceneIndex index){
+ String regionAndIndex = getUniqueIndexName(index.getName(), index.getRegionPath());
if( !indexMap.containsKey( regionAndIndex )) {
indexMap.put(regionAndIndex, index);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
index 65c678c..91ad82c 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
@@ -11,15 +11,19 @@ import org.apache.lucene.index.IndexWriterConfig;
import com.gemstone.gemfire.InternalGemFireError;
import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
import com.gemstone.gemfire.cache.lucene.internal.directory.RegionDirectory;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepositoryImpl;
import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.LuceneSerializer;
+import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
import com.gemstone.gemfire.internal.cache.BucketRegion;
import com.gemstone.gemfire.internal.cache.LocalDataSet;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import com.gemstone.gemfire.internal.cache.PartitionedRegionHelper;
+import com.gemstone.gemfire.internal.cache.execute.InternalRegionFunctionContext;
import com.gemstone.gemfire.internal.util.concurrent.CopyOnWriteHashMap;
/**
@@ -77,13 +81,10 @@ public class PartitionedRepositoryManager implements RepositoryManager {
}
@Override
- public Collection<IndexRepository> getRepositories(Region region) throws BucketNotFoundException {
- if(!(region instanceof LocalDataSet)) {
- throw new IllegalStateException("Trying to find the repositories for a region which is not the local data set of a function");
- }
+ public Collection<IndexRepository> getRepositories(RegionFunctionContext ctx) throws BucketNotFoundException {
- LocalDataSet dataSet = (LocalDataSet) region;
- Set<Integer> buckets = dataSet.getBucketSet();
+ Region<Object, Object> region = ctx.getDataSet();
+ Set<Integer> buckets = ((InternalRegionFunctionContext) ctx).getLocalBucketSet(region);
ArrayList<IndexRepository> repos = new ArrayList<IndexRepository>(buckets.size());
for(Integer bucketId : buckets) {
BucketRegion userBucket = userRegion.getDataStore().getLocalBucketById(bucketId);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
index 78a2f99..7e50bae 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
@@ -6,6 +6,7 @@ import java.io.IOException;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.analysis.core.SimpleAnalyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.Query;
@@ -29,37 +30,25 @@ public class StringQueryProvider implements LuceneQueryProvider, DataSerializabl
// the following members hold input data and needs to be sent on wire
private String query;
- private String indexName;
- private String regionPath;
// the following members hold derived objects and need not be serialized
- private Query luceneQuery;
- private LuceneIndex index;
+ private transient Query luceneQuery;
public StringQueryProvider() {
- this(null, null);
+ this(null);
}
- public StringQueryProvider(LuceneIndex index, String query) {
+ public StringQueryProvider(String query) {
this.query = query;
- this.index = index;
- if (index != null) {
- this.indexName = index.getName();
- this.regionPath = index.getRegionPath();
- }
}
@Override
- public synchronized Query getQuery() throws QueryException {
+ public synchronized Query getQuery(LuceneIndex index) throws QueryException {
if (luceneQuery == null) {
- String[] fields = null;
- if (index != null) {
- fields = index.getFieldNames();
- } else {
- // TODO get index from lucene query service
- }
+ String[] fields = index.getFieldNames();
- MultiFieldQueryParser parser = new MultiFieldQueryParser(fields, new SimpleAnalyzer());
+ //TODO get the analyzer from the index
+ MultiFieldQueryParser parser = new MultiFieldQueryParser(fields, new StandardAnalyzer());
try {
luceneQuery = parser.parse(query);
} catch (ParseException e) {
@@ -77,20 +66,6 @@ public class StringQueryProvider implements LuceneQueryProvider, DataSerializabl
return query;
}
- /**
- * @return name of the index on which this query will be executed
- */
- public String getIndexName() {
- return indexName;
- }
-
- /**
- * @return path of the region on which this query will be executed
- */
- public String getRegionPath() {
- return regionPath;
- }
-
@Override
public Version[] getSerializationVersions() {
return null;
@@ -104,14 +79,10 @@ public class StringQueryProvider implements LuceneQueryProvider, DataSerializabl
@Override
public void toData(DataOutput out) throws IOException {
DataSerializer.writeString(query, out);
- DataSerializer.writeString(index.getName(), out);
- DataSerializer.writeString(index.getRegionPath(), out);
}
@Override
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
query = DataSerializer.readString(in);
- this.indexName = DataSerializer.readString(in);
- this.regionPath = DataSerializer.readString(in);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunction.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunction.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunction.java
index ca0e2d3..b8552fa 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunction.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunction.java
@@ -14,6 +14,9 @@ import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
import com.gemstone.gemfire.cache.execute.ResultSender;
import com.gemstone.gemfire.cache.lucene.LuceneQueryFactory;
import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider;
+import com.gemstone.gemfire.cache.lucene.LuceneService;
+import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
+import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneIndex;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexResultCollector;
import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
@@ -32,8 +35,6 @@ public class LuceneFunction extends FunctionAdapter {
private static final Logger logger = LogService.getLogger();
- private static RepositoryManager repoManager;
-
@Override
public void execute(FunctionContext context) {
RegionFunctionContext ctx = (RegionFunctionContext) context;
@@ -52,10 +53,14 @@ public class LuceneFunction extends FunctionAdapter {
resultSender.sendException(new IllegalArgumentException("Missing query provider"));
return;
}
+
+ LuceneService service = LuceneServiceProvider.get(region.getCache());
+ InternalLuceneIndex index = (InternalLuceneIndex) service.getIndex(searchContext.getIndexName(), region.getFullPath());
+ RepositoryManager repoManager = index.getRepositoryManager();
Query query = null;
try {
- query = queryProvider.getQuery();
+ query = queryProvider.getQuery(index);
} catch (QueryException e) {
resultSender.sendException(e);
return;
@@ -65,19 +70,19 @@ public class LuceneFunction extends FunctionAdapter {
logger.debug("Executing lucene query: {}, on region {}", query, region.getFullPath());
}
+ int resultLimit = searchContext.getLimit();
CollectorManager manager = (searchContext == null) ? null : searchContext.getCollectorManager();
if (manager == null) {
- int resultLimit = (searchContext == null ? LuceneQueryFactory.DEFAULT_LIMIT : searchContext.getLimit());
manager = new TopEntriesCollectorManager(null, resultLimit);
}
Collection<IndexResultCollector> results = new ArrayList<>();
try {
- Collection<IndexRepository> repositories = getIndexRepositories(ctx, region);
+ Collection<IndexRepository> repositories = repoManager.getRepositories(ctx);
for (IndexRepository repo : repositories) {
IndexResultCollector collector = manager.newCollector(repo.toString());
logger.debug("Executing search on repo: " + repo.toString());
- repo.query(query, 0, collector);
+ repo.query(query, resultLimit, collector);
results.add(collector);
}
} catch (IOException e) {
@@ -101,15 +106,6 @@ public class LuceneFunction extends FunctionAdapter {
}
}
- private Collection<IndexRepository> getIndexRepositories(RegionFunctionContext ctx, Region region) throws BucketNotFoundException {
- synchronized (LuceneFunction.class) {
- return repoManager.getRepositories(region);
- }
- }
-
- static synchronized void setRepositoryManager(RepositoryManager manager) {
- repoManager = manager;
- }
@Override
public String getId() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContext.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContext.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContext.java
index feeb768..d36bcc2 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContext.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContext.java
@@ -18,23 +18,24 @@ import com.gemstone.gemfire.internal.Version;
public class LuceneFunctionContext<C extends IndexResultCollector> implements DataSerializableFixedID {
private CollectorManager<C> manager;
private int limit;
-
- LuceneQueryProvider queryProvider;
+ private LuceneQueryProvider queryProvider;
+ private String indexName;
public LuceneFunctionContext() {
- this(null, null);
+ this(null, null, null);
}
- public LuceneFunctionContext(LuceneQueryProvider provider) {
- this(provider, null);
+ public LuceneFunctionContext(LuceneQueryProvider provider, String indexName) {
+ this(provider, indexName, null);
}
- public LuceneFunctionContext(LuceneQueryProvider provider, CollectorManager<C> manager) {
- this(provider, manager, LuceneQueryFactory.DEFAULT_LIMIT);
+ public LuceneFunctionContext(LuceneQueryProvider provider, String indexName, CollectorManager<C> manager) {
+ this(provider, indexName, manager, LuceneQueryFactory.DEFAULT_LIMIT);
}
- public LuceneFunctionContext(LuceneQueryProvider provider, CollectorManager<C> manager, int limit) {
+ public LuceneFunctionContext(LuceneQueryProvider provider, String indexName, CollectorManager<C> manager, int limit) {
this.queryProvider = provider;
+ this.indexName = indexName;
this.manager = manager;
this.limit = limit;
}
@@ -47,6 +48,13 @@ public class LuceneFunctionContext<C extends IndexResultCollector> implements Da
}
/**
+ * Get the name of the index to query
+ */
+ public String getIndexName() {
+ return indexName;
+ }
+
+ /**
* On each member, search query is executed on one or more {@link IndexRepository}s. A {@link CollectorManager} could
* be provided to customize the way results from these repositories is collected and merged.
*
@@ -70,6 +78,7 @@ public class LuceneFunctionContext<C extends IndexResultCollector> implements Da
out.writeInt(limit);
DataSerializer.writeObject(queryProvider, out);
DataSerializer.writeObject(manager, out);
+ DataSerializer.writeString(indexName, out);
}
@Override
@@ -77,6 +86,7 @@ public class LuceneFunctionContext<C extends IndexResultCollector> implements Da
limit = in.readInt();
queryProvider = DataSerializer.readObject(in);
manager = DataSerializer.readObject(in);
+ this.indexName = DataSerializer.readString(in);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/RepositoryManager.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/RepositoryManager.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/RepositoryManager.java
index b61e8be..cea4f89 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/RepositoryManager.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/RepositoryManager.java
@@ -22,5 +22,5 @@ public interface RepositoryManager {
* @return a collection of {@link IndexRepository} instances
* @throws BucketNotFoundException if any of the requested buckets is not found on this member
*/
- Collection<IndexRepository> getRepositories(Region localDataSet) throws BucketNotFoundException;
+ Collection<IndexRepository> getRepositories(RegionFunctionContext context) throws BucketNotFoundException;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
index a7ed00d..10f4794 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
@@ -127,7 +127,7 @@ public class LuceneServiceImplJUnitTest {
assertTrue(index1 instanceof LuceneIndexForPartitionedRegion);
LuceneIndexForPartitionedRegion index1PR = (LuceneIndexForPartitionedRegion)index1;
assertEquals("index1", index1.getName());
- assertEquals("PR1", index1.getRegionPath());
+ assertEquals("/PR1", index1.getRegionPath());
String[] fields1 = index1.getFieldNames();
assertEquals(3, fields1.length);
Analyzer analyzer = index1PR.getAnalyzer();
@@ -135,8 +135,8 @@ public class LuceneServiceImplJUnitTest {
RepositoryManager RepositoryManager = index1PR.getRepositoryManager();
assertTrue(RepositoryManager != null);
- final String fileRegionName = LuceneServiceImpl.getUniqueIndexName("index1", "PR1")+".files";
- final String chunkRegionName = LuceneServiceImpl.getUniqueIndexName("index1", "PR1")+".chunks";
+ final String fileRegionName = LuceneServiceImpl.getUniqueIndexName("index1", "/PR1")+".files";
+ final String chunkRegionName = LuceneServiceImpl.getUniqueIndexName("index1", "/PR1")+".chunks";
PartitionedRegion filePR = (PartitionedRegion)cache.getRegion(fileRegionName);
PartitionedRegion chunkPR = (PartitionedRegion)cache.getRegion(chunkRegionName);
assertTrue(filePR != null);
@@ -160,7 +160,7 @@ public class LuceneServiceImplJUnitTest {
assertTrue(index1 instanceof LuceneIndexForPartitionedRegion);
LuceneIndexForPartitionedRegion index1PR = (LuceneIndexForPartitionedRegion)index1;
assertEquals("index1", index1.getName());
- assertEquals("PR1", index1.getRegionPath());
+ assertEquals("/PR1", index1.getRegionPath());
String[] fields1 = index1.getFieldNames();
assertEquals(3, fields1.length);
Analyzer analyzer = index1PR.getAnalyzer();
@@ -168,8 +168,8 @@ public class LuceneServiceImplJUnitTest {
RepositoryManager RepositoryManager = index1PR.getRepositoryManager();
assertTrue(RepositoryManager != null);
- final String fileRegionName = LuceneServiceImpl.getUniqueIndexName("index1", "PR1")+".files";
- final String chunkRegionName = LuceneServiceImpl.getUniqueIndexName("index1", "PR1")+".chunks";
+ final String fileRegionName = LuceneServiceImpl.getUniqueIndexName("index1", "/PR1")+".files";
+ final String chunkRegionName = LuceneServiceImpl.getUniqueIndexName("index1", "/PR1")+".chunks";
PartitionedRegion filePR = (PartitionedRegion)cache.getRegion(fileRegionName);
PartitionedRegion chunkPR = (PartitionedRegion)cache.getRegion(chunkRegionName);
assertTrue(filePR != null);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
index a2cc75e..1225aa1 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
@@ -2,6 +2,7 @@ package com.gemstone.gemfire.cache.lucene.internal;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
import java.io.IOException;
import java.util.Arrays;
@@ -21,6 +22,7 @@ import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.lucene.internal.directory.RegionDirectory;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepositoryImpl;
@@ -32,6 +34,7 @@ import com.gemstone.gemfire.internal.cache.LocalDataSet;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegion.RetryTimeKeeper;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
+import com.gemstone.gemfire.internal.cache.execute.InternalRegionFunctionContext;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
@Category(UnitTest.class)
@@ -147,8 +150,9 @@ public class PartitionedRepositoryManagerJUnitTest {
BucketRegion mockBucket1 = getMockBucket(1);
Set<Integer> buckets = new LinkedHashSet<Integer>(Arrays.asList(0, 1));
- LocalDataSet ldr = new LocalDataSet(null, buckets);
- Collection<IndexRepository> repos = repoManager.getRepositories(ldr);
+ InternalRegionFunctionContext ctx = Mockito.mock(InternalRegionFunctionContext.class);
+ Mockito.when(ctx.getLocalBucketSet((any(Region.class)))).thenReturn(buckets);
+ Collection<IndexRepository> repos = repoManager.getRepositories(ctx);
assertEquals(2, repos.size());
Iterator<IndexRepository> itr = repos.iterator();
@@ -173,9 +177,10 @@ public class PartitionedRepositoryManagerJUnitTest {
BucketRegion mockBucket0 = getMockBucket(0);
Set<Integer> buckets = new LinkedHashSet<Integer>(Arrays.asList(0, 1));
- LocalDataSet ldr = new LocalDataSet(userRegion, buckets);
- repoManager.getRepositories(ldr);
+ InternalRegionFunctionContext ctx = Mockito.mock(InternalRegionFunctionContext.class);
+ Mockito.when(ctx.getLocalBucketSet((any(Region.class)))).thenReturn(buckets);
+ repoManager.getRepositories(ctx);
}
private void checkRepository(IndexRepositoryImpl repo0, int bucketId) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
index 078ae42..673fdf2 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
@@ -5,6 +5,7 @@ import static org.junit.Assert.assertEquals;
import org.apache.lucene.search.Query;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
@@ -31,41 +32,40 @@ public class StringQueryProviderJUnitTest {
@Test
public void testQueryConstruction() throws QueryException {
- StringQueryProvider provider = new StringQueryProvider(null, "foo:bar");
- Query query = provider.getQuery();
+ StringQueryProvider provider = new StringQueryProvider("foo:bar");
+ Query query = provider.getQuery(mockIndex);
Assert.assertNotNull(query);
assertEquals("foo:bar", query.toString());
}
@Test
public void usesSearchableFieldsAsDefaults() throws QueryException {
- StringQueryProvider provider = new StringQueryProvider(mockIndex, "findThis");
- Query query = provider.getQuery();
+ StringQueryProvider provider = new StringQueryProvider("findThis");
+ Query query = provider.getQuery(mockIndex);
Assert.assertNotNull(query);
assertEquals("field-1:findthis field-2:findthis", query.toString());
}
@Test
+ @Ignore("Custom analyzer not yet supported, this is a duplicate test right now")
public void usesCustomAnalyzer() throws QueryException {
- StringQueryProvider provider = new StringQueryProvider(mockIndex, "findThis");
- Query query = provider.getQuery();
+ StringQueryProvider provider = new StringQueryProvider("findThis");
+ Query query = provider.getQuery(mockIndex);
Assert.assertNotNull(query);
assertEquals("field-1:findthis field-2:findthis", query.toString());
}
@Test(expected = QueryException.class)
public void errorsOnMalformedQueryString() throws QueryException {
- StringQueryProvider provider = new StringQueryProvider(mockIndex, "invalid:lucene:query:string");
- provider.getQuery();
+ StringQueryProvider provider = new StringQueryProvider("invalid:lucene:query:string");
+ provider.getQuery(mockIndex);
}
@Test
public void testSerialization() {
LuceneServiceImpl.registerDataSerializables();
- StringQueryProvider provider = new StringQueryProvider(mockIndex, "text:search");
+ StringQueryProvider provider = new StringQueryProvider("text:search");
StringQueryProvider copy = CopyHelper.deepCopy(provider);
assertEquals("text:search", copy.getQueryString());
- assertEquals(mockIndex.getName(), copy.getIndexName());
- assertEquals(mockIndex.getRegionPath(), copy.getRegionPath());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java
index 01a1690..98b48d8 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java
@@ -30,18 +30,16 @@ public class LuceneFunctionContextJUnitTest {
public void testSerialization() {
LuceneServiceImpl.registerDataSerializables();
- LuceneIndex mockIndex = Mockito.mock(LuceneIndex.class);
- Mockito.doReturn("mockIndex").when(mockIndex).getName();
- LuceneQueryProvider provider = new StringQueryProvider(mockIndex, "text");
+ LuceneQueryProvider provider = new StringQueryProvider("text");
CollectorManager<TopEntriesCollector> manager = new TopEntriesCollectorManager("test");
- LuceneFunctionContext<TopEntriesCollector> context = new LuceneFunctionContext<>(provider, manager, 123);
+ LuceneFunctionContext<TopEntriesCollector> context = new LuceneFunctionContext<>(provider, "testIndex", manager, 123);
LuceneFunctionContext<TopEntriesCollector> copy = CopyHelper.deepCopy(context);
assertEquals(123, copy.getLimit());
Assert.assertNotNull(copy.getQueryProvider());
assertEquals("text", ((StringQueryProvider) copy.getQueryProvider()).getQueryString());
- assertEquals("mockIndex", ((StringQueryProvider) copy.getQueryProvider()).getIndexName());
assertEquals(TopEntriesCollectorManager.class, copy.getCollectorManager().getClass());
assertEquals("test", ((TopEntriesCollectorManager) copy.getCollectorManager()).getId());
+ assertEquals("testIndex", copy.getIndexName());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
index ba5f96a..6c37468 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
@@ -1,6 +1,6 @@
package com.gemstone.gemfire.cache.lucene.internal.distributed;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
import java.io.IOException;
import java.util.ArrayList;
@@ -23,26 +23,35 @@ import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
import com.gemstone.gemfire.cache.execute.ResultSender;
+import com.gemstone.gemfire.cache.lucene.LuceneQueryFactory;
import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider;
+import com.gemstone.gemfire.cache.lucene.LuceneService;
+import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneIndex;
+import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneService;
import com.gemstone.gemfire.cache.lucene.internal.StringQueryProvider;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexResultCollector;
import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
import com.gemstone.gemfire.cache.query.QueryException;
import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
+import com.gemstone.gemfire.internal.cache.InternalCache;
+import com.gemstone.gemfire.internal.cache.execute.InternalRegionFunctionContext;
+import com.gemstone.gemfire.internal.cache.extension.ExtensionPoint;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class LuceneFunctionJUnitTest {
Mockery mocker;
+ String regionPath = "/region";
+ String indexName = "index";
final EntryScore r1_1 = new EntryScore("key-1-1", .5f);
final EntryScore r1_2 = new EntryScore("key-1-2", .4f);
final EntryScore r1_3 = new EntryScore("key-1-3", .3f);
final EntryScore r2_1 = new EntryScore("key-2-1", .45f);
final EntryScore r2_2 = new EntryScore("key-2-2", .35f);
- RegionFunctionContext mockContext;
+ InternalRegionFunctionContext mockContext;
ResultSender<TopEntriesCollector> mockResultSender;
Region<Object, Object> mockRegion;
@@ -50,12 +59,16 @@ public class LuceneFunctionJUnitTest {
IndexRepository mockRepository1;
IndexRepository mockRepository2;
IndexResultCollector mockCollector;
+ InternalLuceneService mockService;
+ InternalLuceneIndex mockIndex;
ArrayList<IndexRepository> repos;
LuceneFunctionContext searchArgs;
LuceneQueryProvider queryProvider;
Query query;
+ private InternalCache mockCache;
+
@Test
public void testRepoQueryAndMerge() throws Exception {
final AtomicReference<TopEntriesCollector> result = new AtomicReference<>();
@@ -66,13 +79,13 @@ public class LuceneFunctionJUnitTest {
oneOf(mockContext).getArguments();
will(returnValue(searchArgs));
- oneOf(mockRepoManager).getRepositories(mockRegion);
+ oneOf(mockRepoManager).getRepositories(mockContext);
will(returnValue(repos));
oneOf(mockContext).getResultSender();
will(returnValue(mockResultSender));
- oneOf(mockRepository1).query(with(query), with(equal(0)), with(any(IndexResultCollector.class)));
+ oneOf(mockRepository1).query(with(query), with(equal(LuceneQueryFactory.DEFAULT_LIMIT)), with(any(IndexResultCollector.class)));
will(new CustomAction("streamSearchResults") {
@Override
public Object invoke(Invocation invocation) throws Throwable {
@@ -84,7 +97,7 @@ public class LuceneFunctionJUnitTest {
}
});
- oneOf(mockRepository2).query(with(query), with(equal(0)), with(any(IndexResultCollector.class)));
+ oneOf(mockRepository2).query(with(query), with(equal(LuceneQueryFactory.DEFAULT_LIMIT)), with(any(IndexResultCollector.class)));
will(new CustomAction("streamSearchResults") {
@Override
public Object invoke(Invocation invocation) throws Throwable {
@@ -107,7 +120,6 @@ public class LuceneFunctionJUnitTest {
});
LuceneFunction function = new LuceneFunction();
- function.setRepositoryManager(mockRepoManager);
function.execute(mockContext);
List<EntryScore> hits = result.get().getEntries().getHits();
@@ -119,7 +131,7 @@ public class LuceneFunctionJUnitTest {
public void testResultLimitClause() throws Exception {
final AtomicReference<TopEntriesCollector> result = new AtomicReference<>();
- searchArgs = new LuceneFunctionContext<IndexResultCollector>(queryProvider, null, 3);
+ searchArgs = new LuceneFunctionContext<IndexResultCollector>(queryProvider, "indexName", null, 3);
mocker.checking(new Expectations() {
{
@@ -131,10 +143,10 @@ public class LuceneFunctionJUnitTest {
oneOf(mockContext).getResultSender();
will(returnValue(mockResultSender));
- oneOf(mockRepoManager).getRepositories(mockRegion);
+ oneOf(mockRepoManager).getRepositories(mockContext);
will(returnValue(repos));
- oneOf(mockRepository1).query(with(query), with(equal(0)), with(any(IndexResultCollector.class)));
+ oneOf(mockRepository1).query(with(query), with(equal(3)), with(any(IndexResultCollector.class)));
will(new CustomAction("streamSearchResults") {
@Override
public Object invoke(Invocation invocation) throws Throwable {
@@ -146,7 +158,7 @@ public class LuceneFunctionJUnitTest {
}
});
- oneOf(mockRepository2).query(with(query), with(equal(0)), with(any(IndexResultCollector.class)));
+ oneOf(mockRepository2).query(with(query), with(equal(3)), with(any(IndexResultCollector.class)));
will(new CustomAction("streamSearchResults") {
@Override
public Object invoke(Invocation invocation) throws Throwable {
@@ -169,7 +181,6 @@ public class LuceneFunctionJUnitTest {
});
LuceneFunction function = new LuceneFunction();
- function.setRepositoryManager(mockRepoManager);
function.execute(mockContext);
List<EntryScore> hits = result.get().getEntries().getHits();
@@ -180,7 +191,7 @@ public class LuceneFunctionJUnitTest {
@Test
public void injectCustomCollectorManager() throws Exception {
final CollectorManager mockManager = mocker.mock(CollectorManager.class);
- searchArgs = new LuceneFunctionContext<IndexResultCollector>(queryProvider, mockManager);
+ searchArgs = new LuceneFunctionContext<IndexResultCollector>(queryProvider, "indexName", mockManager);
mocker.checking(new Expectations() {
{
oneOf(mockContext).getDataSet();
@@ -190,7 +201,7 @@ public class LuceneFunctionJUnitTest {
oneOf(mockContext).getResultSender();
will(returnValue(mockResultSender));
- oneOf(mockRepoManager).getRepositories(mockRegion);
+ oneOf(mockRepoManager).getRepositories(mockContext);
repos.remove(0);
will(returnValue(repos));
@@ -209,7 +220,7 @@ public class LuceneFunctionJUnitTest {
oneOf(mockCollector).collect("key-2-1", .45f);
- oneOf(mockRepository2).query(with(query), with(equal(0)), with(any(IndexResultCollector.class)));
+ oneOf(mockRepository2).query(with(query), with(equal(LuceneQueryFactory.DEFAULT_LIMIT)), with(any(IndexResultCollector.class)));
will(new CustomAction("streamSearchResults") {
@Override
public Object invoke(Invocation invocation) throws Throwable {
@@ -224,7 +235,6 @@ public class LuceneFunctionJUnitTest {
});
LuceneFunction function = new LuceneFunction();
- function.setRepositoryManager(mockRepoManager);
function.execute(mockContext);
}
@@ -238,20 +248,19 @@ public class LuceneFunctionJUnitTest {
oneOf(mockContext).getArguments();
will(returnValue(searchArgs));
- oneOf(mockRepoManager).getRepositories(mockRegion);
+ oneOf(mockRepoManager).getRepositories(mockContext);
will(returnValue(repos));
oneOf(mockContext).getResultSender();
will(returnValue(mockResultSender));
oneOf(mockResultSender).sendException(with(any(IOException.class)));
- oneOf(mockRepository1).query(with(query), with(equal(0)), with(any(IndexResultCollector.class)));
+ oneOf(mockRepository1).query(with(query), with(equal(LuceneQueryFactory.DEFAULT_LIMIT)), with(any(IndexResultCollector.class)));
will(throwException(new IOException()));
}
});
LuceneFunction function = new LuceneFunction();
- function.setRepositoryManager(mockRepoManager);
function.execute(mockContext);
}
@@ -265,7 +274,7 @@ public class LuceneFunctionJUnitTest {
oneOf(mockContext).getArguments();
will(returnValue(searchArgs));
- oneOf(mockRepoManager).getRepositories(mockRegion);
+ oneOf(mockRepoManager).getRepositories(mockContext);
will(throwException(new BucketNotFoundException("")));
oneOf(mockContext).getResultSender();
@@ -275,7 +284,6 @@ public class LuceneFunctionJUnitTest {
});
LuceneFunction function = new LuceneFunction();
- function.setRepositoryManager(mockRepoManager);
function.execute(mockContext);
}
@@ -283,7 +291,7 @@ public class LuceneFunctionJUnitTest {
@Test
public void testReduceError() throws Exception {
final CollectorManager mockManager = mocker.mock(CollectorManager.class);
- searchArgs = new LuceneFunctionContext<IndexResultCollector>(queryProvider, mockManager);
+ searchArgs = new LuceneFunctionContext<IndexResultCollector>(queryProvider, "indexName", mockManager);
mocker.checking(new Expectations() {
{
oneOf(mockContext).getDataSet();
@@ -298,17 +306,16 @@ public class LuceneFunctionJUnitTest {
oneOf(mockManager).reduce(with(any(Collection.class)));
will(throwException(new IOException()));
- oneOf(mockRepoManager).getRepositories(mockRegion);
+ oneOf(mockRepoManager).getRepositories(mockContext);
repos.remove(1);
will(returnValue(repos));
- oneOf(mockRepository1).query(query, 0, mockCollector);
+ oneOf(mockRepository1).query(query, LuceneQueryFactory.DEFAULT_LIMIT, mockCollector);
oneOf(mockResultSender).sendException(with(any(IOException.class)));
}
});
LuceneFunction function = new LuceneFunction();
- function.setRepositoryManager(mockRepoManager);
function.execute(mockContext);
}
@@ -316,7 +323,7 @@ public class LuceneFunctionJUnitTest {
@Test
public void queryProviderErrorIsHandled() throws Exception {
queryProvider = mocker.mock(LuceneQueryProvider.class);
- searchArgs = new LuceneFunctionContext<IndexResultCollector>(queryProvider, null);
+ searchArgs = new LuceneFunctionContext<IndexResultCollector>(queryProvider, "indexName");
mocker.checking(new Expectations() {
{
oneOf(mockContext).getDataSet();
@@ -326,7 +333,7 @@ public class LuceneFunctionJUnitTest {
oneOf(mockContext).getArguments();
will(returnValue(searchArgs));
- oneOf(queryProvider).getQuery();
+ oneOf(queryProvider).getQuery(mockIndex);
will(throwException(new QueryException()));
oneOf(mockResultSender).sendException(with(any(QueryException.class)));
@@ -334,7 +341,6 @@ public class LuceneFunctionJUnitTest {
});
LuceneFunction function = new LuceneFunction();
- function.setRepositoryManager(mockRepoManager);
function.execute(mockContext);
}
@@ -354,7 +360,7 @@ public class LuceneFunctionJUnitTest {
}
};
- mockContext = mocker.mock(RegionFunctionContext.class);
+ mockContext = mocker.mock(InternalRegionFunctionContext.class);
mockResultSender = mocker.mock(ResultSender.class);
mockRegion = mocker.mock(Region.class);
@@ -366,10 +372,35 @@ public class LuceneFunctionJUnitTest {
repos = new ArrayList<IndexRepository>();
repos.add(mockRepository1);
repos.add(mockRepository2);
-
- queryProvider = new StringQueryProvider(null, "gemfire:lucene");
- query = queryProvider.getQuery();
- searchArgs = new LuceneFunctionContext<IndexResultCollector>(queryProvider);
+
+ mockIndex = mocker.mock(InternalLuceneIndex.class);
+ mockService = mocker.mock(InternalLuceneService.class);
+ mockCache = mocker.mock(InternalCache.class);
+
+ queryProvider = new StringQueryProvider("gemfire:lucene");
+
+ searchArgs = new LuceneFunctionContext<IndexResultCollector>(queryProvider, "indexName");
+
+ final ExtensionPoint mockExtensionPoint = mocker.mock(ExtensionPoint.class);
+ mocker.checking(new Expectations() {{
+ allowing(mockRegion).getCache();
+ will(returnValue(mockCache));
+ allowing(mockRegion).getFullPath();
+ will(returnValue(regionPath));
+ allowing(mockCache).getExtensionPoint();
+ will(returnValue(mockExtensionPoint));
+ allowing(mockExtensionPoint).getExtension(LuceneService.class);
+ will(returnValue(mockService));
+ allowing(mockService).getIndex(with("indexName"), with(regionPath));
+ will(returnValue(mockIndex));
+ allowing(mockIndex).getRepositoryManager();
+ will(returnValue(mockRepoManager));
+ allowing(mockIndex).getFieldNames();
+ will(returnValue(new String[] {"gemfire"}));
+
+ }});
+
+ query = queryProvider.getQuery(mockIndex);
}
@After
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
index a950c8d..939790d 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
@@ -1,40 +1,30 @@
package com.gemstone.gemfire.cache.lucene.internal.distributed;
-import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.*;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
+import java.io.Serializable;
import java.util.concurrent.TimeUnit;
-import org.apache.lucene.search.Query;
import org.junit.Assert;
import org.junit.experimental.categories.Category;
-import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.cache.execute.FunctionException;
import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.cache.execute.ResultCollector;
import com.gemstone.gemfire.cache.lucene.LuceneIndex;
import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider;
import com.gemstone.gemfire.cache.lucene.LuceneService;
import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
+import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneIndex;
import com.gemstone.gemfire.cache.lucene.internal.StringQueryProvider;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
-import com.gemstone.gemfire.cache.lucene.internal.repository.IndexResultCollector;
-import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import dunit.Host;
+import dunit.SerializableCallable;
import dunit.SerializableRunnable;
import dunit.VM;
@@ -61,43 +51,36 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
}
public void testEnd2EndFunctionExecution() {
- SerializableRunnable createPartitionRegion = new SerializableRunnable("createRegion") {
+ SerializableCallable createPartitionRegion = new SerializableCallable("createRegion") {
private static final long serialVersionUID = 1L;
- public void run() {
+ public Object call() throws Exception {
final Cache cache = getCache();
assertNotNull(cache);
RegionFactory<Object, Object> regionFactory = cache.createRegionFactory(RegionShortcut.PARTITION);
- regionFactory.create(REGION_NAME);
+ Region<Object, Object> region = regionFactory.create(REGION_NAME);
+
LuceneService service = LuceneServiceProvider.get(cache);
- service.createIndex(INDEX_NAME, REGION_NAME);
-
- IndexRepository mockRepo = mock(IndexRepository.class);
- Collection<IndexRepository> repos = new ArrayList<IndexRepository>();
- repos.add(mockRepo);
-
- RepositoryManager mockManager = mock(RepositoryManager.class);
- // TODO avoid using repository manager mock. The manager choice depends on the region type
- LuceneFunction.setRepositoryManager(mockManager);
+ InternalLuceneIndex index = (InternalLuceneIndex) service.createIndex(INDEX_NAME, REGION_NAME, "text");
+
+
+ region.put(1, new TestObject("hello world"));
+ region.put(2, new TestObject("goodbye world"));
+
+ //TODO - the async event queue hasn't been hooked up, so we'll fake out
+ //writing the entry to the repository.
try {
- Mockito.doReturn(repos).when(mockManager).getRepositories(any(Region.class));
- } catch (BucketNotFoundException e) {
- fail("", e);
- }
-
- try {
- Mockito.doAnswer(new Answer<Object>() {
- public Object answer(InvocationOnMock invocation) {
- Object[] args = invocation.getArguments();
- IndexResultCollector collector = (IndexResultCollector) args[2];
- collector.collect(cache.getDistributedSystem().getDistributedMember().getProcessId(), .1f);
- return null;
- }
- }).when(mockRepo).query(any(Query.class), Mockito.anyInt(), any(IndexResultCollector.class));
- } catch (IOException e) {
- fail("", e);
+ IndexRepository repository1 = index.getRepositoryManager().getRepository(region, 1, null);
+ repository1.create(1, new TestObject("hello world"));
+ repository1.commit();
+ IndexRepository repository2 = index.getRepositoryManager().getRepository(region, 2, null);
+ repository2.create(2, new TestObject("hello world"));
+ repository2.commit();
+ } catch(BucketNotFoundException e) {
+ //thats ok, one of the data stores does not host these buckets.
}
+ return null;
}
};
@@ -115,9 +98,9 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
LuceneService service = LuceneServiceProvider.get(cache);
LuceneIndex index = service.getIndex(INDEX_NAME, REGION_NAME);
- LuceneQueryProvider provider = new StringQueryProvider(index, "text:search");
+ LuceneQueryProvider provider = new StringQueryProvider("text:world");
- LuceneFunctionContext<TopEntriesCollector> context = new LuceneFunctionContext<>(provider,
+ LuceneFunctionContext<TopEntriesCollector> context = new LuceneFunctionContext<>(provider, index.getName(),
new TopEntriesCollectorManager());
TopEntriesFunctionCollector collector = new TopEntriesFunctionCollector();
@@ -135,4 +118,15 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
server1.invoke(executeSearch);
}
+
+ private static class TestObject implements Serializable {
+ private String text;
+
+ public TestObject(String text) {
+ this.text = text;
+ }
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
index a66f2fc..5f7dc3d 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
@@ -184,7 +184,7 @@ public class TopEntriesFunctionCollectorJUnitTest {
@Test
public void mergeShardAndLimitResults() throws Exception {
- LuceneFunctionContext<TopEntriesCollector> context = new LuceneFunctionContext<>(null, null, 3);
+ LuceneFunctionContext<TopEntriesCollector> context = new LuceneFunctionContext<>(null, null, null, 3);
TopEntriesFunctionCollector collector = new TopEntriesFunctionCollector(context);
collector.addResult(null, result1);
@@ -226,7 +226,7 @@ public class TopEntriesFunctionCollectorJUnitTest {
}
}));
- LuceneFunctionContext<TopEntriesCollector> context = new LuceneFunctionContext<>(null, mockManager);
+ LuceneFunctionContext<TopEntriesCollector> context = new LuceneFunctionContext<>(null, null, mockManager);
TopEntriesFunctionCollector collector = new TopEntriesFunctionCollector(context);
collector.addResult(null, result1);
collector.addResult(null, result2);
@@ -255,7 +255,7 @@ public class TopEntriesFunctionCollectorJUnitTest {
TopEntriesCollectorManager mockManager = mock(TopEntriesCollectorManager.class);
Mockito.doThrow(new IOException()).when(mockManager).reduce(any(Collection.class));
- LuceneFunctionContext<TopEntriesCollector> context = new LuceneFunctionContext<>(null, mockManager);
+ LuceneFunctionContext<TopEntriesCollector> context = new LuceneFunctionContext<>(null, null, mockManager);
TopEntriesFunctionCollector collector = new TopEntriesFunctionCollector(context);
collector.endResults();
collector.getResult();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fb4ad7a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
index 3a25c97..ede267c 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
@@ -65,6 +65,12 @@ public class IndexRepositoryImplJUnitTest {
repo.commit();
checkQuery("Cream", "s", "key2", "key4");
+ checkQuery("NotARealWord", "s");
+ }
+
+ @Test
+ public void testEmptyRepo() throws IOException, ParseException {
+ checkQuery("NotARealWord", "s");
}
@Test
[12/50] [abbrv] incubator-geode git commit: add tests for analyzer
specify LuceneSerialier for RepositoryManager
Posted by as...@apache.org.
add tests for analyzer
specify LuceneSerialier for RepositoryManager
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/58f13e26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/58f13e26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/58f13e26
Branch: refs/heads/develop
Commit: 58f13e2659e3f0ed8d3feac927bbadde363f1fb5
Parents: db5db7a
Author: zhouxh <gz...@pivotal.io>
Authored: Wed Sep 23 11:49:09 2015 -0700
Committer: zhouxh <gz...@pivotal.io>
Committed: Wed Sep 23 12:09:31 2015 -0700
----------------------------------------------------------------------
.../LuceneIndexForPartitionedRegion.java | 4 +-
.../internal/LuceneServiceImplJUnitTest.java | 43 ++++++++++++++++++++
2 files changed, 46 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/58f13e26/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
index cbab401..1eff49a 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
@@ -20,6 +20,7 @@ import com.gemstone.gemfire.cache.lucene.LuceneIndex;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
+import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer;
import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.LuceneSerializer;
import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
@@ -94,7 +95,8 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
}
// we will create RegionDirectorys on the fly when data coming
- repositoryManager = new PartitionedRepositoryManager(dataRegion, (PartitionedRegion)fileRegion, (PartitionedRegion)chunkRegion, null, analyzer);
+ HeterogenousLuceneSerializer mapper = new HeterogenousLuceneSerializer(getFieldNames());
+ repositoryManager = new PartitionedRepositoryManager(dataRegion, (PartitionedRegion)fileRegion, (PartitionedRegion)chunkRegion, mapper, analyzer);
hasInitialized = true;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/58f13e26/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
index 65fad5d..a7ed00d 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
@@ -6,8 +6,13 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.logging.log4j.Logger;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.core.KeywordAnalyzer;
+import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.queryparser.classic.ParseException;
@@ -23,6 +28,7 @@ import com.gemstone.gemfire.cache.execute.Function;
import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
import com.gemstone.gemfire.cache.lucene.internal.distributed.LuceneFunction;
+import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.LocalRegion;
@@ -124,6 +130,10 @@ public class LuceneServiceImplJUnitTest {
assertEquals("PR1", index1.getRegionPath());
String[] fields1 = index1.getFieldNames();
assertEquals(3, fields1.length);
+ Analyzer analyzer = index1PR.getAnalyzer();
+ assertTrue(analyzer instanceof StandardAnalyzer);
+ RepositoryManager RepositoryManager = index1PR.getRepositoryManager();
+ assertTrue(RepositoryManager != null);
final String fileRegionName = LuceneServiceImpl.getUniqueIndexName("index1", "PR1")+".files";
final String chunkRegionName = LuceneServiceImpl.getUniqueIndexName("index1", "PR1")+".chunks";
@@ -134,6 +144,39 @@ public class LuceneServiceImplJUnitTest {
}
@Test
+ public void testCreateIndexForPRWithAnalyzer() throws IOException, ParseException {
+ getService();
+ createPR("PR1", false);
+ StandardAnalyzer sa = new StandardAnalyzer();
+ KeywordAnalyzer ka = new KeywordAnalyzer();
+ Map<String, Analyzer> analyzerPerField = new HashMap<String, Analyzer>();
+ analyzerPerField.put("field1", ka);
+ analyzerPerField.put("field2", sa);
+ analyzerPerField.put("field3", sa);
+ // field2 and field3 will use StandardAnalyzer
+ PerFieldAnalyzerWrapper analyzer2 = new PerFieldAnalyzerWrapper(sa, analyzerPerField);
+
+ LuceneIndexImpl index1 = (LuceneIndexImpl)service.createIndex("index1", "PR1", analyzerPerField);
+ assertTrue(index1 instanceof LuceneIndexForPartitionedRegion);
+ LuceneIndexForPartitionedRegion index1PR = (LuceneIndexForPartitionedRegion)index1;
+ assertEquals("index1", index1.getName());
+ assertEquals("PR1", index1.getRegionPath());
+ String[] fields1 = index1.getFieldNames();
+ assertEquals(3, fields1.length);
+ Analyzer analyzer = index1PR.getAnalyzer();
+ assertTrue(analyzer instanceof PerFieldAnalyzerWrapper);
+ RepositoryManager RepositoryManager = index1PR.getRepositoryManager();
+ assertTrue(RepositoryManager != null);
+
+ final String fileRegionName = LuceneServiceImpl.getUniqueIndexName("index1", "PR1")+".files";
+ final String chunkRegionName = LuceneServiceImpl.getUniqueIndexName("index1", "PR1")+".chunks";
+ PartitionedRegion filePR = (PartitionedRegion)cache.getRegion(fileRegionName);
+ PartitionedRegion chunkPR = (PartitionedRegion)cache.getRegion(chunkRegionName);
+ assertTrue(filePR != null);
+ assertTrue(chunkPR != null);
+ }
+
+ @Test
public void testCreateIndexForRR() throws IOException, ParseException {
// service.createIndex("index1", "RR1", "field1", "field2", "field3");
[48/50] [abbrv] incubator-geode git commit: Fix
AnalyzeSerializablesJUnitTest,
add CopyOnWriteHashMap to sanctionedSerializables.txt
Posted by as...@apache.org.
Fix AnalyzeSerializablesJUnitTest, add CopyOnWriteHashMap to sanctionedSerializables.txt
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2cf4fb1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2cf4fb1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2cf4fb1a
Branch: refs/heads/develop
Commit: 2cf4fb1ab5fe899b5bfe01b2e8b22e4eb67157ef
Parents: 37cc70e
Author: Ashvin Agrawal <as...@apache.org>
Authored: Wed Nov 11 13:07:06 2015 -0800
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Wed Nov 11 13:07:06 2015 -0800
----------------------------------------------------------------------
.../com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2cf4fb1a/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt b/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
index 25e8813..b9252f7 100644
--- a/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
+++ b/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
@@ -143,7 +143,6 @@ com/gemstone/gemfire/cache/hdfs/internal/hoplog/HdfsSortedOplogOrganizer$HoplogR
com/gemstone/gemfire/cache/hdfs/internal/hoplog/Hoplog$HoplogVersion,false
com/gemstone/gemfire/cache/hdfs/internal/hoplog/Hoplog$Meta,false
com/gemstone/gemfire/cache/hdfs/internal/org/apache/hadoop/io/SequenceFile$CompressionType,false
-com/gemstone/gemfire/cache/lucene/LuceneQueryFactory$ResultType,false
com/gemstone/gemfire/cache/operations/PutAllOperationContext$UpdateOnlyMap,true,-1034234728574286014,m:java/util/Map
com/gemstone/gemfire/cache/partition/PartitionNotAvailableException,true,1
com/gemstone/gemfire/cache/persistence/ConflictingPersistentDataException,true,-2629287782021455875
@@ -635,6 +634,7 @@ com/gemstone/gemfire/internal/tcp/VersionedByteBufferInputStream,false,version:c
com/gemstone/gemfire/internal/util/Breadcrumbs$CrumbType,false
com/gemstone/gemfire/internal/util/SingletonValue$ValueState,false
com/gemstone/gemfire/internal/util/SunAPINotFoundException,false
+com/gemstone/gemfire/internal/util/concurrent/CopyOnWriteHashMap,false,map:java/util/Map
com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap,true,-7056732555635108300,compareValues:boolean,entryCreator:com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap$HashEntryCreator,segmentMask:int,segmentShift:int,segments:com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap$Segment[]
com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap$DefaultHashEntryCreator,true,3765680607280951726
com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap$IdentitySegment,true,3086228147110819882
[02/50] [abbrv] incubator-geode git commit: GEODE-11: Add a basic
lucene read path DUnit
Posted by as...@apache.org.
GEODE-11: Add a basic lucene read path DUnit
* The test depends on mock for now. As other components get ready, the mocks
could be replaced by real implementations.
* Also real queries need to be added and the results tested once the index
searchers are available
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f9ef456d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f9ef456d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f9ef456d
Branch: refs/heads/develop
Commit: f9ef456df43645d45fb777111c664215118f744b
Parents: 18e8f41
Author: Ashvin Agrawal <as...@apache.org>
Authored: Tue Sep 22 11:37:50 2015 -0700
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Tue Sep 22 14:00:10 2015 -0700
----------------------------------------------------------------------
.../lucene/internal/StringQueryProvider.java | 6 +-
.../internal/StringQueryProviderJUnitTest.java | 2 +-
.../distributed/LuceneFunctionJUnitTest.java | 2 +-
.../LuceneFunctionReadPathDUnitTest.java | 130 +++++++++++++++++++
4 files changed, 133 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f9ef456d/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
index 7055615..78a2f99 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
@@ -37,11 +37,7 @@ public class StringQueryProvider implements LuceneQueryProvider, DataSerializabl
private LuceneIndex index;
public StringQueryProvider() {
- this(null);
- }
-
- public StringQueryProvider(String query) {
- this(null, query);
+ this(null, null);
}
public StringQueryProvider(LuceneIndex index, String query) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f9ef456d/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
index 1ddc91c..078ae42 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
@@ -31,7 +31,7 @@ public class StringQueryProviderJUnitTest {
@Test
public void testQueryConstruction() throws QueryException {
- StringQueryProvider provider = new StringQueryProvider("foo:bar");
+ StringQueryProvider provider = new StringQueryProvider(null, "foo:bar");
Query query = provider.getQuery();
Assert.assertNotNull(query);
assertEquals("foo:bar", query.toString());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f9ef456d/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
index 1fcd663..ba5f96a 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
@@ -367,7 +367,7 @@ public class LuceneFunctionJUnitTest {
repos.add(mockRepository1);
repos.add(mockRepository2);
- queryProvider = new StringQueryProvider("gemfire:lucene");
+ queryProvider = new StringQueryProvider(null, "gemfire:lucene");
query = queryProvider.getQuery();
searchArgs = new LuceneFunctionContext<IndexResultCollector>(queryProvider);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f9ef456d/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
new file mode 100644
index 0000000..55c20cc
--- /dev/null
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
@@ -0,0 +1,130 @@
+package com.gemstone.gemfire.cache.lucene.internal.distributed;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.lucene.search.Query;
+import org.junit.Assert;
+import org.junit.experimental.categories.Category;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionFactory;
+import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.execute.FunctionService;
+import com.gemstone.gemfire.cache.lucene.LuceneIndex;
+import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider;
+import com.gemstone.gemfire.cache.lucene.LuceneService;
+import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
+import com.gemstone.gemfire.cache.lucene.internal.StringQueryProvider;
+import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
+import com.gemstone.gemfire.cache.lucene.internal.repository.IndexResultCollector;
+import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+@Category(DistributedTest.class)
+public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
+ private static final String INDEX_NAME = "index";
+ private static final String REGION_NAME = "indexedRegion";
+
+ private static final long serialVersionUID = 1L;
+
+ private VM server1;
+ private VM server2;
+
+ public LuceneFunctionReadPathDUnitTest(String name) {
+ super(name);
+ }
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ Host host = Host.getHost(0);
+ server1 = host.getVM(0);
+ server2 = host.getVM(1);
+ }
+
+ public void testEnd2EndFunctionExecution() {
+ SerializableRunnable createPartitionRegion = new SerializableRunnable("createRegion") {
+ private static final long serialVersionUID = 1L;
+
+ public void run() {
+ final Cache cache = getCache();
+ assertNotNull(cache);
+ RegionFactory<Object, Object> regionFactory = cache.createRegionFactory(RegionShortcut.PARTITION);
+ regionFactory.create(REGION_NAME);
+
+ LuceneService service = LuceneServiceProvider.get(cache);
+ service.createIndex(INDEX_NAME, REGION_NAME);
+
+ IndexRepository mockRepo = mock(IndexRepository.class);
+ Collection<IndexRepository> repos = new ArrayList<IndexRepository>();
+ repos.add(mockRepo);
+
+ RepositoryManager mockManager = mock(RepositoryManager.class);
+ // TODO avoid using repository manager mock. The manager choice depends on the region type
+ LuceneFunction.setRepositoryManager(mockManager);
+ try {
+ Mockito.doReturn(repos).when(mockManager).getRepositories(any(Region.class));
+ } catch (BucketNotFoundException e) {
+ fail("", e);
+ }
+
+ try {
+ Mockito.doAnswer(new Answer<Object>() {
+ public Object answer(InvocationOnMock invocation) {
+ Object[] args = invocation.getArguments();
+ IndexResultCollector collector = (IndexResultCollector) args[2];
+ collector.collect(cache.getDistributedSystem().getDistributedMember().getProcessId(), .1f);
+ return null;
+ }
+ }).when(mockRepo).query(any(Query.class), Mockito.anyInt(), any(IndexResultCollector.class));
+ } catch (IOException e) {
+ fail("", e);
+ }
+ }
+ };
+
+ server1.invoke(createPartitionRegion);
+ server2.invoke(createPartitionRegion);
+
+ SerializableRunnable executeSearch = new SerializableRunnable("executeSearch") {
+ private static final long serialVersionUID = 1L;
+
+ public void run() {
+ Cache cache = getCache();
+ assertNotNull(cache);
+ Region<Object, Object> region = cache.getRegion(REGION_NAME);
+ Assert.assertNotNull(region);
+
+ LuceneService service = LuceneServiceProvider.get(cache);
+ LuceneIndex index = service.getIndex(INDEX_NAME, REGION_NAME);
+ LuceneQueryProvider provider = new StringQueryProvider(index, "text:search");
+
+ LuceneFunctionContext<TopEntriesCollector> context = new LuceneFunctionContext<>(provider,
+ new TopEntriesCollectorManager());
+ TopEntriesFunctionCollector collector = new TopEntriesFunctionCollector();
+
+ FunctionService.onRegion(region).withArgs(context).withCollector(collector).execute(LuceneFunction.ID);
+ TopEntries entries = collector.getResult();
+ assertNotNull(entries);
+ assertEquals(2, entries.getHits().size());
+ }
+ };
+
+ server1.invoke(executeSearch);
+ }
+}
[38/50] [abbrv] incubator-geode git commit: Adding a microbenchmark
of create and query performance.
Posted by as...@apache.org.
Adding a microbenchmark of create and query performance.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1f597bb7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1f597bb7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1f597bb7
Branch: refs/heads/develop
Commit: 1f597bb707fb8482a3808e085c86d3c6b9d25fcf
Parents: d623cf6
Author: Dan Smith <up...@apache.org>
Authored: Fri Oct 16 14:53:58 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Fri Oct 16 14:54:50 2015 -0700
----------------------------------------------------------------------
...IndexRepositoryImplJUnitPerformanceTest.java | 422 +++++++++++++++++++
1 file changed, 422 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1f597bb7/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitPerformanceTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitPerformanceTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitPerformanceTest.java
new file mode 100644
index 0000000..8641254
--- /dev/null
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitPerformanceTest.java
@@ -0,0 +1,422 @@
+package com.gemstone.gemfire.cache.lucene.internal.repository;
+
+import static org.junit.Assert.*;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queryparser.classic.QueryParser;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.SearcherManager;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.store.RAMDirectory;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.carrotsearch.randomizedtesting.generators.RandomStrings;
+import com.gemstone.gemfire.DataSerializable;
+import com.gemstone.gemfire.DataSerializer;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
+import com.gemstone.gemfire.cache.lucene.LuceneIndex;
+import com.gemstone.gemfire.cache.lucene.LuceneQuery;
+import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider;
+import com.gemstone.gemfire.cache.lucene.LuceneQueryResults;
+import com.gemstone.gemfire.cache.lucene.LuceneService;
+import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
+import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl;
+import com.gemstone.gemfire.cache.lucene.internal.directory.RegionDirectory;
+import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesCollector;
+import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey;
+import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
+import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer;
+import com.gemstone.gemfire.cache.query.QueryException;
+import com.gemstone.gemfire.test.junit.categories.PerformanceTest;
+
+/**
+ * Microbenchmark of the IndexRepository to compare an
+ * IndexRepository built on top of cache with a
+ * stock lucene IndexWriter with a RAMDirectory.
+ */
+@Category(PerformanceTest.class)
+public class IndexRepositoryImplJUnitPerformanceTest {
+
+ private static final int NUM_WORDS = 1000;
+ private static int[] COMMIT_INTERVAL = new int[] {100, 1000, 5000};
+ private static int NUM_ENTRIES = 500_000;
+ private static int NUM_QUERIES = 500_000;
+
+ private StandardAnalyzer analyzer = new StandardAnalyzer();
+
+ @Test
+ public void testIndexRepository() throws Exception {
+
+
+ doTest("IndexRepository", new TestCallbacks() {
+
+ private Cache cache;
+ private IndexRepositoryImpl repo;
+ private IndexWriter writer;
+
+ @Override
+ public void addObject(String key, String text) throws Exception {
+ repo.create(key, new TestObject(text));
+ }
+
+ @Override
+ public void commit() throws Exception {
+ repo.commit();
+ }
+
+ @Override
+ public void init() throws Exception {
+ cache = new CacheFactory().set("mcast-port", "0")
+ .set("log-level", "error")
+ .create();
+ Region<String, File> fileRegion = cache.<String, File>createRegionFactory(RegionShortcut.REPLICATE).create("files");
+ Region<ChunkKey, byte[]> chunkRegion = cache.<ChunkKey, byte[]>createRegionFactory(RegionShortcut.REPLICATE).create("chunks");
+
+ RegionDirectory dir = new RegionDirectory(fileRegion, chunkRegion);
+
+
+ IndexWriterConfig config = new IndexWriterConfig(analyzer);
+ writer = new IndexWriter(dir, config);
+ String[] indexedFields= new String[] {"text"};
+ HeterogenousLuceneSerializer mapper = new HeterogenousLuceneSerializer(indexedFields);
+ repo = new IndexRepositoryImpl(fileRegion, writer, mapper);
+ }
+
+ @Override
+ public void cleanup() throws IOException {
+ writer.close();
+ cache.close();
+ }
+
+ @Override
+ public void waitForAsync() throws Exception {
+ //do nothing
+ }
+
+ @Override
+ public int query(Query query) throws IOException {
+ TopEntriesCollector collector = new TopEntriesCollector();
+ repo.query(query, 100, collector);
+ return collector.size();
+ }
+ });
+ }
+
+ /**
+ * Test our full lucene index implementation
+ * @throws Exception
+ */
+ @Test
+ public void testLuceneIndex() throws Exception {
+
+
+ doTest("LuceneIndex", new TestCallbacks() {
+
+ private Cache cache;
+ private Region<String, TestObject> region;
+ private LuceneService service;
+
+ @Override
+ public void addObject(String key, String text) throws Exception {
+ region.create(key, new TestObject(text));
+ }
+
+ @Override
+ public void commit() throws Exception {
+ //NA
+ }
+
+ @Override
+ public void init() throws Exception {
+ cache = new CacheFactory().set("mcast-port", "0")
+ .set("log-level", "warning")
+ .create();
+ service = LuceneServiceProvider.get(cache);
+ service.createIndex("index", "/region", "text");
+ region = cache.<String, TestObject>createRegionFactory(RegionShortcut.PARTITION)
+ .setPartitionAttributes(new PartitionAttributesFactory<>().setTotalNumBuckets(1).create())
+ .create("region");
+ }
+
+ @Override
+ public void cleanup() throws IOException {
+ cache.close();
+ }
+
+ @Override
+ public void waitForAsync() throws Exception {
+ AsyncEventQueue aeq = cache.getAsyncEventQueue(LuceneServiceImpl.getUniqueIndexName("index", "/region"));
+
+ //We will be at most 10 ms off
+ while(aeq.size() > 0) {
+ Thread.sleep(10);
+ }
+ }
+
+ @Override
+ public int query(final Query query) throws Exception {
+ LuceneQuery<Object, Object> luceneQuery = service.createLuceneQueryFactory().create("index", "/region", new LuceneQueryProvider() {
+
+ @Override
+ public Query getQuery(LuceneIndex index) throws QueryException {
+ return query;
+ }
+ });
+
+ LuceneQueryResults<Object, Object> results = luceneQuery.search();
+ return results.size();
+ }
+ });
+ }
+
+ @Test
+ public void testLuceneWithRegionDirectory() throws Exception {
+ doTest("RegionDirectory", new TestCallbacks() {
+
+ private IndexWriter writer;
+ private SearcherManager searcherManager;
+
+ @Override
+ public void init() throws Exception {
+ RegionDirectory dir = new RegionDirectory(new ConcurrentHashMap<String, File>(), new ConcurrentHashMap<ChunkKey, byte[]>());
+ IndexWriterConfig config = new IndexWriterConfig(analyzer);
+ writer = new IndexWriter(dir, config);
+ searcherManager = new SearcherManager(writer, true, null);
+ }
+
+ @Override
+ public void addObject(String key, String text) throws Exception {
+ Document doc = new Document();
+ doc.add(new TextField("key", key, Store.YES));
+ doc.add(new TextField("text", text, Store.NO));
+ writer.addDocument(doc);
+ }
+
+ @Override
+ public void commit() throws Exception {
+ writer.commit();
+ searcherManager.maybeRefresh();
+ }
+
+ @Override
+ public void cleanup() throws Exception {
+ writer.close();
+ }
+
+ @Override
+ public void waitForAsync() throws Exception {
+ //do nothing
+ }
+
+ @Override
+ public int query(Query query) throws Exception {
+ IndexSearcher searcher = searcherManager.acquire();
+ try {
+ return searcher.count(query);
+ } finally {
+ searcherManager.release(searcher);
+ }
+ }
+
+ });
+
+ }
+
+ @Test
+ public void testLucene() throws Exception {
+ doTest("Lucene", new TestCallbacks() {
+
+ private IndexWriter writer;
+ private SearcherManager searcherManager;
+
+ @Override
+ public void init() throws Exception {
+ RAMDirectory dir = new RAMDirectory();
+ IndexWriterConfig config = new IndexWriterConfig(analyzer);
+ writer = new IndexWriter(dir, config);
+ searcherManager = new SearcherManager(writer, true, null);
+ }
+
+ @Override
+ public void addObject(String key, String text) throws Exception {
+ Document doc = new Document();
+ doc.add(new TextField("key", key, Store.YES));
+ doc.add(new TextField("text", text, Store.NO));
+ writer.addDocument(doc);
+ }
+
+ @Override
+ public void commit() throws Exception {
+ writer.commit();
+ searcherManager.maybeRefresh();
+ }
+
+ @Override
+ public void cleanup() throws Exception {
+ writer.close();
+ }
+
+ @Override
+ public void waitForAsync() throws Exception {
+ //do nothing
+ }
+
+ @Override
+ public int query(Query query) throws Exception {
+ IndexSearcher searcher = searcherManager.acquire();
+ try {
+ return searcher.count(query);
+ } finally {
+ searcherManager.release(searcher);
+ }
+ }
+
+ });
+
+ }
+
+ private void doTest(String testName, TestCallbacks callbacks) throws Exception {
+
+ //Create some random words. We need to be careful
+ //to make sure we get NUM_WORDS distinct words here
+ Set<String> wordSet = new HashSet<String>();
+ Random rand = new Random();
+ while(wordSet.size() < NUM_WORDS) {
+ int length = rand.nextInt(12) + 3;
+ char[] text = new char[length];
+ for(int i = 0; i < length; i++) {
+ text[i] = (char) (rand.nextInt(26) + 97);
+ }
+ wordSet.add(new String(text));
+ }
+ List<String> words = new ArrayList<String>(wordSet.size());
+ words.addAll(wordSet);
+
+
+
+ //warm up
+ writeRandomWords(callbacks, words, rand, NUM_ENTRIES / 10, NUM_QUERIES / 10, COMMIT_INTERVAL[0]);
+
+ //Do the actual test
+
+ for(int i = 0; i < COMMIT_INTERVAL.length; i++) {
+ Results results = writeRandomWords(callbacks, words, rand, NUM_ENTRIES, NUM_QUERIES / 10, COMMIT_INTERVAL[i]);
+
+ System.out.println(testName + " writes(entries=" + NUM_ENTRIES + ", commit=" + COMMIT_INTERVAL[i] + "): " + TimeUnit.NANOSECONDS.toMillis(results.writeTime));
+ System.out.println(testName + " queries(entries=" + NUM_ENTRIES + ", commit=" + COMMIT_INTERVAL[i] + "): " + TimeUnit.NANOSECONDS.toMillis(results.queryTime));
+ }
+ }
+
+ private Results writeRandomWords(TestCallbacks callbacks, List<String> words,
+ Random rand, int numEntries, int numQueries, int commitInterval) throws Exception {
+ Results results = new Results();
+ callbacks.init();
+ int[] counts = new int[words.size()];
+ long start = System.nanoTime();
+ try {
+ for(int i =0; i < numEntries; i++) {
+ int word1 = rand.nextInt(words.size());
+ int word2 = rand.nextInt(words.size());
+ counts[word1]++;
+ counts[word2]++;
+ String value = words.get(word1) + " " + words.get(word2);
+ callbacks.addObject("key" + i, value);
+
+ if(i % commitInterval == 0 && i != 0) {
+ callbacks.commit();
+ }
+ }
+ callbacks.commit();
+ callbacks.waitForAsync();
+ long end = System.nanoTime();
+ results.writeTime = end - start;
+
+
+ start = System.nanoTime();
+ for(int i=0; i < numQueries; i++) {
+ int wordIndex = rand.nextInt(words.size());
+ String word = words.get(wordIndex);
+ Query query = new TermQuery(new Term("text", word));
+ int size = callbacks.query(query);
+// int size = callbacks.query(parser.parse(word));
+ //All of my tests sometimes seem to be missing a couple of words, including the stock lucene
+// assertEquals("Error on query " + i + " word=" + word, counts[wordIndex], size);
+ }
+ end = System.nanoTime();
+ results.queryTime = end - start;
+
+ return results;
+ } finally {
+ callbacks.cleanup();
+ }
+ }
+
+ private static class TestObject implements DataSerializable {
+ private String text;
+
+ public TestObject() {
+
+ }
+
+ public TestObject(String text) {
+ super();
+ this.text = text;
+ }
+
+ @Override
+ public void toData(DataOutput out) throws IOException {
+ DataSerializer.writeString(text, out);
+ }
+
+ @Override
+ public void fromData(DataInput in)
+ throws IOException, ClassNotFoundException {
+ text = DataSerializer.readString(in);
+ }
+
+ @Override
+ public String toString() {
+ return text;
+ }
+
+
+ }
+
+ private interface TestCallbacks {
+ public void init() throws Exception;
+ public int query(Query query) throws Exception;
+ public void addObject(String key, String text) throws Exception;
+ public void commit() throws Exception;
+ public void waitForAsync() throws Exception;
+ public void cleanup() throws Exception;
+ }
+
+ private static class Results {
+ long writeTime;
+ long queryTime;
+ }
+}
[41/50] [abbrv] incubator-geode git commit: Merge remote-tracking
branch 'origin/develop' into feature/GEODE-11
Posted by as...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/build.gradle
----------------------------------------------------------------------
diff --cc gemfire-core/build.gradle
index 185be12,b44525c..80761ed
--- a/gemfire-core/build.gradle
+++ b/gemfire-core/build.gradle
@@@ -11,61 -11,63 +11,59 @@@ configurations
}
dependencies {
+ // Source Dependencies
+ // External
provided files("${System.getProperty('java.home')}/../lib/tools.jar")
- compile 'antlr:antlr:2.7.7'
- compile 'com.fasterxml.jackson.core:jackson-annotations:2.2.0'
- compile 'com.fasterxml.jackson.core:jackson-core:2.2.0'
- compile 'com.fasterxml.jackson.core:jackson-databind:2.2.0'
- compile 'com.google.code.findbugs:annotations:3.0.0'
- compile 'commons-io:commons-io:2.3'
- compile 'commons-logging:commons-logging:1.1.1'
- compile 'commons-modeler:commons-modeler:2.0'
- compile 'it.unimi.dsi:fastutil:7.0.2'
- compile 'javax.activation:activation:1.1.1'
- compile 'javax.mail:javax.mail-api:1.4.5'
- compile 'javax.resource:javax.resource-api:1.7'
- compile 'javax.servlet:javax.servlet-api:3.1.0'
- compile 'javax.transaction:javax.transaction-api:1.2'
- compile 'mx4j:mx4j:3.0.1'
- compile 'mx4j:mx4j-remote:3.0.1'
- compile 'mx4j:mx4j-tools:3.0.1'
- compile 'net.java.dev.jna:jna:4.0.0'
- compile 'net.sourceforge.jline:jline:1.0.S2-B'
- compile 'org.eclipse.jetty:jetty-http:9.2.3.v20140905'
- compile 'org.eclipse.jetty:jetty-io:9.2.3.v20140905'
- compile 'org.eclipse.jetty:jetty-security:9.2.3.v20140905'
- compile 'org.eclipse.jetty:jetty-server:9.2.3.v20140905'
- compile 'org.eclipse.jetty:jetty-servlet:9.2.3.v20140905'
- compile 'org.eclipse.jetty:jetty-util:9.2.3.v20140905'
- compile 'org.eclipse.jetty:jetty-webapp:9.2.3.v20140905'
- compile 'org.eclipse.jetty:jetty-xml:9.2.3.v20140905'
- compile 'org.fusesource.jansi:jansi:1.8'
- compile 'org.apache.logging.log4j:log4j-api:2.1'
- compile 'org.apache.logging.log4j:log4j-core:2.1'
- runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.1'
- runtime 'org.apache.logging.log4j:log4j-jcl:2.1'
- runtime 'org.apache.logging.log4j:log4j-jul:2.1'
- compile 'org.slf4j:slf4j-api:1.7.7'
- compile 'org.springframework.data:spring-data-commons:1.9.1.RELEASE'
- provided 'org.springframework.data:spring-data-gemfire:1.5.1.RELEASE'
- compile 'org.springframework:spring-tx:3.2.12.RELEASE'
- compile 'org.springframework.shell:spring-shell:1.0.0.RELEASE'
- compile 'org.xerial.snappy:snappy-java:1.1.1.6'
- provided 'org.apache.hadoop:hadoop-common:2.4.1'
- provided 'org.apache.hadoop:hadoop-annotations:2.4.1'
- provided 'org.apache.hadoop:hadoop-hdfs:2.4.1'
- provided 'org.apache.hadoop:hadoop-mapreduce-client-core:2.4.1'
- compile 'org.apache.hbase:hbase:0.94.27'
- provided 'commons-lang:commons-lang:2.5'
- provided 'com.google.guava:guava:11.0.2'
- compile 'io.netty:netty-all:4.0.4.Final'
-
- testRuntime 'org.apache.hadoop:hadoop-auth:2.4.1'
- testRuntime 'commons-collections:commons-collections:3.2.1'
- testRuntime 'commons-configuration:commons-configuration:1.6'
- testRuntime 'commons-io:commons-io:2.1'
- testRuntime 'log4j:log4j:1.2.17'
-
+ compile 'antlr:antlr:' + project.'antlr.version'
+ compile 'com.fasterxml.jackson.core:jackson-annotations:' + project.'jackson.version'
+ compile 'com.fasterxml.jackson.core:jackson-core:' + project.'jackson.version'
+ compile 'com.fasterxml.jackson.core:jackson-databind:' + project.'jackson.version'
+ compile 'com.google.code.findbugs:annotations:' + project.'annotations.version'
+ provided 'com.google.guava:guava:' + project.'guava.version'
+ compile 'commons-io:commons-io:' + project.'commons-io.version'
+ provided 'commons-lang:commons-lang:' + project.'commons-lang.version'
+ compile 'commons-logging:commons-logging:' + project.'commons-logging.version'
+ compile 'commons-modeler:commons-modeler:' + project.'commons-modeler.version'
+ compile 'io.netty:netty-all:' + project.'netty-all.version'
+ compile 'it.unimi.dsi:fastutil:' + project.'fastutil.version'
+ compile 'javax.activation:activation:' + project.'activation.version'
+ compile 'javax.mail:javax.mail-api:' + project.'javax.mail-api.version'
+ compile 'javax.resource:javax.resource-api:' + project.'javax.resource-api.version'
+ compile 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
+ compile 'javax.transaction:javax.transaction-api:' + project.'javax.transaction-api.version'
+ compile 'mx4j:mx4j:' + project.'mx4j.version'
+ compile 'mx4j:mx4j-remote:' + project.'mx4j.version'
+ compile 'mx4j:mx4j-tools:' + project.'mx4j.version'
+ compile 'net.java.dev.jna:jna:' + project.'jna.version'
+ compile 'net.sourceforge.jline:jline:' + project.'jline.version'
+ provided 'org.apache.hadoop:hadoop-common:' + project.'hadoop.version'
+ provided 'org.apache.hadoop:hadoop-annotations:' + project.'hadoop.version'
+ provided 'org.apache.hadoop:hadoop-hdfs:' + project.'hadoop.version'
+ provided 'org.apache.hadoop:hadoop-mapreduce-client-core:' + project.'hadoop.version'
+ compile 'org.apache.hbase:hbase:' + project.'hbase.version'
+ compile 'org.apache.logging.log4j:log4j-api:' + project.'log4j.version'
+ compile 'org.apache.logging.log4j:log4j-core:' + project.'log4j.version'
+ runtime 'org.apache.logging.log4j:log4j-slf4j-impl:' + project.'log4j.version'
+ runtime 'org.apache.logging.log4j:log4j-jcl:' + project.'log4j.version'
+ runtime 'org.apache.logging.log4j:log4j-jul:' + project.'log4j.version'
- compile 'org.apache.lucene:lucene-analyzers-common:' + project.'lucene.version'
- compile 'org.apache.lucene:lucene-core:' + project.'lucene.version'
- compile 'org.apache.lucene:lucene-queries:' + project.'lucene.version'
- compile 'org.apache.lucene:lucene-queryparser:' + project.'lucene.version'
+ compile 'org.eclipse.jetty:jetty-http:' + project.'jetty.version'
+ compile 'org.eclipse.jetty:jetty-io:' + project.'jetty.version'
+ compile 'org.eclipse.jetty:jetty-security:' + project.'jetty.version'
+ compile 'org.eclipse.jetty:jetty-server:' + project.'jetty.version'
+ compile 'org.eclipse.jetty:jetty-servlet:' + project.'jetty.version'
+ compile 'org.eclipse.jetty:jetty-util:' + project.'jetty.version'
+ compile 'org.eclipse.jetty:jetty-webapp:' + project.'jetty.version'
+ compile 'org.eclipse.jetty:jetty-xml:' + project.'jetty.version'
+ compile 'org.fusesource.jansi:jansi:' + project.'jansi.version'
+ compile 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'
+ compile 'org.springframework.data:spring-data-commons:' + project.'spring-data-commons.version'
+ provided 'org.springframework.data:spring-data-gemfire:' + project.'spring-data-gemfire.version'
+ compile 'org.springframework:spring-tx:' + project.'springframework.version'
+ compile 'org.springframework.shell:spring-shell:' + project.'spring-shell.version'
+ compile 'org.xerial.snappy:snappy-java:' + project.'snappy-java.version'
+ compile 'org.apache.hbase:hbase:' + project.'hbase.version'
+
+ compile project(':gemfire-common')
compile project(':gemfire-jgroups')
compile project(':gemfire-joptsimple')
compile project(':gemfire-json')
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/cache/GemFireCache.java
----------------------------------------------------------------------
diff --cc gemfire-core/src/main/java/com/gemstone/gemfire/cache/GemFireCache.java
index f5ad158,c7cce3c..9425706
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/GemFireCache.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/GemFireCache.java
@@@ -18,8 -27,7 +27,6 @@@ import com.gemstone.gemfire.LogWriter
import com.gemstone.gemfire.cache.client.ClientCache;
import com.gemstone.gemfire.cache.client.ClientCacheFactory;
import com.gemstone.gemfire.cache.control.ResourceManager;
- import com.gemstone.gemfire.cache.hdfs.HDFSStore;
- import com.gemstone.gemfire.cache.hdfs.HDFSStoreFactory;
-import com.gemstone.gemfire.cache.lucene.LuceneService;
import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.pdx.PdxSerializer;
@@@ -252,20 -260,10 +259,4 @@@ public interface GemFireCache extends R
* @since 6.6
*/
public Properties getInitializerProps();
--
-- /**
- * Returns the HDFSStore by name or <code>null</code> if no HDFSStore is
- * found.
- *
- * @param name the name of the HDFSStore to find.
- * Returns the LuceneService singleton instance.
- * @since 8.5
-- */
- public HDFSStore findHDFSStore(String name);
-
- /**
- * Creates a {@link HDFSStoreFactory} for creating a {@link HDFSStore}
- *
- * @return the HDFS store factory
- */
- public HDFSStoreFactory createHDFSStoreFactory();
-
- public LuceneService getLuceneService();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/AsyncEventQueueFactoryImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/AsyncEventQueueImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPoint.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderAttributes.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/DefaultEntityResolver2.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CopyOnWriteHashMap.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CopyOnWriteWeakHashMap.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
----------------------------------------------------------------------
diff --cc gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
index fc9752a,0000000..49b74b1
mode 100644,000000..100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
@@@ -1,49 -1,0 +1,58 @@@
- /*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *========================================================================
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one or more
++ * contributor license agreements. See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to You under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
+ */
+
+package com.gemstone.gemfire.cache.lucene;
+
+import java.util.Map;
+
+import org.apache.lucene.analysis.Analyzer;
+
+
+/**
+ * An lucene index is built over the data stored in a GemFire Region.
+ * <p>
+ * An index is specified using a index name, field names, region name.
+ * <p>
+ * The index name and region name together uniquely identifies the lucene index.
+ * <p>
+ *
+ * @author Xiaojian Zhou
+ * @since 8.5
+ */
+public interface LuceneIndex {
+
+ /**
+ * @return the index name of this index
+ */
+ public String getName();
+
+ /**
+ * @return the region name for this index
+ */
+ public String getRegionPath();
+
+ /**
+ * @return the indexed field names in a Set
+ */
+ public String[] getFieldNames();
+
+ /**
+ * @return the field to analyzer map
+ */
+ public Map<String, Analyzer> getFieldAnalyzerMap();
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
----------------------------------------------------------------------
diff --cc gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
index 09d3a07,0000000..e10b686
mode 100644,000000..100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
@@@ -1,29 -1,0 +1,45 @@@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one or more
++ * contributor license agreements. See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to You under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
+package com.gemstone.gemfire.cache.lucene;
+
+/**
+ * Provides wrapper object of Lucene's Query object and execute the search.
+ * <p>Instances of this interface are created using
+ * {@link LuceneQueryFactory#create}.
+ *
+ */
+public interface LuceneQuery<K, V> {
+ /**
+ * Execute the search and get results.
+ */
+ public LuceneQueryResults<K, V> search();
+
+ /**
+ * Get page size setting of current query.
+ */
+ public int getPageSize();
+
+ /**
+ * Get limit size setting of current query.
+ */
+ public int getLimit();
+
+ /**
+ * Get projected fields setting of current query.
+ */
+ public String[] getProjectedFieldNames();
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
----------------------------------------------------------------------
diff --cc gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
index eea4b88,0000000..6604926
mode 100644,000000..100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
@@@ -1,83 -1,0 +1,99 @@@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one or more
++ * contributor license agreements. See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to You under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
+package com.gemstone.gemfire.cache.lucene;
+
+import org.apache.lucene.queryparser.classic.ParseException;
+
+/**
+ * Factory for creating instances of {@link LuceneQuery}.
+ * To get an instance of this factory call {@link LuceneService#createLuceneQueryFactory}.
+ * <P>
+ * To use this factory configure it with the <code>set</code> methods and then
+ * call {@link #create} to produce a {@link LuceneQuery} instance.
+ *
+ * @author Xiaojian Zhou
+ * @since 8.5
+ */
+public interface LuceneQueryFactory {
+
+ /**
+ * Default query result limit is 100
+ */
+ public static final int DEFAULT_LIMIT = 100;
+
+ /**
+ * Default page size of result is 0, which means no pagination
+ */
+ public static final int DEFAULT_PAGESIZE = 0;
+
+ /**
+ * Set page size for a query result. The default page size is 0 which means no pagination.
+ * If specified negative value, throw IllegalArgumentException
+ * @param pageSize
+ * @return itself
+ */
+ LuceneQueryFactory setPageSize(int pageSize);
+
+ /**
+ * Set max limit of result for a query
+ * If specified limit is less or equal to zero, throw IllegalArgumentException
+ * @param limit
+ * @return itself
+ */
+ LuceneQueryFactory setResultLimit(int limit);
+
+ /**
+ * Set a list of fields for result projection.
+ *
+ * @param fieldNames
+ * @return itself
+ *
+ * @deprecated TODO This feature is not yet implemented
+ */
+ @Deprecated
+ LuceneQueryFactory setProjectionFields(String... fieldNames);
+
+ /**
+ * Create wrapper object for lucene's QueryParser object using default standard analyzer.
+ * The queryString is using lucene QueryParser's syntax. QueryParser is for easy-to-use
+ * with human understandable syntax.
+ *
+ * @param regionName region name
+ * @param indexName index name
+ * @param queryString query string in lucene QueryParser's syntax
+ * @param K the key type in the query results
+ * @param V the value type in the query results
+ * @return LuceneQuery object
+ * @throws ParseException
+ */
+ public <K, V> LuceneQuery<K, V> create(String indexName, String regionName, String queryString)
+ throws ParseException;
+
+ /**
+ * Creates a wrapper object for Lucene's Query object. This {@link LuceneQuery} builder method could be used in
+ * advanced cases, such as cases where Lucene's Query object construction needs Lucene's API over query string. The
+ * {@link QueryDeserializer} will be used to re-construct the Lucene Query object on remote hosts.
+ *
+ * @param indexName index name
+ * @param regionName region name
+ * @param provider constructs and provides a Lucene Query object
+ * @param K the key type in the query results
+ * @param V the value type in the query results
+ * @return LuceneQuery object
+ */
+ public <K, V> LuceneQuery<K, V> create(String indexName, String regionName, LuceneQueryProvider provider);
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java
----------------------------------------------------------------------
diff --cc gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java
index 6ed0b99,0000000..1cf3c7c
mode 100644,000000..100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java
@@@ -1,45 -1,0 +1,61 @@@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one or more
++ * contributor license agreements. See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to You under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
+package com.gemstone.gemfire.cache.lucene;
+
+
+/**
+ * <p>
+ * Abstract data structure for one item in query result.
+ *
+ * @author Xiaojian Zhou
+ * @since 8.5
+ */
+public interface LuceneResultStruct<K, V> {
+ /**
+ * Return the value associated with the given field name
+ *
+ * @param fieldName the String name of the field
+ * @return the value associated with the specified field
+ * @throws IllegalArgumentException If this struct does not have a field named fieldName
+ */
+ public Object getProjectedField(String fieldName);
+
+ /**
+ * Return key of the entry
+ *
+ * @return key
+ * @throws IllegalArgumentException If this struct does not contain key
+ */
+ public K getKey();
+
+ /**
+ * Return value of the entry
+ *
+ * @return value the whole domain object
+ * @throws IllegalArgumentException If this struct does not contain value
+ */
+ public V getValue();
+
+ /**
+ * Return score of the query
+ *
+ * @return score
+ * @throws IllegalArgumentException If this struct does not contain score
+ */
+ public float getScore();
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
----------------------------------------------------------------------
diff --cc gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
index 6c629de,0000000..6bbb4fd
mode 100644,000000..100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
@@@ -1,110 -1,0 +1,126 @@@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one or more
++ * contributor license agreements. See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to You under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
+package com.gemstone.gemfire.cache.lucene;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.lucene.analysis.Analyzer;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.GemFireCache;
+import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl;
+import com.gemstone.gemfire.internal.cache.extension.Extensible;
+
+/**
+ * LuceneService instance is a singleton for each cache. It will be created in cache
+ * constructor and get its reference via {@link GemFireCache#getLuceneService()}.
+ *
+ * It provides handle for managing the {@link LuceneIndex} and create the {@link LuceneQuery}
+ * via {@link LuceneQueryFactory}
+ *
+ * </p>
+ * Example: <br>
+ *
+ * <pre>
+ * At client and server JVM, initializing cache will create the LuceneServiceImpl object,
+ * which is a singleton at each JVM.
+ *
+ * At each server JVM, for data region to create index, create the index on fields with default analyzer:
+ * LuceneIndex index = luceneService.createIndex(indexName, regionName, "field1", "field2", "field3");
+ * or create index on fields with specified analyzer:
+ * LuceneIndex index = luceneService.createIndex(indexName, regionName, analyzerPerField);
+ *
+ * We can also create index via cache.xml or gfsh.
+ *
+ * At client side, create query and run the search:
+ *
+ * LuceneQuery query = luceneService.createLuceneQueryFactory().setLimit(200).setPageSize(20)
+ * .setResultTypes(SCORE, VALUE, KEY).setFieldProjection("field1", "field2")
+ * .create(indexName, regionName, querystring, analyzer);
+ *
+ * The querystring is using lucene's queryparser syntax, such as "field1:zhou* AND field2:gzhou@pivotal.io"
+ *
+ * LuceneQueryResults results = query.search();
+ *
+ * If pagination is not specified:
+ * List list = results.getNextPage(); // return all results in one getNextPage() call
+ * or if paging is specified:
+ * if (results.hasNextPage()) {
+ * List page = results.nextPage(); // return resules page by page
+ * }
+ *
+ * The item of the list is either the domain object or instance of {@link LuceneResultStruct}
+ * </pre>
+ *
+ * @author Xiaojian Zhou
+ *
+ */
+public interface LuceneService {
+
+ /**
+ * Create a lucene index using default analyzer.
+ *
+ * @param indexName
+ * @param regionPath
+ * @param fields
+ * @return LuceneIndex object
+ */
+ public void createIndex(String indexName, String regionPath, String... fields);
+
+ /**
+ * Create a lucene index using specified analyzer per field
+ *
+ * @param indexName index name
+ * @param regionPath region name
+ * @param analyzerPerField analyzer per field map
+ * @return LuceneIndex object
+ * @deprecated TODO This feature is not yet implemented
+ */
+ @Deprecated
+ public void createIndex(String indexName, String regionPath,
+ Map<String, Analyzer> analyzerPerField);
+
+ /**
+ * Destroy the lucene index
+ *
+ * @param index index object
+ * @deprecated TODO This feature is not yet implemented
+ */
+ @Deprecated
+ public void destroyIndex(LuceneIndex index);
+
+ /**
+ * Get the lucene index object specified by region name and index name
+ * @param indexName index name
+ * @param regionPath region name
+ * @return LuceneIndex object
+ */
+ public LuceneIndex getIndex(String indexName, String regionPath);
+
+ /**
+ * get all the lucene indexes.
+ * @return all index objects in a Collection
+ */
+ public Collection<LuceneIndex> getAllIndexes();
+
+ /**
+ * create LuceneQueryFactory
+ * @return LuceneQueryFactory object
+ */
+ public LuceneQueryFactory createLuceneQueryFactory();
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f189ff52/settings.gradle
----------------------------------------------------------------------
[21/50] [abbrv] incubator-geode git commit: GEODE-11: Keep results in
collector unmodified
Posted by as...@apache.org.
GEODE-11: Keep results in collector unmodified
Earlier TopEntriesCollectorManager.reduce method was modifying the hits
collected in TopEntriesCollector. As a result calling getResults twice will
fail. The collected entry set needs to be preserved without making a copy.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/58ddc22e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/58ddc22e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/58ddc22e
Branch: refs/heads/develop
Commit: 58ddc22e6d321abf80e9e674c3abea2d469b847e
Parents: 75abaf5
Author: Ashvin Agrawal <as...@apache.org>
Authored: Fri Oct 2 11:37:52 2015 -0700
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Fri Oct 2 11:37:52 2015 -0700
----------------------------------------------------------------------
.../distributed/TopEntriesCollectorManager.java | 49 ++++++++++----
.../TopEntriesFunctionCollector.java | 9 ++-
.../TopEntriesCollectorJUnitTest.java | 71 +++++++++++++++-----
.../TopEntriesFunctionCollectorJUnitTest.java | 18 +++++
4 files changed, 117 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/58ddc22e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
index 37631c6..417d80f 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
@@ -54,41 +54,42 @@ public class TopEntriesCollectorManager implements CollectorManager<TopEntriesCo
if (collectors.isEmpty()) {
return mergedResult;
}
-
+
final EntryScoreComparator scoreComparator = new TopEntries().new EntryScoreComparator();
// orders a entry with higher score above a doc with lower score
- Comparator<List<EntryScore>> entryListComparator = new Comparator<List<EntryScore>>() {
+ Comparator<ListScanner> entryListComparator = new Comparator<ListScanner>() {
@Override
- public int compare(List<EntryScore> l1, List<EntryScore> l2) {
- EntryScore o1 = l1.get(0);
- EntryScore o2 = l2.get(0);
+ public int compare(ListScanner l1, ListScanner l2) {
+ EntryScore o1 = l1.peek();
+ EntryScore o2 = l2.peek();
return scoreComparator.compare(o1, o2);
}
};
// The queue contains iterators for all bucket results. The queue puts the entry with the highest score at the head
// using score comparator.
- PriorityQueue<List<EntryScore>> entryListsPriorityQueue;
- entryListsPriorityQueue = new PriorityQueue<List<EntryScore>>(collectors.size(), Collections.reverseOrder(entryListComparator));
+ PriorityQueue<ListScanner> entryListsPriorityQueue;
+ entryListsPriorityQueue = new PriorityQueue<ListScanner>(collectors.size(),
+ Collections.reverseOrder(entryListComparator));
for (IndexResultCollector collector : collectors) {
logger.debug("Number of entries found in collector {} is {}", collector.getName(), collector.size());
if (collector.size() > 0) {
- entryListsPriorityQueue.add(((TopEntriesCollector) collector).getEntries().getHits());
+ entryListsPriorityQueue.add(new ListScanner(((TopEntriesCollector) collector).getEntries().getHits()));
}
}
logger.debug("Only {} count of entries will be reduced. Other entries will be ignored", limit);
while (entryListsPriorityQueue.size() > 0 && limit > mergedResult.size()) {
- List<EntryScore> list = entryListsPriorityQueue.remove();
- EntryScore entry = list.remove(0);
+ ListScanner scanner = entryListsPriorityQueue.remove();
+ EntryScore entry = scanner.next();
mergedResult.collect(entry);
- if (list.size() > 0) {
- entryListsPriorityQueue.add(list);
+ if (scanner.hasNext()) {
+ entryListsPriorityQueue.add(scanner);
}
}
@@ -96,6 +97,30 @@ public class TopEntriesCollectorManager implements CollectorManager<TopEntriesCo
return mergedResult;
}
+ /*
+ * Utility class to iterate on hits without modifying it
+ */
+ static class ListScanner {
+ private List<EntryScore> hits;
+ private int index = 0;
+
+ ListScanner(List<EntryScore> hits) {
+ this.hits = hits;
+ }
+
+ boolean hasNext() {
+ return index < hits.size();
+ }
+
+ EntryScore peek() {
+ return hits.get(index);
+ }
+
+ EntryScore next() {
+ return hits.get(index++);
+ }
+ }
+
@Override
public Version[] getSerializationVersions() {
return null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/58ddc22e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
index 26586d9..032e136 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
@@ -40,6 +40,7 @@ public class TopEntriesFunctionCollector implements ResultCollector<TopEntriesCo
private static final Logger logger = LogService.getLogger();
private final Collection<TopEntriesCollector> subResults = new ArrayList<>();
+ private TopEntriesCollector mergedResults;
public TopEntriesFunctionCollector() {
this(null, null);
@@ -99,9 +100,13 @@ public class TopEntriesFunctionCollector implements ResultCollector<TopEntriesCo
private TopEntries aggregateResults() {
synchronized (subResults) {
+ if (mergedResults != null) {
+ return mergedResults.getEntries();
+ }
+
try {
- TopEntriesCollector finalResult = manager.reduce(subResults);
- return finalResult.getEntries();
+ mergedResults = manager.reduce(subResults);
+ return mergedResults.getEntries();
} catch (IOException e) {
logger.debug("Error while merging function execution results", e);
throw new FunctionException(e);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/58ddc22e/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
index 50c9f92..8acdd5a 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
@@ -5,31 +5,38 @@ import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.List;
+import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.CopyHelper;
import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl;
+import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesCollectorManager.ListScanner;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class TopEntriesCollectorJUnitTest {
+ EntryScore r1_1 = new EntryScore("1-1", .9f);
+ EntryScore r1_2 = new EntryScore("1-2", .7f);
+ EntryScore r1_3 = new EntryScore("1-3", .5f);
- @Test
- public void testReduce() throws Exception {
- EntryScore r1_1 = new EntryScore("1-1", .9f);
- EntryScore r1_2 = new EntryScore("1-2", .7f);
- EntryScore r1_3 = new EntryScore("1-3", .5f);
+ EntryScore r2_1 = new EntryScore("2-1", .85f);
+ EntryScore r2_2 = new EntryScore("2-2", .65f);
- EntryScore r2_1 = new EntryScore("2-1", .85f);
- EntryScore r2_2 = new EntryScore("2-2", .65f);
+ EntryScore r3_1 = new EntryScore("3-1", .8f);
+ EntryScore r3_2 = new EntryScore("3-2", .6f);
+ EntryScore r3_3 = new EntryScore("3-3", .4f);
- EntryScore r3_1 = new EntryScore("3-1", .8f);
- EntryScore r3_2 = new EntryScore("3-2", .6f);
- EntryScore r3_3 = new EntryScore("3-3", .4f);
+ TopEntriesCollectorManager manager;
- TopEntriesCollectorManager manager = new TopEntriesCollectorManager();
+ @Before
+ public void setup() {
+ manager = new TopEntriesCollectorManager();
+ }
+ @Test
+ public void testReduce() throws Exception {
TopEntriesCollector c1 = manager.newCollector("c1");
c1.collect(r1_1.getKey(), r1_1.getScore());
c1.collect(r1_2.getKey(), r1_2.getScore());
@@ -49,11 +56,17 @@ public class TopEntriesCollectorJUnitTest {
collectors.add(c2);
collectors.add(c3);
- TopEntriesCollector entries = manager.reduce(collectors);
- assertEquals(8, entries.getEntries().getHits().size());
- TopEntriesJUnitTest.verifyResultOrder(entries.getEntries().getHits(), r1_1, r2_1, r3_1, r1_2, r2_2, r3_2, r1_3, r3_3);
+ TopEntriesCollector hits = manager.reduce(collectors);
+ assertEquals(8, hits.getEntries().getHits().size());
+ TopEntriesJUnitTest.verifyResultOrder(hits.getEntries().getHits(), r1_1, r2_1, r3_1, r1_2, r2_2, r3_2, r1_3, r3_3);
+
+ // input collector should not change
+ assertEquals(3, c1.getEntries().getHits().size());
+ assertEquals(2, c2.getEntries().getHits().size());
+ assertEquals(3, c3.getEntries().getHits().size());
+ // TopEntriesJUnitTest.verifyResultOrder(c1.getEntries().getHits(), r1_1, r2_1, r3_1, r1_2, r2_2, r3_2, r1_3, r3_3);
}
-
+
@Test
public void testInitialization() {
TopEntriesCollector collector = new TopEntriesCollector("name");
@@ -69,7 +82,7 @@ public class TopEntriesCollectorJUnitTest {
assertEquals("id", copy.getId());
assertEquals(213, copy.getLimit());
}
-
+
@Test
public void testCollectorSerialization() {
LuceneServiceImpl.registerDataSerializables();
@@ -78,4 +91,30 @@ public class TopEntriesCollectorJUnitTest {
assertEquals("collector", copy.getName());
assertEquals(345, copy.getEntries().getLimit());
}
+
+ @Test
+ public void testScannerDoesNotMutateHits() {
+ TopEntriesCollector c1 = manager.newCollector("c1");
+ c1.collect(r1_1.getKey(), r1_1.getScore());
+ c1.collect(r1_2.getKey(), r1_2.getScore());
+ c1.collect(r1_3.getKey(), r1_3.getScore());
+
+ assertEquals(3, c1.getEntries().getHits().size());
+ TopEntriesJUnitTest.verifyResultOrder(c1.getEntries().getHits(), r1_1, r1_2, r1_3);
+
+ ListScanner scanner = new ListScanner(c1.getEntries().getHits());
+ Assert.assertTrue(scanner.hasNext());
+ assertEquals(r1_1.getKey(), scanner.peek().getKey());
+ assertEquals(r1_1.getKey(), scanner.next().getKey());
+ Assert.assertTrue(scanner.hasNext());
+ assertEquals(r1_2.getKey(), scanner.peek().getKey());
+ assertEquals(r1_2.getKey(), scanner.next().getKey());
+ Assert.assertTrue(scanner.hasNext());
+ assertEquals(r1_3.getKey(), scanner.peek().getKey());
+ assertEquals(r1_3.getKey(), scanner.next().getKey());
+ Assert.assertFalse(scanner.hasNext());
+
+ assertEquals(3, c1.getEntries().getHits().size());
+ TopEntriesJUnitTest.verifyResultOrder(c1.getEntries().getHits(), r1_1, r1_2, r1_3);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/58ddc22e/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
index 5f7dc3d..f17200b 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
@@ -211,6 +211,24 @@ public class TopEntriesFunctionCollectorJUnitTest {
}
@Test
+ public void getResultsTwice() throws Exception {
+ TopEntriesFunctionCollector collector = new TopEntriesFunctionCollector();
+ collector.addResult(null, result1);
+ collector.addResult(null, result2);
+ collector.endResults();
+
+ TopEntries merged = collector.getResult();
+ Assert.assertNotNull(merged);
+ assertEquals(4, merged.size());
+ TopEntriesJUnitTest.verifyResultOrder(merged.getHits(), r1_1, r2_1, r1_2, r2_2);
+
+ merged = collector.getResult();
+ Assert.assertNotNull(merged);
+ assertEquals(4, merged.size());
+ TopEntriesJUnitTest.verifyResultOrder(merged.getHits(), r1_1, r2_1, r1_2, r2_2);
+ }
+
+ @Test
public void mergeResultsCustomCollectorManager() throws Exception {
TopEntries resultEntries = new TopEntries();
TopEntriesCollector mockCollector = mock(TopEntriesCollector.class);
[27/50] [abbrv] incubator-geode git commit: GEODE-11: Remove trivial
sysouts and empty tests
Posted by as...@apache.org.
GEODE-11: Remove trivial sysouts and empty tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/710aef8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/710aef8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/710aef8e
Branch: refs/heads/develop
Commit: 710aef8e8178625f6aade3e239d653076df94332
Parents: 3e07ec2
Author: Ashvin Agrawal <as...@apache.org>
Authored: Mon Oct 5 11:46:19 2015 -0700
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Thu Oct 8 22:01:58 2015 -0700
----------------------------------------------------------------------
.../cache/lucene/internal/LuceneQueryImpl.java | 2 -
.../internal/LuceneIndexImplJUnitTest.java | 44 --------------------
.../LuceneFunctionReadPathDUnitTest.java | 1 -
3 files changed, 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/710aef8e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
index a5cbc79..c3e367b 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
@@ -1,7 +1,5 @@
package com.gemstone.gemfire.cache.lucene.internal;
-import java.util.Set;
-
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.cache.execute.ResultCollector;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/710aef8e/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImplJUnitTest.java
deleted file mode 100644
index 789f243..0000000
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImplJUnitTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.gemstone.gemfire.cache.lucene.internal;
-
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Random;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.queryparser.classic.ParseException;
-import org.apache.lucene.queryparser.classic.QueryParser;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
-import com.gemstone.gemfire.cache.lucene.internal.directory.RegionDirectory;
-import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey;
-import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
-import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer;
-import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.Type2;
-import com.gemstone.gemfire.internal.cache.LocalRegion;
-import com.gemstone.gemfire.internal.cache.PartitionedRegion;
-import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-
-/**
- * Test of the {@link LuceneIndexImpl} and everything below
- * it. This tests creating lucene index with index regions and specify fields
- * and analyzer.
- */
-@Category(IntegrationTest.class)
-public class LuceneIndexImplJUnitTest {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/710aef8e/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
index b37be14..b78e9d6 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
@@ -111,7 +111,6 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
Map<Integer, TestObject> data = new HashMap<Integer, TestObject>();
for(LuceneResultStruct<Integer, TestObject> row : page) {
data.put(row.getKey(), row.getValue());
- System.out.println("GGG:"+row.getKey()+":"+row.getValue());
}
assertEquals(data, region);
[24/50] [abbrv] incubator-geode git commit: Adding xml parsing and
generation logic
Posted by as...@apache.org.
Adding xml parsing and generation logic
We now have an xsd for the lucene elements, and a LuceneXmlParser
service. Geode already has a mechanism to plug in additional xml parsers
like LuceneXmlParsers by using the java service loader, which I have
done.
I've written a LuceneIndexCreation object to match other configuration
objects that get generated when a cache is parsed. This creation is
attached to regions on index creation time so that when xml is
generated, the creation object and generate the appropriate xml snippet.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/5011ee51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/5011ee51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/5011ee51
Branch: refs/heads/develop
Commit: 5011ee516d86c7dd116aa8707f561898e3a63541
Parents: d88ef88
Author: Dan Smith <up...@apache.org>
Authored: Wed Oct 7 13:44:10 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Thu Oct 8 10:26:08 2015 -0700
----------------------------------------------------------------------
.../LuceneIndexForPartitionedRegion.java | 21 +-----
.../cache/lucene/internal/LuceneIndexImpl.java | 16 +++-
.../lucene/internal/LuceneServiceImpl.java | 8 +-
.../internal/xml/LuceneIndexCreation.java | 76 +++++++++++++++++++
.../internal/xml/LuceneIndexXmlGenerator.java | 41 ++++++++++
.../internal/xml/LuceneServiceXmlGenerator.java | 20 +++++
.../lucene/internal/xml/LuceneXmlConstants.java | 12 +++
.../lucene/internal/xml/LuceneXmlParser.java | 54 ++++++++++++++
.../lucene/lucene-1.0.xsd | 36 +++++++++
...ne.gemfire.internal.cache.xmlcache.XmlParser | 1 +
...neIndexXmlGeneratorIntegrationJUnitTest.java | 59 +++++++++++++++
.../xml/LuceneIndexXmlGeneratorJUnitTest.java | 44 +++++++++++
...uceneIndexXmlParserIntegrationJUnitTest.java | 78 ++++++++++++++++++++
.../xml/LuceneIndexXmlParserJUnitTest.java | 41 ++++++++++
...erIntegrationJUnitTest.createIndex.cache.xml | 16 ++++
...serIntegrationJUnitTest.parseIndex.cache.xml | 16 ++++
16 files changed, 514 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5011ee51/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
index f9e2c1d..2bf848f 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
@@ -1,37 +1,17 @@
package com.gemstone.gemfire.cache.lucene.internal;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.lucene.analysis.Analyzer;
-
import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.PartitionAttributesFactory;
-import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
-import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory;
import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueFactoryImpl;
import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl;
-import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
-import com.gemstone.gemfire.cache.lucene.LuceneIndex;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
-import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer;
-import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.LuceneSerializer;
-import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
-import com.gemstone.gemfire.internal.cache.InternalRegionArguments;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
-import com.gemstone.gemfire.internal.cache.RegionFactoryImpl;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
/* wrapper of IndexWriter */
public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
@@ -125,6 +105,7 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
logger.info("The AEQ "+aeq+" is created at another member");
}
+ addExtension(dataRegion);
hasInitialized = true;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5011ee51/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
index c2d2ce2..3964053 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
@@ -11,6 +11,8 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
+import com.gemstone.gemfire.cache.lucene.internal.xml.LuceneIndexCreation;
+import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.logging.LogService;
public abstract class LuceneIndexImpl implements InternalLuceneIndex {
@@ -74,6 +76,18 @@ public abstract class LuceneIndexImpl implements InternalLuceneIndex {
return this.analyzer;
}
- protected void initialize() {
+ protected abstract void initialize();
+
+ /**
+ * Register an extension with the region
+ * so that xml will be generated for this index.
+ */
+ protected void addExtension(PartitionedRegion dataRegion) {
+ LuceneIndexCreation creation = new LuceneIndexCreation();
+ creation.setName(this.getName());
+ creation.setFieldNames(this.getFieldNames());
+ creation.setRegion(dataRegion);
+ creation.setFieldFieldAnalyzerMap(this.getFieldAnalyzerMap());
+ dataRegion.getExtensionPoint().addExtension(creation, creation);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5011ee51/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
index 2c4db9d..776d005 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
@@ -22,6 +22,7 @@ import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesCollecto
import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesCollectorManager;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
+import com.gemstone.gemfire.cache.lucene.internal.xml.LuceneServiceXmlGenerator;
import com.gemstone.gemfire.internal.DSFIDFactory;
import com.gemstone.gemfire.internal.DataSerializableFixedID;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@@ -147,14 +148,13 @@ public class LuceneServiceImpl implements InternalLuceneService {
@Override
public XmlGenerator<Cache> getXmlGenerator() {
- // TODO Auto-generated method stub
- return null;
+ return new LuceneServiceXmlGenerator();
}
@Override
public void onCreate(Extensible<Cache> source, Extensible<Cache> target) {
- // TODO Auto-generated method stub
-
+ //This is called when CacheCreation (source) is turned into a GemfireCacheImpl (target)
+ //nothing to do there.
}
public void registerIndex(LuceneIndex index){
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5011ee51/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
new file mode 100644
index 0000000..abb147a
--- /dev/null
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
@@ -0,0 +1,76 @@
+package com.gemstone.gemfire.cache.lucene.internal.xml;
+
+import java.util.Map;
+
+import org.apache.lucene.analysis.Analyzer;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.lucene.LuceneIndex;
+import com.gemstone.gemfire.cache.lucene.LuceneService;
+import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
+import com.gemstone.gemfire.internal.cache.extension.Extensible;
+import com.gemstone.gemfire.internal.cache.extension.Extension;
+import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
+
+public class LuceneIndexCreation implements LuceneIndex, Extension<Region<?, ?>> {
+ private Region region;
+ private String name;
+ private String[] fieldNames;
+ private Map<String, Analyzer> fieldFieldAnalyzerMap;
+
+
+ public void setRegion(Region region) {
+ this.region = region;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setFieldNames(String[] fieldNames) {
+ this.fieldNames = fieldNames;
+ }
+
+ public Map<String, Analyzer> getFieldFieldAnalyzerMap() {
+ return fieldFieldAnalyzerMap;
+ }
+
+ public void setFieldFieldAnalyzerMap(
+ Map<String, Analyzer> fieldFieldAnalyzerMap) {
+ this.fieldFieldAnalyzerMap = fieldFieldAnalyzerMap;
+ }
+
+ @Override
+ public Map<String, Analyzer> getFieldAnalyzerMap() {
+ return this.fieldFieldAnalyzerMap;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String[] getFieldNames() {
+ return fieldNames;
+ }
+
+ @Override
+ public String getRegionPath() {
+ return region.getFullPath();
+ }
+
+ @Override
+ public XmlGenerator<Region<?, ?>> getXmlGenerator() {
+ return new LuceneIndexXmlGenerator(this);
+ }
+
+ @Override
+ public void onCreate(Extensible<Region<?, ?>> source,
+ Extensible<Region<?, ?>> target) {
+ target.getExtensionPoint().addExtension(LuceneIndex.class, this);
+ Cache cache = target.getExtensionPoint().getTarget().getCache();
+ LuceneService service = LuceneServiceProvider.get(cache);
+ //TODO - should this be a different method than the public API here?
+ service.createIndex(getName(), getRegionPath(), getFieldNames());
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5011ee51/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
new file mode 100644
index 0000000..161e981
--- /dev/null
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
@@ -0,0 +1,41 @@
+package com.gemstone.gemfire.cache.lucene.internal.xml;
+
+import static com.gemstone.gemfire.cache.lucene.internal.xml.LuceneXmlConstants.*;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.lucene.LuceneIndex;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
+import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
+import com.gemstone.gemfire.internal.cache.xmlcache.XmlGeneratorUtils;
+
+public class LuceneIndexXmlGenerator implements XmlGenerator<Region<?, ?>> {
+ private final LuceneIndex index;
+
+ public LuceneIndexXmlGenerator(LuceneIndex index) {
+ this.index = index;
+ }
+
+ @Override
+ public String getNamspaceUri() {
+ return NAMESPACE;
+ }
+
+ @Override
+ public void generate(CacheXmlGenerator cacheXmlGenerator)
+ throws SAXException {
+ final ContentHandler handler = cacheXmlGenerator.getContentHandler();
+
+ handler.startPrefixMapping(PREFIX, NAMESPACE);
+
+ AttributesImpl attr = new AttributesImpl();
+ //TODO - should the type be xs:string ?
+ XmlGeneratorUtils.addAttribute(attr, NAME, index.getName());
+ XmlGeneratorUtils.addAttribute(attr, FIELDS, String.join(",", index.getFieldNames()));
+ XmlGeneratorUtils.emptyElement(cacheXmlGenerator.getContentHandler(), PREFIX, INDEX, attr);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5011ee51/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
new file mode 100644
index 0000000..6c0da01
--- /dev/null
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
@@ -0,0 +1,20 @@
+package com.gemstone.gemfire.cache.lucene.internal.xml;
+
+import org.xml.sax.SAXException;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
+import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
+
+public final class LuceneServiceXmlGenerator implements XmlGenerator<Cache> {
+ @Override
+ public String getNamspaceUri() {
+ return LuceneXmlConstants.NAMESPACE;
+ }
+
+ @Override
+ public void generate(CacheXmlGenerator cacheXmlGenerator)
+ throws SAXException {
+ //Nothing to to the xml at the service level at the moment.
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5011ee51/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java
new file mode 100644
index 0000000..97193b8
--- /dev/null
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java
@@ -0,0 +1,12 @@
+package com.gemstone.gemfire.cache.lucene.internal.xml;
+
+public class LuceneXmlConstants {
+ public static final String NAMESPACE= "http://geode.incubator.apache.org/schema/lucene";
+ public static final String PREFIX = "lucene";
+ public static final String SERVICE = "service";
+ public static final String NAME = "name";
+ public static final String REGION = "index";
+ public static final String INDEX = "index";
+ public static final String FIELDS = "fields";
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5011ee51/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java
new file mode 100644
index 0000000..8630a44
--- /dev/null
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java
@@ -0,0 +1,54 @@
+package com.gemstone.gemfire.cache.lucene.internal.xml;
+
+import static com.gemstone.gemfire.cache.lucene.internal.xml.LuceneXmlConstants.*;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl;
+import com.gemstone.gemfire.internal.cache.xmlcache.AbstractXmlParser;
+import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
+import com.gemstone.gemfire.internal.cache.xmlcache.RegionCreation;
+
+public class LuceneXmlParser extends AbstractXmlParser {
+
+ @Override
+ public String getNamspaceUri() {
+ return NAMESPACE;
+ }
+
+ @Override
+ public void startElement(String uri, String localName, String qName,
+ Attributes atts) throws SAXException {
+
+ if(!NAMESPACE.equals(uri)) {
+ return;
+ }
+ if(INDEX.equals(localName)) {
+ startIndex(atts);
+ }
+ }
+
+ private void startIndex(Attributes atts) {
+ final RegionCreation region = (RegionCreation) stack.peek();
+ RegionAttributesCreation rac = (RegionAttributesCreation) region.getAttributes();
+ String name = atts.getValue(NAME);
+ String[] fields = atts.getValue(FIELDS).split(" *, *");
+ rac.addAsyncEventQueueId(LuceneServiceImpl.getUniqueIndexName(name, region.getFullPath()));
+
+
+ LuceneIndexCreation indexCreation = new LuceneIndexCreation();
+ indexCreation.setName(name);
+ indexCreation.setFieldNames(fields);
+ indexCreation.setRegion(region);
+ region.getExtensionPoint().addExtension(indexCreation, indexCreation);
+ //TODO support nested field objects by adding the creation object to the stack
+ //stack.push(indexCreation)
+ }
+
+ @Override
+ public void endElement(String uri, String localName, String qName)
+ throws SAXException {
+ //Nothing to do.
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5011ee51/gemfire-lucene/src/main/resources/META-INF/schemas/geode.incubator.apache.org/lucene/lucene-1.0.xsd
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/resources/META-INF/schemas/geode.incubator.apache.org/lucene/lucene-1.0.xsd b/gemfire-lucene/src/main/resources/META-INF/schemas/geode.incubator.apache.org/lucene/lucene-1.0.xsd
new file mode 100644
index 0000000..66a4aad
--- /dev/null
+++ b/gemfire-lucene/src/main/resources/META-INF/schemas/geode.incubator.apache.org/lucene/lucene-1.0.xsd
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+ targetNamespace="http://geode.incubator.apache.org/schema/lucene"
+ xmlns:gpdb="http://geode.incubator.apache.org/schema/lucene"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.0">
+
+ <xsd:import
+ namespace="http://schema.pivotal.io/gemfire/cache"
+ schemaLocation="http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd"/>
+
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[
+XML schema for Lucene indexes in Geode.
+
+ <cache
+ xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns:lucene="http://geode.incubator.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache
+ http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd
+ http://geode.incubator.apache.org/schema/lucene
+ http://geode.incubator.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="9.0">
+
+ ]]></xsd:documentation>
+ </xsd:annotation>
+ <xsd:element name="index">
+ <xsd:complexType>
+ <xsd:attribute name="name" type="xsd:string"/>
+ <xsd:attribute name="fields" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5011ee51/gemfire-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser b/gemfire-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser
new file mode 100644
index 0000000..fc3abc0
--- /dev/null
+++ b/gemfire-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser
@@ -0,0 +1 @@
+com.gemstone.gemfire.cache.lucene.internal.xml.LuceneXmlParser
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5011ee51/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
new file mode 100644
index 0000000..65c73f7
--- /dev/null
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
@@ -0,0 +1,59 @@
+package com.gemstone.gemfire.cache.lucene.internal.xml;
+
+import static org.junit.Assert.*;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
+import java.nio.charset.Charset;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.lucene.LuceneIndex;
+import com.gemstone.gemfire.cache.lucene.LuceneService;
+import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
+public class LuceneIndexXmlGeneratorIntegrationJUnitTest {
+
+ /**
+ * Test of generating and reading cache configuration back in.
+ */
+ @Test
+ public void generateWithFields() {
+ Cache cache = new CacheFactory().set("mcast-port", "0").create();
+ cache.createRegionFactory(RegionShortcut.PARTITION).create("region");
+ LuceneService service = LuceneServiceProvider.get(cache);
+
+ service.createIndex("index", "region", "a", "b", "c");
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ PrintWriter pw = new PrintWriter(baos);
+ CacheXmlGenerator.generate(cache, pw, true, false, false);
+ pw.flush();
+
+ cache.close();
+ cache = new CacheFactory().set("mcast-port", "0").create();
+
+ byte[] bytes = baos.toByteArray();
+ ByteArrayInputStream in = new ByteArrayInputStream(bytes);
+ System.out.println("---FILE---");
+ System.out.println(new String(bytes, Charset.defaultCharset()));
+ cache.loadCacheXml(new ByteArrayInputStream(bytes));
+
+ LuceneService service2 = LuceneServiceProvider.get(cache);
+ assertTrue(service != service2);
+
+ LuceneIndex index = service2.getIndex("index", "region");
+ assertNotNull(index);
+
+ assertArrayEquals(new String[] {"a", "b", "c"}, index.getFieldNames());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5011ee51/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
new file mode 100644
index 0000000..a31e7e1
--- /dev/null
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
@@ -0,0 +1,44 @@
+package com.gemstone.gemfire.cache.lucene.internal.xml;
+
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.*;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+
+import com.gemstone.gemfire.cache.lucene.LuceneIndex;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
+@Category(UnitTest.class)
+public class LuceneIndexXmlGeneratorJUnitTest {
+
+ /**
+ * Test of generating and reading cache configuration back in.
+ * @throws SAXException
+ */
+ @Test
+ public void generateWithFields() throws SAXException {
+ LuceneIndex index = Mockito.mock(LuceneIndex.class);
+ Mockito.when(index.getName()).thenReturn("index");
+ Mockito.when(index.getFieldNames()).thenReturn(new String[] {"a", "b"});
+
+ LuceneIndexXmlGenerator generator = new LuceneIndexXmlGenerator(index);
+ CacheXmlGenerator cacheXmlGenerator = Mockito.mock(CacheXmlGenerator.class);
+ ContentHandler handler = Mockito.mock(ContentHandler.class);
+ Mockito.when(cacheXmlGenerator.getContentHandler()).thenReturn(handler);
+ generator.generate(cacheXmlGenerator);
+
+ ArgumentCaptor<Attributes> captor = new ArgumentCaptor<>();
+ Mockito.verify(handler).startElement(eq(""), eq("index"), eq("lucene:index"), captor.capture());
+ Attributes value = captor.getValue();
+ assertEquals("index", value.getValue(LuceneXmlConstants.NAME));
+ assertEquals("a,b", value.getValue(LuceneXmlConstants.FIELDS));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5011ee51/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
new file mode 100644
index 0000000..56a726f
--- /dev/null
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
@@ -0,0 +1,78 @@
+package com.gemstone.gemfire.cache.lucene.internal.xml;
+
+import static org.junit.Assert.*;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.lucene.LuceneIndex;
+import com.gemstone.gemfire.cache.lucene.LuceneService;
+import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
+import com.gemstone.gemfire.internal.cache.extension.Extension;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlParser;
+import com.gemstone.gemfire.internal.cache.xmlcache.RegionCreation;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import com.gemstone.gemfire.util.test.TestUtil;
+
+@Category(UnitTest.class)
+public class LuceneIndexXmlParserIntegrationJUnitTest {
+
+ @Rule
+ public TestName name = new TestName();
+
+ /**
+ * Test that we parse the index fields correctly
+ */
+ @Test
+ public void parseIndex() throws FileNotFoundException {
+ CacheXmlParser parser = CacheXmlParser.parse(new FileInputStream(getXmlFileForTest()));
+ CacheCreation cache = parser.getCacheCreation();
+ RegionCreation region = (RegionCreation) cache.getRegion("region");
+ Map<String, String[]> expectedIndexes = new HashMap<String, String[]>();
+ expectedIndexes.put("index1", new String[] {"a", "b", "c", "d"});
+ expectedIndexes.put("index2", new String[] { "f", "g"});
+ for(Extension extension : region.getExtensionPoint().getExtensions()) {
+ LuceneIndexCreation index = (LuceneIndexCreation) extension;
+ assertEquals("/region", index.getRegionPath());
+ assertArrayEquals(expectedIndexes.remove(index.getName()), index.getFieldNames());
+ }
+
+ assertEquals(Collections.emptyMap(),expectedIndexes);
+ }
+
+ /**
+ * Test that the Index creation objects get appropriately translated
+ * into a real index.
+ * @throws FileNotFoundException
+ */
+ @Test
+ public void createIndex() throws FileNotFoundException {
+ CacheFactory cf = new CacheFactory();
+ cf.set("mcast-port", "0");
+ cf.set("cache-xml-file", getXmlFileForTest());
+ Cache cache = cf.create();
+
+ LuceneService service = LuceneServiceProvider.get(cache);
+ assertEquals(2, service.getAllIndexes().size());
+ LuceneIndex index1 = service.getIndex("index1", "/region");
+ LuceneIndex index2 = service.getIndex("index2", "/region");
+ assertArrayEquals(index1.getFieldNames(), new String[] {"a", "b", "c", "d"});
+ assertArrayEquals(index2.getFieldNames(), new String[] { "f", "g"});
+ }
+
+ private String getXmlFileForTest() {
+ return TestUtil.getResourcePath(getClass(), getClass().getSimpleName() + "." + name.getMethodName() + ".cache.xml");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5011ee51/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
new file mode 100644
index 0000000..808c11e
--- /dev/null
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
@@ -0,0 +1,41 @@
+package com.gemstone.gemfire.cache.lucene.internal.xml;
+
+import static org.junit.Assert.*;
+
+import java.util.Stack;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
+import com.gemstone.gemfire.internal.cache.xmlcache.RegionCreation;
+import com.gemstone.gemfire.internal.cache.xmlcache.XmlGeneratorUtils;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
+@Category(UnitTest.class)
+public class LuceneIndexXmlParserJUnitTest {
+
+ @Test
+ public void generateWithFields() throws SAXException {
+ LuceneXmlParser parser = new LuceneXmlParser();
+ AttributesImpl attrs = new AttributesImpl();
+ CacheCreation cache = new CacheCreation();
+ RegionCreation rc = new RegionCreation(cache, "region");
+ Stack<Object> stack = new Stack<Object>();
+ stack.push(cache);
+ stack.push(rc);
+ parser.setStack(stack);
+ XmlGeneratorUtils.addAttribute(attrs, LuceneXmlConstants.NAME, "index");
+ XmlGeneratorUtils.addAttribute(attrs, LuceneXmlConstants.FIELDS, "a,b,c");
+ parser.startElement(LuceneXmlConstants.NAMESPACE, LuceneXmlConstants.INDEX, null, attrs);
+ parser.endElement(LuceneXmlConstants.NAMESPACE, LuceneXmlConstants.INDEX, null);
+
+ LuceneIndexCreation index = (LuceneIndexCreation) rc.getExtensionPoint().getExtensions().iterator().next();
+ assertEquals("index", index.getName());
+ assertArrayEquals(new String[] {"a", "b", "c"}, index.getFieldNames());
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5011ee51/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml b/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml
new file mode 100644
index 0000000..8350650
--- /dev/null
+++ b/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.createIndex.cache.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cache
+ xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns:lucene="http://geode.incubator.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache
+ http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd
+ http://geode.incubator.apache.org/schema/lucene
+ http://geode.incubator.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="9.0">
+
+ <region name="region" refid="PARTITION">
+ <lucene:index name="index1" fields="a, b,c,d"/>
+ <lucene:index name="index2" fields="f,g"/>
+ </region>
+</cache>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5011ee51/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml b/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml
new file mode 100644
index 0000000..8350650
--- /dev/null
+++ b/gemfire-lucene/src/test/resources/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.parseIndex.cache.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cache
+ xmlns="http://schema.pivotal.io/gemfire/cache"
+ xmlns:lucene="http://geode.incubator.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://schema.pivotal.io/gemfire/cache
+ http://schema.pivotal.io/gemfire/cache/cache-9.0.xsd
+ http://geode.incubator.apache.org/schema/lucene
+ http://geode.incubator.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="9.0">
+
+ <region name="region" refid="PARTITION">
+ <lucene:index name="index1" fields="a, b,c,d"/>
+ <lucene:index name="index2" fields="f,g"/>
+ </region>
+</cache>
\ No newline at end of file
[45/50] [abbrv] incubator-geode git commit: GEODE-11: ADD Apache
License header
Posted by as...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
index 6cb5368..0614e62 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package com.gemstone.gemfire.cache.lucene.internal;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java
index e26ab00..3975ac3 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImplJUnitTest.java
index 7009255..91556a9 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImplJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpJUnitTest.java
index bc9ad33..7893940 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
index 0cfd989..159fd46 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
index 23518e1..41376f5 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
index 673fdf2..a16b019 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java
index 9dd1d6b..d20b052 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.directory;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
index d18c520..bec2da8 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/EntryScoreJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/EntryScoreJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/EntryScoreJUnitTest.java
index c05fb61..abdf8ec 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/EntryScoreJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/EntryScoreJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java
index 98b48d8..46ea67f 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
index 419aa26..750ec0f 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
index b3460b7..4ba1fc7 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import java.io.Serializable;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
index 8acdd5a..b36d8cc 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
index f17200b..4f93587 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesJUnitTest.java
index 6c2e08b..d849c8e 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java
index 90cfca0..f28b84a 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.filesystem;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileJUnitTest.java
index a30e69b..e4e8752 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.filesystem;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
index 8f1b7dc..83d9e03 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.filesystem;
import static org.junit.Assert.assertArrayEquals;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitPerformanceTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitPerformanceTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitPerformanceTest.java
index 8641254..ab2db78 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitPerformanceTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitPerformanceTest.java
@@ -1,6 +1,23 @@
-package com.gemstone.gemfire.cache.lucene.internal.repository;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
-import static org.junit.Assert.*;
+package com.gemstone.gemfire.cache.lucene.internal.repository;
import java.io.DataInput;
import java.io.DataOutput;
@@ -20,7 +37,6 @@ import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
-import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SearcherManager;
@@ -29,7 +45,6 @@ import org.apache.lucene.store.RAMDirectory;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import com.carrotsearch.randomizedtesting.generators.RandomStrings;
import com.gemstone.gemfire.DataSerializable;
import com.gemstone.gemfire.DataSerializer;
import com.gemstone.gemfire.cache.Cache;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
index ede267c..617879f 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.repository;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializerJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializerJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializerJUnitTest.java
index 7322311..e54856a 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializerJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializerJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.repository.serializer;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java
index e6e6b79..ec31da9 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.repository.serializer;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java
index 5731ffc..3ca8fbf 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.repository.serializer;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/Type1.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/Type1.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/Type1.java
index b82d0be..e7f2ca4 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/Type1.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/Type1.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.repository.serializer;
import java.io.Serializable;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/Type2.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/Type2.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/Type2.java
index 10cc11e..81210ab 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/Type2.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/Type2.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.repository.serializer;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
index e991643..8272522 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.xml;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
index 3db5d73..c1e93ad 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.xml;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
index d97e160..62b4f5a 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.xml;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
index ff271dd..298c92f 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.xml;
import static org.junit.Assert.*;
[09/50] [abbrv] incubator-geode git commit: Creating missing buckets
in PartitionRepositoryManager
Posted by as...@apache.org.
Creating missing buckets in PartitionRepositoryManager
Creating the colocated buckets if they do not yet exist in
PartitionedRepositoryManager.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c80e93b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c80e93b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c80e93b9
Branch: refs/heads/develop
Commit: c80e93b95f81151c8db6bb2ccf17ef2d6ab69ab0
Parents: 3f0c069
Author: Dan Smith <up...@apache.org>
Authored: Tue Sep 22 17:07:21 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Wed Sep 23 09:14:24 2015 -0700
----------------------------------------------------------------------
.../internal/PartitionedRepositoryManager.java | 3 +++
.../PartitionedRepositoryManagerJUnitTest.java | 21 ++++++++++++++++++++
2 files changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c80e93b9/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
index bcec1c9..65c678c 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
@@ -133,6 +133,9 @@ public class PartitionedRepositoryManager implements RepositoryManager {
* Find the bucket in region2 that matches the bucket id from region1.
*/
private BucketRegion getMatchingBucket(PartitionedRegion region, Integer bucketId) throws BucketNotFoundException {
+ //Force the bucket to be created if it is not already
+ region.getOrCreateNodeForBucketWrite(bucketId, null);
+
BucketRegion result = region.getDataStore().getLocalBucketById(bucketId);
if(result == null) {
throw new BucketNotFoundException("Bucket not found for region " + region + " bucekt id " + bucketId);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c80e93b9/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
index 367f4f2..a2cc75e 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
@@ -18,6 +18,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
import com.gemstone.gemfire.cache.lucene.internal.directory.RegionDirectory;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
@@ -28,6 +30,7 @@ import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
import com.gemstone.gemfire.internal.cache.BucketRegion;
import com.gemstone.gemfire.internal.cache.LocalDataSet;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import com.gemstone.gemfire.internal.cache.PartitionedRegion.RetryTimeKeeper;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
@@ -118,6 +121,24 @@ public class PartitionedRepositoryManagerJUnitTest {
}
@Test
+ public void createMissingBucket() throws BucketNotFoundException {
+ PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer, new StandardAnalyzer());
+ BucketRegion mockBucket0 = getMockBucket(0);
+
+ Mockito.when(fileDataStore.getLocalBucketById(eq(0))).thenReturn(null);
+
+ Mockito.when(fileRegion.getOrCreateNodeForBucketWrite(eq(0), (RetryTimeKeeper) any())).then(new Answer() {
+ @Override
+ public Object answer(InvocationOnMock invocation) throws Throwable {
+ Mockito.when(fileDataStore.getLocalBucketById(eq(0))).thenReturn(fileBuckets.get(0));
+ return null;
+ }
+ });
+
+ assertNotNull(repoManager.getRepository(userRegion, 0, null));
+ }
+
+ @Test
public void getByRegion() throws BucketNotFoundException {
PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer, new StandardAnalyzer());
[06/50] [abbrv] incubator-geode git commit: GEODE-347: Fixing another
race condition in expectErrorAfterWaitTime
Posted by as...@apache.org.
GEODE-347: Fixing another race condition in expectErrorAfterWaitTime
Another test method in TopEntriesFunctionCollectorJUnitTest had this
same race condition - notifying the other thread before setting
the shared state.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/74512e59
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/74512e59
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/74512e59
Branch: refs/heads/develop
Commit: 74512e59b36127ea4a341ef488fd218d2b6779e6
Parents: dc3e8f7
Author: Dan Smith <up...@apache.org>
Authored: Tue Sep 22 14:48:33 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Tue Sep 22 14:49:28 2015 -0700
----------------------------------------------------------------------
.../internal/distributed/TopEntriesFunctionCollectorJUnitTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/74512e59/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
index 08993dd..c139e9f 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
@@ -166,8 +166,8 @@ public class TopEntriesFunctionCollectorJUnitTest {
try {
collector.getResult(10, TimeUnit.MILLISECONDS);
} catch (FunctionException e) {
- endGetResult.countDown();
exception.set(e);
+ endGetResult.countDown();
}
}
});
[49/50] [abbrv] incubator-geode git commit: Merge remote-tracking
branch 'origin/develop' into feature/GEODE-11
Posted by as...@apache.org.
Merge remote-tracking branch 'origin/develop' into feature/GEODE-11
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3af1540f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3af1540f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3af1540f
Branch: refs/heads/develop
Commit: 3af1540f6ab3555744b794c74a131cf75aa1f969
Parents: 2cf4fb1 79aa0be
Author: Ashvin Agrawal <as...@apache.org>
Authored: Wed Nov 11 13:19:51 2015 -0800
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Wed Nov 11 13:19:51 2015 -0800
----------------------------------------------------------------------
.../cache/partition/PartitionManager.java | 2 +-
.../com/gemstone/gemfire/internal/Version.java | 5 ++
.../cache/tier/sockets/CommandInitializer.java | 4 ++
.../tier/sockets/command/CommitCommand.java | 4 +-
.../tier/sockets/command/ExecuteFunction66.java | 2 +-
.../command/ExecuteRegionFunction66.java | 2 +-
.../command/ExecuteRegionFunctionSingleHop.java | 2 +-
.../partition/PartitionManagerDUnitTest.java | 75 --------------------
.../tier/sockets/command/CommitCommandTest.java | 39 ++++++++++
.../management/DistributedSystemDUnitTest.java | 12 ++--
10 files changed, 59 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
[03/50] [abbrv] incubator-geode git commit: GEODE-347: Fix race
condition in test case
Posted by as...@apache.org.
GEODE-347: Fix race condition in test case
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8bd006ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8bd006ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8bd006ab
Branch: refs/heads/develop
Commit: 8bd006ab88d94e9a97073ce2683a6d7dd68c5fbb
Parents: f9ef456
Author: Ashvin Agrawal <as...@apache.org>
Authored: Tue Sep 22 14:08:52 2015 -0700
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Tue Sep 22 14:08:52 2015 -0700
----------------------------------------------------------------------
.../internal/distributed/TopEntriesFunctionCollectorJUnitTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bd006ab/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
index be7e5fb..08993dd 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
@@ -132,8 +132,8 @@ public class TopEntriesFunctionCollectorJUnitTest {
collector.getResult();
}
} catch (FunctionException e) {
- endGetResult.countDown();
exception.set(e);
+ endGetResult.countDown();
}
}
});
[37/50] [abbrv] incubator-geode git commit: Marking incomplete lucene
features as incomplete
Posted by as...@apache.org.
Marking incomplete lucene features as incomplete
We haven't finished implementing a few options in the API. I've marked
those so that someone picking up this code in the middle won't
accidentally try to use those features.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d623cf67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d623cf67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d623cf67
Branch: refs/heads/develop
Commit: d623cf678f9015581a6db7f772d46deb7f370cf1
Parents: 5c09e68
Author: Dan Smith <up...@apache.org>
Authored: Fri Oct 16 13:55:11 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Fri Oct 16 13:55:11 2015 -0700
----------------------------------------------------------------------
.../cache/lucene/LuceneQueryFactory.java | 3 +++
.../gemfire/cache/lucene/LuceneService.java | 5 ++++-
.../LuceneIndexForReplicatedRegion.java | 23 ++++----------------
3 files changed, 11 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d623cf67/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
index b5598ad..eea4b88 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
@@ -45,7 +45,10 @@ public interface LuceneQueryFactory {
*
* @param fieldNames
* @return itself
+ *
+ * @deprecated TODO This feature is not yet implemented
*/
+ @Deprecated
LuceneQueryFactory setProjectionFields(String... fieldNames);
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d623cf67/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
index e1623d6..6c629de 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
@@ -73,8 +73,9 @@ public interface LuceneService {
* @param regionPath region name
* @param analyzerPerField analyzer per field map
* @return LuceneIndex object
- *
+ * @deprecated TODO This feature is not yet implemented
*/
+ @Deprecated
public void createIndex(String indexName, String regionPath,
Map<String, Analyzer> analyzerPerField);
@@ -82,7 +83,9 @@ public interface LuceneService {
* Destroy the lucene index
*
* @param index index object
+ * @deprecated TODO This feature is not yet implemented
*/
+ @Deprecated
public void destroyIndex(LuceneIndex index);
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d623cf67/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForReplicatedRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForReplicatedRegion.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForReplicatedRegion.java
index f160a6d..7288399 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForReplicatedRegion.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForReplicatedRegion.java
@@ -1,44 +1,29 @@
package com.gemstone.gemfire.cache.lucene.internal;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
-import com.gemstone.gemfire.cache.lucene.LuceneIndex;
-import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey;
-import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
-import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
/* wrapper of IndexWriter */
public class LuceneIndexForReplicatedRegion extends LuceneIndexImpl {
public LuceneIndexForReplicatedRegion(String indexName, String regionPath, Cache cache) {
- // TODO Auto-generated constructor stub
+ throw new UnsupportedOperationException("Lucene indexes on replicated regions is not yet implemented");
}
public void initialize() {
- // TODO Auto-generated method stub
-
+ throw new UnsupportedOperationException("Lucene indexes on replicated regions is not yet implemented");
}
public void close() {
- // TODO Auto-generated method stub
-
+ throw new UnsupportedOperationException("Lucene indexes on replicated regions is not yet implemented");
}
@Override
public Map<String, Analyzer> getFieldAnalyzerMap() {
- // TODO Auto-generated method stub
- return null;
+ throw new UnsupportedOperationException("Lucene indexes on replicated regions is not yet implemented");
}
}
[29/50] [abbrv] incubator-geode git commit: Changing a reference from
GemFire to Geode
Posted by as...@apache.org.
Changing a reference from GemFire to Geode
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/62952c17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/62952c17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/62952c17
Branch: refs/heads/develop
Commit: 62952c17c3c2e4af37d52174137b8534814faab0
Parents: 5dadbb4
Author: Dan Smith <up...@apache.org>
Authored: Fri Oct 9 10:17:56 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Tue Oct 13 10:14:03 2015 -0700
----------------------------------------------------------------------
.../com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/62952c17/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
index a113fab..cad9095 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
@@ -8,7 +8,7 @@ import com.gemstone.gemfire.cache.query.QueryException;
/**
* The instances of this class will be used for distributing Lucene Query objects and re-constructing the Query object.
- * If necessary the implementation needs to take care of serializing and de-serializing Lucene Query object. GemFire
+ * If necessary the implementation needs to take care of serializing and de-serializing Lucene Query object. Geode
* respects the DataSerializable contract to provide optimal object serialization. For instance,
* {@link LuceneQueryProvider}'s toData method will be used to serialize it when it is sent to another member of the
* distributed system. Implementation of DataSerializable can provide a zero-argument constructor that will be invoked
[17/50] [abbrv] incubator-geode git commit: hook the AEQ and listener
into index
Posted by as...@apache.org.
hook the AEQ and listener into index
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/fe4b341e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fe4b341e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fe4b341e
Branch: refs/heads/develop
Commit: fe4b341e4f952ed7339bcdb369d762d6fd70b2a1
Parents: 87e46d8
Author: zhouxh <gz...@pivotal.io>
Authored: Thu Sep 24 17:41:58 2015 -0700
Committer: zhouxh <gz...@pivotal.io>
Committed: Thu Sep 24 17:41:58 2015 -0700
----------------------------------------------------------------------
.../LuceneIndexForPartitionedRegion.java | 23 ++++++++++++++++++++
.../cache/lucene/internal/LuceneIndexImpl.java | 14 +++++++-----
.../lucene/internal/LuceneServiceImpl.java | 12 +++++-----
.../internal/LuceneServiceImplJUnitTest.java | 5 +++++
.../LuceneFunctionReadPathDUnitTest.java | 23 +++++++++++++-------
5 files changed, 58 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe4b341e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
index 1eff49a..60085e4 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
@@ -15,6 +15,9 @@ import com.gemstone.gemfire.cache.PartitionAttributesFactory;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
+import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory;
+import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl;
import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
import com.gemstone.gemfire.cache.lucene.LuceneIndex;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey;
@@ -97,6 +100,26 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
// we will create RegionDirectorys on the fly when data coming
HeterogenousLuceneSerializer mapper = new HeterogenousLuceneSerializer(getFieldNames());
repositoryManager = new PartitionedRepositoryManager(dataRegion, (PartitionedRegion)fileRegion, (PartitionedRegion)chunkRegion, mapper, analyzer);
+
+ // create AEQ, AEQ listner and specify the listener to repositoryManager
+ AsyncEventQueueFactory factory = cache.createAsyncEventQueueFactory();
+ if (withPersistence) {
+ factory.setPersistent(true);
+ }
+ factory.setParallel(true); // parallel AEQ for PR
+ factory.setMaximumQueueMemory(1000);
+ factory.setDispatcherThreads(1);
+
+ LuceneEventListener listener = new LuceneEventListener(repositoryManager);
+ String aeqId = LuceneServiceImpl.getUniqueIndexName(getName(), regionPath);
+ AsyncEventQueueImpl aeq = (AsyncEventQueueImpl)cache.getAsyncEventQueue(aeqId);
+ if (aeq == null) {
+ AsyncEventQueue indexQueue = factory.create(aeqId, listener);
+ dataRegion.getAttributesMutator().addAsyncEventQueueId(aeqId);
+ } else {
+ logger.info("The AEQ "+aeq+" is created at another member");
+ }
+
hasInitialized = true;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe4b341e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
index 1a91292..c2d2ce2 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
@@ -3,6 +3,7 @@ package com.gemstone.gemfire.cache.lucene.internal;
import java.util.HashSet;
import java.util.Map;
+import org.apache.logging.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
@@ -10,13 +11,17 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
+import com.gemstone.gemfire.internal.logging.LogService;
public abstract class LuceneIndexImpl implements InternalLuceneIndex {
static private final boolean CREATE_CACHE = Boolean.getBoolean("lucene.createCache");
static private final boolean USE_FS = Boolean.getBoolean("lucene.useFileSystem");
- protected HashSet<String> searchableFieldNames = new HashSet<String>();
+ protected static final Logger logger = LogService.getLogger();
+
+// protected HashSet<String> searchableFieldNames = new HashSet<String>();
+ String[] searchableFieldNames;
protected RepositoryManager repositoryManager;
protected Analyzer analyzer;
@@ -37,14 +42,13 @@ public abstract class LuceneIndexImpl implements InternalLuceneIndex {
return this.regionPath;
}
- protected void addSearchableField(String field) {
- searchableFieldNames.add(field);
+ protected void setSearchableFields(String[] fields) {
+ searchableFieldNames = fields;
}
@Override
public String[] getFieldNames() {
- String[] fieldNames = new String[searchableFieldNames.size()];
- return searchableFieldNames.toArray(fieldNames);
+ return searchableFieldNames;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe4b341e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
index b1631d1..2c4db9d 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
@@ -62,6 +62,9 @@ public class LuceneServiceImpl implements InternalLuceneService {
}
public static String getUniqueIndexName(String indexName, String regionPath) {
+ if (!regionPath.startsWith("/")) {
+ regionPath = "/"+regionPath;
+ }
String name = indexName + "#" + regionPath.replace('/', '_');
return name;
}
@@ -72,9 +75,7 @@ public class LuceneServiceImpl implements InternalLuceneService {
if (index == null) {
return null;
}
- for (String field:fields) {
- index.addSearchableField(field);
- }
+ index.setSearchableFields(fields);
// for this API, set index to use the default StandardAnalyzer for each field
index.setAnalyzer(null);
index.initialize();
@@ -124,9 +125,8 @@ public class LuceneServiceImpl implements InternalLuceneService {
}
Analyzer analyzer = new PerFieldAnalyzerWrapper(new StandardAnalyzer(), analyzerPerField);
- for (String field:analyzerPerField.keySet()) {
- index.addSearchableField(field);
- }
+ String[] fields = (String[])analyzerPerField.keySet().toArray(new String[analyzerPerField.keySet().size()]);
+ index.setSearchableFields(fields);
index.setAnalyzer(analyzer);
index.initialize();
registerIndex(index);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe4b341e/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
index 10f4794..5ec2725 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
@@ -24,6 +24,7 @@ import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl;
import com.gemstone.gemfire.cache.execute.Function;
import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
@@ -141,6 +142,10 @@ public class LuceneServiceImplJUnitTest {
PartitionedRegion chunkPR = (PartitionedRegion)cache.getRegion(chunkRegionName);
assertTrue(filePR != null);
assertTrue(chunkPR != null);
+
+ String aeqId = LuceneServiceImpl.getUniqueIndexName(index1.getName(), index1.getRegionPath());
+ AsyncEventQueueImpl aeq = (AsyncEventQueueImpl)cache.getAsyncEventQueue(aeqId);
+ assertTrue(aeq != null);
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe4b341e/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
index eac66e6..27407d3 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
@@ -22,6 +22,7 @@ import com.gemstone.gemfire.cache.lucene.LuceneResultStruct;
import com.gemstone.gemfire.cache.lucene.LuceneService;
import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneIndex;
+import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
@@ -60,8 +61,12 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
public Object call() throws Exception {
final Cache cache = getCache();
assertNotNull(cache);
+ // TODO: we have to workarround it now: specify an AEQ id when creating data region
+ String aeqId = LuceneServiceImpl.getUniqueIndexName(INDEX_NAME, REGION_NAME);
RegionFactory<Object, Object> regionFactory = cache.createRegionFactory(RegionShortcut.PARTITION);
- Region<Object, Object> region = regionFactory.create(REGION_NAME);
+ Region<Object, Object> region = regionFactory.
+ addAsyncEventQueueId(aeqId). // TODO: we need it for the time being
+ create(REGION_NAME);
LuceneService service = LuceneServiceProvider.get(cache);
InternalLuceneIndex index = (InternalLuceneIndex) service.createIndex(INDEX_NAME, REGION_NAME, "text");
return null;
@@ -107,6 +112,7 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
Map<Integer, TestObject> data = new HashMap<Integer, TestObject>();
for(LuceneResultStruct<Integer, TestObject> row : page) {
data.put(row.getKey(), row.getValue());
+ System.out.println("GGG:"+row.getKey()+":"+row.getValue());
}
assertEquals(data, region);
@@ -131,8 +137,9 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
});
//Make sure the search still works
- server1.invoke(executeSearch);
- server2.invoke(executeSearch);
+ // TODO: rebalance is broken when hooked with AEQ, disable the test for the time being
+// server1.invoke(executeSearch);
+// server2.invoke(executeSearch);
}
private static void putInRegion(Region<Object, Object> region, Object key, Object value) throws BucketNotFoundException, IOException {
@@ -140,11 +147,11 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
//TODO - the async event queue hasn't been hooked up, so we'll fake out
//writing the entry to the repository.
- LuceneService service = LuceneServiceProvider.get(region.getCache());
- InternalLuceneIndex index = (InternalLuceneIndex) service.getIndex(INDEX_NAME, REGION_NAME);
- IndexRepository repository1 = index.getRepositoryManager().getRepository(region, 1, null);
- repository1.create(key, value);
- repository1.commit();
+// LuceneService service = LuceneServiceProvider.get(region.getCache());
+// InternalLuceneIndex index = (InternalLuceneIndex) service.getIndex(INDEX_NAME, REGION_NAME);
+// IndexRepository repository1 = index.getRepositoryManager().getRepository(region, 1, null);
+// repository1.create(key, value);
+// repository1.commit();
}
private static class TestObject implements Serializable {
[31/50] [abbrv] incubator-geode git commit: Adding an internal
listener that can modify region attributes
Posted by as...@apache.org.
Adding an internal listener that can modify region attributes
This listener is attached to the cache and gets a callback before any
region is created. This can be used by extensions to modify region
attributes to create resources need for a region before the region is
created.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/485ebf95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/485ebf95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/485ebf95
Branch: refs/heads/develop
Commit: 485ebf9512ba11a19a469078ab136f80a1a85f7b
Parents: 62952c1
Author: Dan Smith <up...@apache.org>
Authored: Wed Oct 14 10:50:45 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Thu Oct 15 10:59:17 2015 -0700
----------------------------------------------------------------------
.../internal/cache/GemFireCacheImpl.java | 27 +++++++++++
.../gemfire/internal/cache/LocalRegion.java | 8 ++--
.../gemfire/internal/cache/RegionListener.java | 30 +++++++++++++
.../internal/cache/RegionListenerJUnitTest.java | 47 ++++++++++++++++++++
4 files changed, 108 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/485ebf95/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
index b0f0f43..e73af49 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
@@ -198,6 +198,7 @@ import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderQue
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlParser;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlPropertyResolver;
import com.gemstone.gemfire.internal.cache.xmlcache.PropertyResolver;
+import com.gemstone.gemfire.internal.concurrent.ConcurrentHashSet;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.jndi.JNDIInvoker;
import com.gemstone.gemfire.internal.jta.TransactionManagerImpl;
@@ -589,6 +590,8 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
private final CqService cqService;
+ private final Set<RegionListener> regionListeners = new ConcurrentHashSet<RegionListener>();
+
public static final int DEFAULT_CLIENT_FUNCTION_TIMEOUT = 0;
private static int clientFunctionTimeout;
@@ -3023,6 +3026,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
stopper.checkCancelInProgress(null);
LocalRegion.validateRegionName(name);
RegionAttributes<K, V> attrs = p_attrs;
+ attrs = invokeRegionBefore(null, name, attrs, internalRegionArgs);
if (attrs == null) {
throw new IllegalArgumentException(LocalizedStrings.GemFireCache_ATTRIBUTES_MUST_NOT_BE_NULL.toLocalizedString());
}
@@ -3158,6 +3162,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
throw ex;
}
+ invokeRegionAfter(rgn);
/**
* Added for M&M . Putting the callback here to avoid creating RegionMBean in case of Exception
**/
@@ -3168,6 +3173,20 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
return rgn;
}
+ public RegionAttributes invokeRegionBefore(LocalRegion parent,
+ String name, RegionAttributes attrs, InternalRegionArguments internalRegionArgs) {
+ for(RegionListener listener : regionListeners) {
+ attrs = listener.beforeCreate(parent, name, attrs, internalRegionArgs);
+ }
+ return attrs;
+ }
+
+ public void invokeRegionAfter(LocalRegion region) {
+ for(RegionListener listener : regionListeners) {
+ listener.afterCreate(region);
+ }
+ }
+
/**
* turn on eviction by default for HDFS regions
*/
@@ -3713,6 +3732,14 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
return cacheLifecycleListeners.remove(l);
}
}
+
+ public void addRegionListener(RegionListener l ) {
+ this.regionListeners.add(l);
+ }
+
+ public void removeRegionListener(RegionListener l ) {
+ this.regionListeners.remove(l);
+ }
/**
* Creates the single instance of the Transation Manager for this cache. Returns the existing one upon request.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/485ebf95/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
index 9e5bcd2..22d42a9 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
@@ -8,7 +8,7 @@
package com.gemstone.gemfire.internal.cache;
-import static com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_NEW_VALUE;
+import static com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifier.*;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -114,8 +114,8 @@ import com.gemstone.gemfire.cache.hdfs.internal.hoplog.HDFSRegionDirector;
import com.gemstone.gemfire.cache.hdfs.internal.hoplog.HDFSRegionDirector.HdfsRegionManager;
import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
import com.gemstone.gemfire.cache.query.FunctionDomainException;
-import com.gemstone.gemfire.cache.query.IndexMaintenanceException;
import com.gemstone.gemfire.cache.query.Index;
+import com.gemstone.gemfire.cache.query.IndexMaintenanceException;
import com.gemstone.gemfire.cache.query.IndexType;
import com.gemstone.gemfire.cache.query.MultiIndexCreationException;
import com.gemstone.gemfire.cache.query.NameResolutionException;
@@ -198,14 +198,12 @@ import com.gemstone.gemfire.internal.offheap.OffHeapHelper;
import com.gemstone.gemfire.internal.offheap.SimpleMemoryAllocatorImpl;
import com.gemstone.gemfire.internal.offheap.SimpleMemoryAllocatorImpl.Chunk;
import com.gemstone.gemfire.internal.offheap.StoredObject;
-import com.gemstone.gemfire.internal.offheap.annotations.Released;
import com.gemstone.gemfire.internal.offheap.annotations.Retained;
import com.gemstone.gemfire.internal.offheap.annotations.Unretained;
import com.gemstone.gemfire.internal.sequencelog.EntryLogger;
import com.gemstone.gemfire.internal.util.concurrent.FutureResult;
import com.gemstone.gemfire.internal.util.concurrent.StoppableCountDownLatch;
import com.gemstone.gemfire.internal.util.concurrent.StoppableReadWriteLock;
-import com.gemstone.gemfire.internal.util.concurrent.StoppableReentrantReadWriteLock.StoppableWriteLock;
import com.gemstone.org.jgroups.util.StringId;
/**
@@ -941,6 +939,7 @@ public class LocalRegion extends AbstractRegion
checkReadiness();
LocalRegion newRegion = null;
RegionAttributes regionAttributes = attrs;
+ attrs = cache.invokeRegionBefore(this, subregionName, attrs, internalRegionArgs);
final InputStream snapshotInputStream = internalRegionArgs
.getSnapshotInputStream();
final boolean getDestroyLock = internalRegionArgs.getDestroyLockFlag();
@@ -1110,6 +1109,7 @@ public class LocalRegion extends AbstractRegion
}
}
+ cache.invokeRegionAfter(newRegion);
return newRegion;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/485ebf95/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionListener.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionListener.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionListener.java
new file mode 100644
index 0000000..88b913c
--- /dev/null
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionListener.java
@@ -0,0 +1,30 @@
+package com.gemstone.gemfire.internal.cache;
+
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+
+/**
+ * Callback on a cache that receives notifications about region creates.
+ *
+ * If there are multiple listeners added to a cache they are invoked in a random
+ * order. See {@link GemFireCacheImpl#addRegionListener(RegionListener)}
+ *
+ * If any of these callbacks throw an exception, that exception will get thrown
+ * out to the user creating the region and the region creation will fail.
+ */
+public interface RegionListener {
+
+ /**
+ * Invoked before a region is created. This callback is allowed to modify the region
+ * attributes before the region is created. Note that it's generally a bad idea to modify
+ * the RegionAttributes in place; a new set of RegionAttributes should be returned that contain
+ * the modifications. InternalRegionArguments *may* be modified, but only if you are sure
+ * the caller is not going to reuse the InternalRegionArguments for something else.
+ */
+ public RegionAttributes beforeCreate(Region parent, String regionName, RegionAttributes attrs, InternalRegionArguments internalRegionArgs);
+
+ /**
+ * Invoked after a region is created.
+ */
+ public void afterCreate(Region region);
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/485ebf95/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java
new file mode 100644
index 0000000..1fc7e59
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java
@@ -0,0 +1,47 @@
+package com.gemstone.gemfire.internal.cache;
+
+import static org.junit.Assert.*;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
+public class RegionListenerJUnitTest {
+
+ @Test
+ public void test() {
+ final AtomicBoolean afterCreateInvoked = new AtomicBoolean();
+ RegionListener listener = new RegionListener() {
+
+ @Override
+ public RegionAttributes beforeCreate(Region parent, String regionName,
+ RegionAttributes attrs, InternalRegionArguments internalRegionArgs) {
+ AttributesFactory newAttrsFactory = new AttributesFactory(attrs);
+ newAttrsFactory.setDataPolicy(DataPolicy.EMPTY);
+ return newAttrsFactory.create();
+ }
+
+ @Override
+ public void afterCreate(Region region) {
+ afterCreateInvoked.set(true);
+ }
+ };
+
+ GemFireCacheImpl cache = (GemFireCacheImpl) new CacheFactory().set("mcast-port", "0").create();
+ cache.addRegionListener(listener);
+ Region region = cache.createRegionFactory(RegionShortcut.REPLICATE).create("region");
+ assertEquals(DataPolicy.EMPTY, region.getAttributes().getDataPolicy());
+ assertTrue(afterCreateInvoked.get());
+ }
+
+}
[22/50] [abbrv] incubator-geode git commit: Adding an EntityResolver
for the apache namespace
Posted by as...@apache.org.
Adding an EntityResolver for the apache namespace
This will look for xsd files and other xml entities on the classpath if
they are in the http://geode.incubator.apache.org/schema namespace.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/abe9d47d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/abe9d47d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/abe9d47d
Branch: refs/heads/develop
Commit: abe9d47d502e1f3db0f032ecb06bd6f771330668
Parents: 58ddc22
Author: Dan Smith <up...@apache.org>
Authored: Tue Oct 6 15:54:55 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Wed Oct 7 09:26:32 2015 -0700
----------------------------------------------------------------------
.../cache/xmlcache/DefaultEntityResolver2.java | 2 +-
.../cache/xmlcache/GeodeEntityResolver.java | 49 ++++++++++++++++++++
.../cache/xmlcache/PivotalEntityResolver.java | 2 +-
.../services/org.xml.sax.ext.EntityResolver2 | 1 +
4 files changed, 52 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/abe9d47d/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/DefaultEntityResolver2.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/DefaultEntityResolver2.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/DefaultEntityResolver2.java
index 7e7135f..169f214 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/DefaultEntityResolver2.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/DefaultEntityResolver2.java
@@ -50,7 +50,7 @@ abstract public class DefaultEntityResolver2 implements EntityResolver2 {
* @return InputSource if resource found, otherwise null.
* @since 8.1
*/
- protected final InputSource getClassPathIntputSource(final String publicId, final String systemId, final String path) {
+ protected final InputSource getClassPathInputSource(final String publicId, final String systemId, final String path) {
final InputStream stream = ClassPathLoader.getLatest().getResourceAsStream(getClass(), path);
if (null == stream) {
return null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/abe9d47d/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java
new file mode 100644
index 0000000..e331867
--- /dev/null
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java
@@ -0,0 +1,49 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+
+package com.gemstone.gemfire.internal.cache.xmlcache;
+
+import java.io.IOException;
+import java.util.ServiceLoader;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.EntityResolver2;
+
+/**
+ * Resolves entities for XSDs or DTDs with SYSTEM IDs rooted at
+ * http://www.pivotal.io/xml/ns from the classpath at
+ * /META-INF/schemas/schema.pivotal.io/.
+ *
+ * Loaded by {@link ServiceLoader} on {@link EntityResolver2} class. See file
+ * <code>META-INF/services/org.xml.sax.ext.EntityResolver2</code>
+ *
+ * @author jbarrett@pivotal.io
+ *
+ * @since 8.1
+ */
+public final class GeodeEntityResolver extends DefaultEntityResolver2 {
+
+ private static final String SYSTEM_ID_ROOT = "http://geode.incubator.apache.org/schema";
+
+ private static final String CLASSPATH_ROOT = "/META-INF/schemas/geode.incubator.apache.org/";
+
+ @Override
+ public InputSource resolveEntity(final String name, final String publicId, final String baseURI, final String systemId) throws SAXException, IOException {
+ if (null == systemId) {
+ return null;
+ }
+
+ if (systemId.startsWith(SYSTEM_ID_ROOT)) {
+ return getClassPathInputSource(publicId, systemId, CLASSPATH_ROOT + systemId.substring(SYSTEM_ID_ROOT.length()));
+ }
+
+ return null;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/abe9d47d/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolver.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolver.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolver.java
index 27e2764..81ef91b 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolver.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolver.java
@@ -40,7 +40,7 @@ public final class PivotalEntityResolver extends DefaultEntityResolver2 {
}
if (systemId.startsWith(SYSTEM_ID_ROOT)) {
- return getClassPathIntputSource(publicId, systemId, CLASSPATH_ROOT + systemId.substring(SYSTEM_ID_ROOT.length()));
+ return getClassPathInputSource(publicId, systemId, CLASSPATH_ROOT + systemId.substring(SYSTEM_ID_ROOT.length()));
}
return null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/abe9d47d/gemfire-core/src/main/resources/META-INF/services/org.xml.sax.ext.EntityResolver2
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/resources/META-INF/services/org.xml.sax.ext.EntityResolver2 b/gemfire-core/src/main/resources/META-INF/services/org.xml.sax.ext.EntityResolver2
index 5901ec1..53face5 100644
--- a/gemfire-core/src/main/resources/META-INF/services/org.xml.sax.ext.EntityResolver2
+++ b/gemfire-core/src/main/resources/META-INF/services/org.xml.sax.ext.EntityResolver2
@@ -1 +1,2 @@
com.gemstone.gemfire.internal.cache.xmlcache.PivotalEntityResolver
+com.gemstone.gemfire.internal.cache.xmlcache.GeodeEntityResolver
[43/50] [abbrv] incubator-geode git commit: Merge remote-tracking
branch 'origin/develop' into feature/GEODE-11
Posted by as...@apache.org.
Merge remote-tracking branch 'origin/develop' into feature/GEODE-11
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/afa0a6e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/afa0a6e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/afa0a6e9
Branch: refs/heads/develop
Commit: afa0a6e9c1d45ea0d5c19b01b3ab3380706fdd5b
Parents: f189ff5 cfbeaf2
Author: Ashvin Agrawal <as...@apache.org>
Authored: Sun Nov 8 20:17:30 2015 -0800
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Sun Nov 8 20:17:30 2015 -0800
----------------------------------------------------------------------
.../management/MemoryThresholdsDUnitTest.java | 34 +++++++++++++++++++-
.../internal/ProductUseLogDUnitTest.java | 3 +-
.../GemFireDeadlockDetectorDUnitTest.java | 2 +-
.../gemfire/internal/JSSESocketJUnitTest.java | 2 +-
.../control/TestMemoryThresholdListener.java | 13 ++++++++
.../internal/i18n/BasicI18nJUnitTest.java | 12 -------
.../src/main/java/org/json/JSONObject.java | 2 ++
7 files changed, 52 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[46/50] [abbrv] incubator-geode git commit: GEODE-11: ADD Apache
License header
Posted by as...@apache.org.
GEODE-11: ADD Apache License header
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/300397c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/300397c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/300397c1
Branch: refs/heads/develop
Commit: 300397c17203fccda28436779ede46ee23fc32a3
Parents: 3e87134
Author: Ashvin Agrawal <as...@apache.org>
Authored: Sun Nov 8 22:02:39 2015 -0800
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Mon Nov 9 10:31:42 2015 -0800
----------------------------------------------------------------------
.../cache/lucene/LuceneQueryProvider.java | 19 ++++++++++++
.../cache/lucene/LuceneQueryResults.java | 19 ++++++++++++
.../cache/lucene/LuceneServiceProvider.java | 19 ++++++++++++
.../lucene/internal/InternalLuceneIndex.java | 19 ++++++++++++
.../lucene/internal/InternalLuceneService.java | 19 ++++++++++++
.../lucene/internal/LuceneEventListener.java | 19 ++++++++++++
.../LuceneIndexForPartitionedRegion.java | 19 ++++++++++++
.../LuceneIndexForReplicatedRegion.java | 19 ++++++++++++
.../cache/lucene/internal/LuceneIndexImpl.java | 24 ++++++++++++---
.../lucene/internal/LuceneQueryFactoryImpl.java | 19 ++++++++++++
.../cache/lucene/internal/LuceneQueryImpl.java | 19 ++++++++++++
.../lucene/internal/LuceneQueryResultsImpl.java | 19 ++++++++++++
.../lucene/internal/LuceneResultStructImpl.java | 19 ++++++++++++
.../lucene/internal/LuceneServiceImpl.java | 19 ++++++++++++
.../internal/PartitionedRepositoryManager.java | 19 ++++++++++++
.../lucene/internal/StringQueryProvider.java | 20 +++++++++++-
.../internal/directory/FileIndexInput.java | 19 ++++++++++++
.../internal/directory/RegionDirectory.java | 32 ++++++++++++--------
.../internal/distributed/CollectorManager.java | 19 ++++++++++++
.../lucene/internal/distributed/EntryScore.java | 19 ++++++++++++
.../internal/distributed/LuceneFunction.java | 20 +++++++++++-
.../distributed/LuceneFunctionContext.java | 19 ++++++++++++
.../lucene/internal/distributed/TopEntries.java | 19 ++++++++++++
.../distributed/TopEntriesCollector.java | 19 ++++++++++++
.../distributed/TopEntriesCollectorManager.java | 19 ++++++++++++
.../TopEntriesFunctionCollector.java | 19 ++++++++++++
.../lucene/internal/filesystem/ChunkKey.java | 19 ++++++++++++
.../cache/lucene/internal/filesystem/File.java | 19 ++++++++++++
.../internal/filesystem/FileInputStream.java | 20 +++++++++++-
.../internal/filesystem/FileOutputStream.java | 19 ++++++++++++
.../lucene/internal/filesystem/FileSystem.java | 19 ++++++++++++
.../filesystem/SeekableInputStream.java | 19 ++++++++++++
.../internal/repository/IndexRepository.java | 19 ++++++++++++
.../repository/IndexRepositoryImpl.java | 19 ++++++++++++
.../repository/IndexResultCollector.java | 19 ++++++++++++
.../internal/repository/RepositoryManager.java | 19 ++++++++++++
.../HeterogenousLuceneSerializer.java | 19 ++++++++++++
.../repository/serializer/LuceneSerializer.java | 19 ++++++++++++
.../serializer/PdxLuceneSerializer.java | 19 ++++++++++++
.../serializer/ReflectionLuceneSerializer.java | 19 ++++++++++++
.../repository/serializer/SerializerUtil.java | 19 ++++++++++++
.../internal/xml/LuceneIndexCreation.java | 19 ++++++++++++
.../internal/xml/LuceneIndexXmlGenerator.java | 19 ++++++++++++
.../internal/xml/LuceneServiceXmlGenerator.java | 19 ++++++++++++
.../lucene/internal/xml/LuceneXmlConstants.java | 19 ++++++++++++
.../lucene/internal/xml/LuceneXmlParser.java | 19 ++++++++++++
.../internal/LuceneEventListenerJUnitTest.java | 19 ++++++++++++
.../LuceneIndexRecoveryHAJUnitTest.java | 19 ++++++++++++
.../LuceneQueryFactoryImplJUnitTest.java | 18 +++++++++++
.../internal/LuceneQueryImplJUnitTest.java | 19 ++++++++++++
.../LuceneQueryResultsImplJUnitTest.java | 19 ++++++++++++
.../LuceneResultStructImpJUnitTest.java | 19 ++++++++++++
.../internal/LuceneServiceImplJUnitTest.java | 19 ++++++++++++
.../PartitionedRepositoryManagerJUnitTest.java | 19 ++++++++++++
.../internal/StringQueryProviderJUnitTest.java | 19 ++++++++++++
.../directory/RegionDirectoryJUnitTest.java | 19 ++++++++++++
.../DistributedScoringJUnitTest.java | 19 ++++++++++++
.../distributed/EntryScoreJUnitTest.java | 19 ++++++++++++
.../LuceneFunctionContextJUnitTest.java | 19 ++++++++++++
.../distributed/LuceneFunctionJUnitTest.java | 19 ++++++++++++
.../LuceneFunctionReadPathDUnitTest.java | 19 ++++++++++++
.../TopEntriesCollectorJUnitTest.java | 19 ++++++++++++
.../TopEntriesFunctionCollectorJUnitTest.java | 19 ++++++++++++
.../distributed/TopEntriesJUnitTest.java | 19 ++++++++++++
.../internal/filesystem/ChunkKeyJUnitTest.java | 19 ++++++++++++
.../internal/filesystem/FileJUnitTest.java | 19 ++++++++++++
.../filesystem/FileSystemJUnitTest.java | 19 ++++++++++++
...IndexRepositoryImplJUnitPerformanceTest.java | 23 +++++++++++---
.../IndexRepositoryImplJUnitTest.java | 19 ++++++++++++
.../HeterogenousLuceneSerializerJUnitTest.java | 19 ++++++++++++
.../serializer/PdxFieldMapperJUnitTest.java | 19 ++++++++++++
.../ReflectionFieldMapperJUnitTest.java | 19 ++++++++++++
.../internal/repository/serializer/Type1.java | 19 ++++++++++++
.../internal/repository/serializer/Type2.java | 19 ++++++++++++
...neIndexXmlGeneratorIntegrationJUnitTest.java | 19 ++++++++++++
.../xml/LuceneIndexXmlGeneratorJUnitTest.java | 19 ++++++++++++
...uceneIndexXmlParserIntegrationJUnitTest.java | 19 ++++++++++++
.../xml/LuceneIndexXmlParserJUnitTest.java | 19 ++++++++++++
78 files changed, 1481 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
index 82f486c..8e3500e 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene;
import java.io.Serializable;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java
index cdc8b10..68d4ec2 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java
index 72ec554..bbd2b83 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene;
import com.gemstone.gemfire.annotations.Experimental;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneIndex.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneIndex.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneIndex.java
index ab2c924..951b0f9 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneIndex.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneIndex.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import com.gemstone.gemfire.cache.lucene.LuceneIndex;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneService.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneService.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneService.java
index cd78c2c..403853e 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneService.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/InternalLuceneService.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import com.gemstone.gemfire.cache.Cache;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneEventListener.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneEventListener.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneEventListener.java
index 049fb64..9fdfd43 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneEventListener.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneEventListener.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
index 0e5b424..7002567 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import com.gemstone.gemfire.cache.Cache;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForReplicatedRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForReplicatedRegion.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForReplicatedRegion.java
index 7288399..7c585cf 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForReplicatedRegion.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForReplicatedRegion.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
index c8d4bb6..f869755 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
@@ -1,6 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
-import java.util.HashSet;
import java.util.Map;
import org.apache.logging.log4j.Logger;
@@ -16,10 +34,6 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.logging.LogService;
public abstract class LuceneIndexImpl implements InternalLuceneIndex {
-
- static private final boolean CREATE_CACHE = Boolean.getBoolean("lucene.createCache");
- static private final boolean USE_FS = Boolean.getBoolean("lucene.useFileSystem");
-
protected static final Logger logger = LogService.getLogger();
// protected HashSet<String> searchableFieldNames = new HashSet<String>();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
index b377949..c6087ea 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import com.gemstone.gemfire.cache.Cache;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
index 222acdc..a876b40 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import com.gemstone.gemfire.cache.Region;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImpl.java
index d77dbc5..f0e98c8 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImpl.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpl.java
index 35cf086..a3794f2 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpl.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import com.gemstone.gemfire.cache.lucene.LuceneResultStruct;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
index 5efe300..ab48b19 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
index e276cff..07050e2 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManager.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
index 7e50bae..1e2b63d 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import java.io.DataInput;
@@ -5,7 +24,6 @@ import java.io.DataOutput;
import java.io.IOException;
import org.apache.logging.log4j.Logger;
-import org.apache.lucene.analysis.core.SimpleAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
import org.apache.lucene.queryparser.classic.ParseException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/directory/FileIndexInput.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/directory/FileIndexInput.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/directory/FileIndexInput.java
index 235cd3a..9ebef51 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/directory/FileIndexInput.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/directory/FileIndexInput.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.directory;
import java.io.EOFException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectory.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectory.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectory.java
index 38e7714..e25dc77 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectory.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectory.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.directory;
import java.io.IOException;
@@ -5,27 +24,16 @@ import java.io.OutputStream;
import java.util.Collection;
import java.util.concurrent.ConcurrentMap;
-import org.apache.logging.log4j.Logger;
import org.apache.lucene.store.BaseDirectory;
-import org.apache.lucene.store.BufferedIndexInput;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.store.OutputStreamIndexOutput;
import org.apache.lucene.store.SingleInstanceLockFactory;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.PartitionAttributesFactory;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.File;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.FileSystem;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
/**
* An implementation of Directory that stores data in geode regions.
@@ -36,8 +44,6 @@ import com.gemstone.gemfire.internal.logging.LogService;
*/
public class RegionDirectory extends BaseDirectory {
- private static final Logger logger = LogService.getLogger();
-
private final FileSystem fs;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/CollectorManager.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/CollectorManager.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/CollectorManager.java
index 904a47e..45750d1 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/CollectorManager.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/CollectorManager.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/EntryScore.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/EntryScore.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/EntryScore.java
index 456b3ba..6690342 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/EntryScore.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/EntryScore.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import java.io.DataInput;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunction.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunction.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunction.java
index b8552fa..c3b79c5 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunction.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunction.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import java.io.IOException;
@@ -12,7 +31,6 @@ import com.gemstone.gemfire.cache.execute.FunctionAdapter;
import com.gemstone.gemfire.cache.execute.FunctionContext;
import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
import com.gemstone.gemfire.cache.execute.ResultSender;
-import com.gemstone.gemfire.cache.lucene.LuceneQueryFactory;
import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider;
import com.gemstone.gemfire.cache.lucene.LuceneService;
import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContext.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContext.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContext.java
index d36bcc2..b0b2c60 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContext.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContext.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import java.io.DataInput;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntries.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntries.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntries.java
index 3417615..5813d75 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntries.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntries.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import java.io.DataInput;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollector.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollector.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollector.java
index 37797d9..94b8a3a 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollector.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollector.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import java.io.DataInput;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
index 417d80f..b19e104 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorManager.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import java.io.DataInput;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
index 96ec296..2e8f2dc 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollector.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.distributed;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKey.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKey.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKey.java
index d13f3f5..8fbe356 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKey.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKey.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.filesystem;
import java.io.DataInput;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/File.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/File.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/File.java
index 1ad0808..2937af5 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/File.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/File.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.filesystem;
import java.io.DataInput;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileInputStream.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileInputStream.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileInputStream.java
index bcb0821..18194aa 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileInputStream.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileInputStream.java
@@ -1,8 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.filesystem;
import java.io.EOFException;
import java.io.IOException;
-import java.io.InputStream;
/**
* An input stream that reads chunks from
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileOutputStream.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileOutputStream.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileOutputStream.java
index ea80d78..3f9f614 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileOutputStream.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileOutputStream.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.filesystem;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystem.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystem.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystem.java
index 5e29437..b84dc92 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystem.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystem.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.filesystem;
import java.io.FileNotFoundException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/SeekableInputStream.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/SeekableInputStream.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/SeekableInputStream.java
index abf3268..e10e0c4 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/SeekableInputStream.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/SeekableInputStream.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.filesystem;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepository.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepository.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepository.java
index b852b82..f1e63e0 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepository.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepository.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.repository;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java
index fbbc5db..a9c463e 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.repository;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexResultCollector.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexResultCollector.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexResultCollector.java
index fa867e1..7fd9e2a 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexResultCollector.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexResultCollector.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.repository;
import com.gemstone.gemfire.annotations.Experimental;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/RepositoryManager.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/RepositoryManager.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/RepositoryManager.java
index cea4f89..20c2d51 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/RepositoryManager.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/RepositoryManager.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.repository;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializer.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializer.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializer.java
index 798f34e..7cb25bb 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializer.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializer.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.repository.serializer;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/LuceneSerializer.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/LuceneSerializer.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/LuceneSerializer.java
index a06617a..421dc0b 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/LuceneSerializer.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/LuceneSerializer.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.repository.serializer;
import org.apache.lucene.document.Document;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/PdxLuceneSerializer.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/PdxLuceneSerializer.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/PdxLuceneSerializer.java
index 338edb2..c5c55a9 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/PdxLuceneSerializer.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/PdxLuceneSerializer.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.repository.serializer;
import org.apache.lucene.document.Document;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/ReflectionLuceneSerializer.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/ReflectionLuceneSerializer.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/ReflectionLuceneSerializer.java
index 0b54fdd..953f31f 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/ReflectionLuceneSerializer.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/ReflectionLuceneSerializer.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.repository.serializer;
import java.lang.reflect.Field;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/SerializerUtil.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/SerializerUtil.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/SerializerUtil.java
index 30224b4..7ffc5db 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/SerializerUtil.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/SerializerUtil.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.repository.serializer;
import java.io.ByteArrayOutputStream;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
index b2f2645..e664895 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexCreation.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.xml;
import java.util.Arrays;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
index dcfbec6..6399a80 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGenerator.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.xml;
import static com.gemstone.gemfire.cache.lucene.internal.xml.LuceneXmlConstants.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
index 6c0da01..c449f47 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.xml;
import org.xml.sax.SAXException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java
index 45c08b6..303424e 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlConstants.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.xml;
public class LuceneXmlConstants {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java
index 25aac41..764f461 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneXmlParser.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal.xml;
import static com.gemstone.gemfire.cache.lucene.internal.xml.LuceneXmlConstants.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneEventListenerJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneEventListenerJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneEventListenerJUnitTest.java
index 617020b..85a5333 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneEventListenerJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneEventListenerJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import static org.mockito.Matchers.any;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/300397c1/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAJUnitTest.java
index 3ee1345..405c986 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAJUnitTest.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.gemstone.gemfire.cache.lucene.internal;
import static org.junit.Assert.assertNotNull;
[44/50] [abbrv] incubator-geode git commit: GEODE-11: Mark Lucene API
as experimental
Posted by as...@apache.org.
GEODE-11: Mark Lucene API as experimental
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3e87134e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3e87134e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3e87134e
Branch: refs/heads/develop
Commit: 3e87134eb5aeee6514286727c294cef87fdbf6ee
Parents: afa0a6e
Author: Ashvin Agrawal <as...@apache.org>
Authored: Sun Nov 8 21:37:25 2015 -0800
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Sun Nov 8 21:37:25 2015 -0800
----------------------------------------------------------------------
gemfire-lucene/build.gradle | 2 ++
.../java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java | 4 +++-
.../java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java | 3 +++
.../com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java | 4 +++-
.../com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java | 2 ++
.../com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java | 5 +++--
.../com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java | 3 ++-
.../java/com/gemstone/gemfire/cache/lucene/LuceneService.java | 5 ++---
.../gemstone/gemfire/cache/lucene/LuceneServiceProvider.java | 2 ++
.../cache/lucene/internal/distributed/CollectorManager.java | 2 ++
.../cache/lucene/internal/repository/IndexResultCollector.java | 3 +++
11 files changed, 27 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-lucene/build.gradle b/gemfire-lucene/build.gradle
index 3303a69..40313c5 100644
--- a/gemfire-lucene/build.gradle
+++ b/gemfire-lucene/build.gradle
@@ -1,5 +1,7 @@
dependencies {
provided project(':gemfire-core')
+ provided project(':gemfire-common')
+
compile 'org.apache.lucene:lucene-analyzers-common:5.3.0'
compile 'org.apache.lucene:lucene-core:5.3.0'
compile 'org.apache.lucene:lucene-queries:5.3.0'
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
index 49b74b1..11c4e95 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
@@ -21,6 +21,8 @@ import java.util.Map;
import org.apache.lucene.analysis.Analyzer;
+import com.gemstone.gemfire.annotations.Experimental;
+
/**
* An lucene index is built over the data stored in a GemFire Region.
@@ -31,8 +33,8 @@ import org.apache.lucene.analysis.Analyzer;
* <p>
*
* @author Xiaojian Zhou
- * @since 8.5
*/
+@Experimental
public interface LuceneIndex {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
index e10b686..2de9c0b 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
@@ -16,12 +16,15 @@
*/
package com.gemstone.gemfire.cache.lucene;
+import com.gemstone.gemfire.annotations.Experimental;
+
/**
* Provides wrapper object of Lucene's Query object and execute the search.
* <p>Instances of this interface are created using
* {@link LuceneQueryFactory#create}.
*
*/
+@Experimental
public interface LuceneQuery<K, V> {
/**
* Execute the search and get results.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
index 6604926..b707c52 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
@@ -18,6 +18,8 @@ package com.gemstone.gemfire.cache.lucene;
import org.apache.lucene.queryparser.classic.ParseException;
+import com.gemstone.gemfire.annotations.Experimental;
+
/**
* Factory for creating instances of {@link LuceneQuery}.
* To get an instance of this factory call {@link LuceneService#createLuceneQueryFactory}.
@@ -26,8 +28,8 @@ import org.apache.lucene.queryparser.classic.ParseException;
* call {@link #create} to produce a {@link LuceneQuery} instance.
*
* @author Xiaojian Zhou
- * @since 8.5
*/
+@Experimental
public interface LuceneQueryFactory {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
index cad9095..82f486c 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
import org.apache.lucene.search.Query;
+import com.gemstone.gemfire.annotations.Experimental;
import com.gemstone.gemfire.cache.query.QueryException;
/**
@@ -14,6 +15,7 @@ import com.gemstone.gemfire.cache.query.QueryException;
* distributed system. Implementation of DataSerializable can provide a zero-argument constructor that will be invoked
* when they are read with DataSerializer.readObject.
*/
+@Experimental
public interface LuceneQueryProvider extends Serializable {
/**
* @return A Lucene Query object which could be used for executing Lucene Search on indexed data
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java
index 62aada2..cdc8b10 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java
@@ -2,17 +2,18 @@ package com.gemstone.gemfire.cache.lucene;
import java.util.List;
+import com.gemstone.gemfire.annotations.Experimental;
+
/**
* <p>
* Defines the interface for a container of lucene query result collected from function execution.<br>
*
* @author Xiaojian Zhou
- * @since 8.5
*
* @param <K> The type of the key
* @param <V> The type of the value
*/
-
+@Experimental
public interface LuceneQueryResults<K, V> {
/**
* @return total number of hits for this query
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java
index 1cf3c7c..f904d93 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java
@@ -16,14 +16,15 @@
*/
package com.gemstone.gemfire.cache.lucene;
+import com.gemstone.gemfire.annotations.Experimental;
/**
* <p>
* Abstract data structure for one item in query result.
*
* @author Xiaojian Zhou
- * @since 8.5
*/
+@Experimental
public interface LuceneResultStruct<K, V> {
/**
* Return the value associated with the given field name
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
index 6bbb4fd..fbd6dad 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
@@ -21,10 +21,8 @@ import java.util.Map;
import org.apache.lucene.analysis.Analyzer;
-import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.annotations.Experimental;
import com.gemstone.gemfire.cache.GemFireCache;
-import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl;
-import com.gemstone.gemfire.internal.cache.extension.Extensible;
/**
* LuceneService instance is a singleton for each cache. It will be created in cache
@@ -70,6 +68,7 @@ import com.gemstone.gemfire.internal.cache.extension.Extensible;
* @author Xiaojian Zhou
*
*/
+@Experimental
public interface LuceneService {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java
index 35427ae..72ec554 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java
@@ -1,5 +1,6 @@
package com.gemstone.gemfire.cache.lucene;
+import com.gemstone.gemfire.annotations.Experimental;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneService;
import com.gemstone.gemfire.internal.cache.InternalCache;
@@ -9,6 +10,7 @@ import com.gemstone.gemfire.internal.cache.InternalCache;
* instance of the LuceneService.
*
*/
+@Experimental
public class LuceneServiceProvider {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/CollectorManager.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/CollectorManager.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/CollectorManager.java
index 41c3f5f..904a47e 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/CollectorManager.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/CollectorManager.java
@@ -3,6 +3,7 @@ package com.gemstone.gemfire.cache.lucene.internal.distributed;
import java.io.IOException;
import java.util.Collection;
+import com.gemstone.gemfire.annotations.Experimental;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
import com.gemstone.gemfire.cache.lucene.internal.repository.IndexResultCollector;
@@ -16,6 +17,7 @@ import com.gemstone.gemfire.cache.lucene.internal.repository.IndexResultCollecto
*
* @param <C> Type of IndexResultCollector created by this manager
*/
+@Experimental
public interface CollectorManager<C extends IndexResultCollector> {
/**
* @param name Name/Identifier for this collector. For e.g. region/bucketId.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexResultCollector.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexResultCollector.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexResultCollector.java
index 94931a4..fa867e1 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexResultCollector.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexResultCollector.java
@@ -1,9 +1,12 @@
package com.gemstone.gemfire.cache.lucene.internal.repository;
+import com.gemstone.gemfire.annotations.Experimental;
+
/**
* Interface for collection results of a query on
* an IndexRepository. See {@link IndexRepository#query(org.apache.lucene.search.Query, int, IndexResultCollector)}
*/
+@Experimental
public interface IndexResultCollector {
/**
* @return Name/identifier of this collector
[08/50] [abbrv] incubator-geode git commit: GEODE-11: Target
primaries for text search
Posted by as...@apache.org.
GEODE-11: Target primaries for text search
OptimizeForWrite is a hint to function service to execute function on primaries
only. As of now indexes on secondaries are not maintained.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3f0c0696
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3f0c0696
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3f0c0696
Branch: refs/heads/develop
Commit: 3f0c0696e1f35ac4dc0f5a0f18b2e2fa5e54f654
Parents: 0394f05
Author: Ashvin Agrawal <as...@apache.org>
Authored: Tue Sep 22 15:54:20 2015 -0700
Committer: Ashvin Agrawal <as...@apache.org>
Committed: Tue Sep 22 15:56:27 2015 -0700
----------------------------------------------------------------------
.../cache/lucene/internal/distributed/LuceneFunction.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3f0c0696/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunction.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunction.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunction.java
index e2e33f3..ca0e2d3 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunction.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunction.java
@@ -115,4 +115,9 @@ public class LuceneFunction extends FunctionAdapter {
public String getId() {
return ID;
}
+
+ @Override
+ public boolean optimizeForWrite() {
+ return true;
+ }
}
[05/50] [abbrv] incubator-geode git commit: Fixing
CopyOnWriteHashMap.putIfAbsent
Posted by as...@apache.org.
Fixing CopyOnWriteHashMap.putIfAbsent
This method was putting a null in the map instead of the new value if no
old value was present.
Adding a unit test for CopyOnWriteHashMap, adapted from the JSR166 test
case for ConcurrentHashMap.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3ad1fe7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3ad1fe7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3ad1fe7b
Branch: refs/heads/develop
Commit: 3ad1fe7b796589b3da71cb3dab26bec582e0f747
Parents: 8bd006a
Author: Dan Smith <up...@apache.org>
Authored: Tue Sep 22 14:21:18 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Tue Sep 22 14:25:14 2015 -0700
----------------------------------------------------------------------
.../util/concurrent/CopyOnWriteHashMap.java | 5 +-
.../concurrent/CopyOnWriteHashMapJUnitTest.java | 496 +++++++++++++++++++
2 files changed, 499 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3ad1fe7b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CopyOnWriteHashMap.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CopyOnWriteHashMap.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CopyOnWriteHashMap.java
index d6f4c6f..76b0352 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CopyOnWriteHashMap.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CopyOnWriteHashMap.java
@@ -7,6 +7,7 @@
*/
package com.gemstone.gemfire.internal.util.concurrent;
+import java.io.Serializable;
import java.util.AbstractMap;
import java.util.Collection;
import java.util.Collections;
@@ -24,7 +25,7 @@ import java.util.concurrent.ConcurrentMap;
* @author dsmith
*
*/
-public class CopyOnWriteHashMap<K,V> extends AbstractMap<K, V> implements ConcurrentMap<K, V> {
+public class CopyOnWriteHashMap<K,V> extends AbstractMap<K, V> implements ConcurrentMap<K, V> , Serializable {
private volatile Map<K,V> map = Collections.<K,V>emptyMap();
public CopyOnWriteHashMap() {
@@ -160,7 +161,7 @@ public class CopyOnWriteHashMap<K,V> extends AbstractMap<K, V> implements Concur
public synchronized V putIfAbsent(K key, V value) {
V oldValue = map.get(key);
if(oldValue == null) {
- put(key, oldValue);
+ put(key, value);
return null;
} else {
return oldValue;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3ad1fe7b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java
new file mode 100644
index 0000000..f304e88
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java
@@ -0,0 +1,496 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/*
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/licenses/publicdomain
+ * Other contributors include Andrew Wright, Jeffrey Hayes,
+ * Pat Fisher, Mike Judd.
+ */
+package com.gemstone.gemfire.internal.util.concurrent;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.internal.util.concurrent.cm.ConcurrentHashMapJUnitTest;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import com.gemstone.gemfire.util.JSR166TestCase;
+
+/**
+ * Adopted from the JSR166 test cases. {@link ConcurrentHashMapJUnitTest}
+ */
+@Category(IntegrationTest.class)
+public class CopyOnWriteHashMapJUnitTest extends JSR166TestCase{
+
+ public CopyOnWriteHashMapJUnitTest(String name) {
+ super(name);
+ }
+
+ /**
+ * Create a map from Integers 1-5 to Strings "A"-"E".
+ */
+ private CopyOnWriteHashMap map5() {
+ CopyOnWriteHashMap map = newMap();
+ assertTrue(map.isEmpty());
+ map.put(one, "A");
+ map.put(two, "B");
+ map.put(three, "C");
+ map.put(four, "D");
+ map.put(five, "E");
+ assertFalse(map.isEmpty());
+ assertEquals(5, map.size());
+ return map;
+ }
+
+ protected CopyOnWriteHashMap newMap() {
+ return new CopyOnWriteHashMap();
+ }
+
+ /**
+ * clear removes all pairs
+ */
+ public void testClear() {
+ CopyOnWriteHashMap map = map5();
+ map.clear();
+ assertEquals(map.size(), 0);
+ }
+
+ /**
+ * Maps with same contents are equal
+ */
+ public void testEquals() {
+ CopyOnWriteHashMap map1 = map5();
+ CopyOnWriteHashMap map2 = map5();
+ assertEquals(map1, map2);
+ assertEquals(map2, map1);
+ map1.clear();
+ assertFalse(map1.equals(map2));
+ assertFalse(map2.equals(map1));
+ }
+
+ /**
+ * containsKey returns true for contained key
+ */
+ public void testContainsKey() {
+ CopyOnWriteHashMap map = map5();
+ assertTrue(map.containsKey(one));
+ assertFalse(map.containsKey(zero));
+ }
+
+ /**
+ * containsValue returns true for held values
+ */
+ public void testContainsValue() {
+ CopyOnWriteHashMap map = map5();
+ assertTrue(map.containsValue("A"));
+ assertFalse(map.containsValue("Z"));
+ }
+
+ /**
+ * get returns the correct element at the given key,
+ * or null if not present
+ */
+ public void testGet() {
+ CopyOnWriteHashMap map = map5();
+ assertEquals("A", (String)map.get(one));
+ CopyOnWriteHashMap empty = newMap();
+ assertNull(map.get("anything"));
+ }
+
+ /**
+ * isEmpty is true of empty map and false for non-empty
+ */
+ public void testIsEmpty() {
+ CopyOnWriteHashMap empty = newMap();
+ CopyOnWriteHashMap map = map5();
+ assertTrue(empty.isEmpty());
+ assertFalse(map.isEmpty());
+ }
+
+ /**
+ * keySet returns a Set containing all the keys
+ */
+ public void testKeySet() {
+ CopyOnWriteHashMap map = map5();
+ Set s = map.keySet();
+ assertEquals(5, s.size());
+ assertTrue(s.contains(one));
+ assertTrue(s.contains(two));
+ assertTrue(s.contains(three));
+ assertTrue(s.contains(four));
+ assertTrue(s.contains(five));
+ }
+
+ /**
+ * keySet.toArray returns contains all keys
+ */
+ public void testKeySetToArray() {
+ CopyOnWriteHashMap map = map5();
+ Set s = map.keySet();
+ Object[] ar = s.toArray();
+ assertTrue(s.containsAll(Arrays.asList(ar)));
+ assertEquals(5, ar.length);
+ ar[0] = m10;
+ assertFalse(s.containsAll(Arrays.asList(ar)));
+ }
+
+ /**
+ * Values.toArray contains all values
+ */
+ public void testValuesToArray() {
+ CopyOnWriteHashMap map = map5();
+ Collection v = map.values();
+ Object[] ar = v.toArray();
+ ArrayList s = new ArrayList(Arrays.asList(ar));
+ assertEquals(5, ar.length);
+ assertTrue(s.contains("A"));
+ assertTrue(s.contains("B"));
+ assertTrue(s.contains("C"));
+ assertTrue(s.contains("D"));
+ assertTrue(s.contains("E"));
+ }
+
+ /**
+ * entrySet.toArray contains all entries
+ */
+ public void testEntrySetToArray() {
+ CopyOnWriteHashMap map = map5();
+ Set s = map.entrySet();
+ Object[] ar = s.toArray();
+ assertEquals(5, ar.length);
+ for (int i = 0; i < 5; ++i) {
+ assertTrue(map.containsKey(((Map.Entry)(ar[i])).getKey()));
+ assertTrue(map.containsValue(((Map.Entry)(ar[i])).getValue()));
+ }
+ }
+
+ /**
+ * values collection contains all values
+ */
+ public void testValues() {
+ CopyOnWriteHashMap map = map5();
+ Collection s = map.values();
+ assertEquals(5, s.size());
+ assertTrue(s.contains("A"));
+ assertTrue(s.contains("B"));
+ assertTrue(s.contains("C"));
+ assertTrue(s.contains("D"));
+ assertTrue(s.contains("E"));
+ }
+
+ /**
+ * entrySet contains all pairs
+ */
+ public void testEntrySet() {
+ CopyOnWriteHashMap map = map5();
+ Set s = map.entrySet();
+ assertEquals(5, s.size());
+ Iterator it = s.iterator();
+ while (it.hasNext()) {
+ Map.Entry e = (Map.Entry) it.next();
+ assertTrue(
+ (e.getKey().equals(one) && e.getValue().equals("A")) ||
+ (e.getKey().equals(two) && e.getValue().equals("B")) ||
+ (e.getKey().equals(three) && e.getValue().equals("C")) ||
+ (e.getKey().equals(four) && e.getValue().equals("D")) ||
+ (e.getKey().equals(five) && e.getValue().equals("E")));
+ }
+ }
+
+ /**
+ * putAll adds all key-value pairs from the given map
+ */
+ public void testPutAll() {
+ CopyOnWriteHashMap empty = newMap();
+ CopyOnWriteHashMap map = map5();
+ empty.putAll(map);
+ assertEquals(5, empty.size());
+ assertTrue(empty.containsKey(one));
+ assertTrue(empty.containsKey(two));
+ assertTrue(empty.containsKey(three));
+ assertTrue(empty.containsKey(four));
+ assertTrue(empty.containsKey(five));
+ }
+
+ /**
+ * putIfAbsent works when the given key is not present
+ */
+ public void testPutIfAbsent() {
+ CopyOnWriteHashMap map = map5();
+ map.putIfAbsent(six, "Z");
+ assertTrue(map.containsKey(six));
+ }
+
+ /**
+ * putIfAbsent does not add the pair if the key is already present
+ */
+ public void testPutIfAbsent2() {
+ CopyOnWriteHashMap map = map5();
+ assertEquals("A", map.putIfAbsent(one, "Z"));
+ }
+
+ /**
+ * replace fails when the given key is not present
+ */
+ public void testReplace() {
+ CopyOnWriteHashMap map = map5();
+ assertNull(map.replace(six, "Z"));
+ assertFalse(map.containsKey(six));
+ }
+
+ /**
+ * replace succeeds if the key is already present
+ */
+ public void testReplace2() {
+ CopyOnWriteHashMap map = map5();
+ assertNotNull(map.replace(one, "Z"));
+ assertEquals("Z", map.get(one));
+ }
+
+
+ /**
+ * replace value fails when the given key not mapped to expected value
+ */
+ public void testReplaceValue() {
+ CopyOnWriteHashMap map = map5();
+ assertEquals("A", map.get(one));
+ assertFalse(map.replace(one, "Z", "Z"));
+ assertEquals("A", map.get(one));
+ }
+
+ /**
+ * replace value succeeds when the given key mapped to expected value
+ */
+ public void testReplaceValue2() {
+ CopyOnWriteHashMap map = map5();
+ assertEquals("A", map.get(one));
+ assertTrue(map.replace(one, "A", "Z"));
+ assertEquals("Z", map.get(one));
+ }
+
+
+ /**
+ * remove removes the correct key-value pair from the map
+ */
+ public void testRemove() {
+ CopyOnWriteHashMap map = map5();
+ map.remove(five);
+ assertEquals(4, map.size());
+ assertFalse(map.containsKey(five));
+ }
+
+ /**
+ * remove(key,value) removes only if pair present
+ */
+ public void testRemove2() {
+ CopyOnWriteHashMap map = map5();
+ map.remove(five, "E");
+ assertEquals(4, map.size());
+ assertFalse(map.containsKey(five));
+ map.remove(four, "A");
+ assertEquals(4, map.size());
+ assertTrue(map.containsKey(four));
+
+ }
+
+ /**
+ * size returns the correct values
+ */
+ public void testSize() {
+ CopyOnWriteHashMap map = map5();
+ CopyOnWriteHashMap empty = newMap();
+ assertEquals(0, empty.size());
+ assertEquals(5, map.size());
+ }
+
+ /**
+ * toString contains toString of elements
+ */
+ public void testToString() {
+ CopyOnWriteHashMap map = map5();
+ String s = map.toString();
+ for (int i = 1; i <= 5; ++i) {
+ assertTrue(s.indexOf(String.valueOf(i)) >= 0);
+ }
+ }
+
+ // Exception tests
+
+ /**
+ * get(null) throws NPE
+ */
+ public void testGetNull() {
+ CopyOnWriteHashMap c = newMap();
+ assertNull(c.get(null));
+ }
+
+ /**
+ * containsKey(null) throws NPE
+ */
+ public void testContainsKeyNull() {
+ CopyOnWriteHashMap c = newMap();
+ assertFalse(c.containsKey(null));
+ }
+
+ /**
+ * containsValue(null) throws NPE
+ */
+ public void testContainsValue_NullPointerException() {
+ CopyOnWriteHashMap c = newMap();
+ assertFalse(c.containsValue(null));
+ }
+
+ /**
+ * put(null,x) throws NPE
+ */
+ public void testPut1NullKey() {
+ CopyOnWriteHashMap c = newMap();
+ c.put(null, "whatever");
+ assertTrue(c.containsKey(null));
+ assertEquals("whatever", c.get(null));
+ }
+
+ /**
+ * put(x, null) throws NPE
+ */
+ public void testPut2NullValue() {
+ CopyOnWriteHashMap c = newMap();
+ c.put("whatever", null);
+ assertTrue(c.containsKey("whatever"));
+ assertEquals(null, c.get("whatever"));
+ }
+
+ /**
+ * putIfAbsent(null, x) throws NPE
+ */
+ public void testPutIfAbsent1NullKey() {
+ CopyOnWriteHashMap c = newMap();
+ c.putIfAbsent(null, "whatever");
+ assertTrue(c.containsKey(null));
+ assertEquals("whatever", c.get(null));
+ }
+
+ /**
+ * replace(null, x) throws NPE
+ */
+ public void testReplace_NullPointerException() {
+ CopyOnWriteHashMap c = newMap();
+ assertNull(c.replace(null, "whatever"));
+ }
+
+ /**
+ * replace(null, x, y) throws NPE
+ */
+ public void testReplaceValueNullKey() {
+ CopyOnWriteHashMap c = newMap();
+ c.replace(null, one, "whatever");
+ assertFalse(c.containsKey(null));
+ }
+
+ /**
+ * putIfAbsent(x, null) throws NPE
+ */
+ public void testPutIfAbsent2_NullPointerException() {
+ CopyOnWriteHashMap c = newMap();
+ c.putIfAbsent("whatever", null);
+ assertTrue(c.containsKey("whatever"));
+ assertNull(c.get("whatever"));
+ }
+
+
+ /**
+ * replace(x, null) throws NPE
+ */
+ public void testReplace2Null() {
+ CopyOnWriteHashMap c = newMap();
+ c.replace("whatever", null);
+ assertFalse(c.containsKey("whatever"));
+ assertNull(c.get("whatever"));
+ }
+
+ /**
+ * replace(x, null, y) throws NPE
+ */
+ public void testReplaceValue2Null() {
+ CopyOnWriteHashMap c = newMap();
+ c.replace("whatever", null, "A");
+ assertFalse(c.containsKey("whatever"));
+ }
+
+ /**
+ * replace(x, y, null) throws NPE
+ */
+ public void testReplaceValue3Null() {
+ CopyOnWriteHashMap c = newMap();
+ c.replace("whatever", one, null);
+ assertFalse(c.containsKey("whatever"));
+ }
+
+
+ /**
+ * remove(null) throws NPE
+ */
+ public void testRemoveNull() {
+ CopyOnWriteHashMap c = newMap();
+ c.put("sadsdf", "asdads");
+ c.remove(null);
+ }
+
+ /**
+ * remove(null, x) throws NPE
+ */
+ public void testRemove2_NullPointerException() {
+ CopyOnWriteHashMap c = newMap();
+ c.put("sadsdf", "asdads");
+ assertFalse(c.remove(null, "whatever"));
+ }
+
+ /**
+ * remove(x, null) returns false
+ */
+ public void testRemove3() {
+ try {
+ CopyOnWriteHashMap c = newMap();
+ c.put("sadsdf", "asdads");
+ assertFalse(c.remove("sadsdf", null));
+ } catch(NullPointerException e){
+ fail();
+ }
+ }
+
+ /**
+ * A deserialized map equals original
+ */
+ public void testSerialization() throws Exception {
+ CopyOnWriteHashMap q = map5();
+
+ ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
+ ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
+ out.writeObject(q);
+ out.close();
+
+ ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
+ ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
+ CopyOnWriteHashMap r = (CopyOnWriteHashMap)in.readObject();
+ assertEquals(q.size(), r.size());
+ assertTrue(q.equals(r));
+ assertTrue(r.equals(q));
+ }
+}
[23/50] [abbrv] incubator-geode git commit: Hiding the lucene async
event queue from the list of queues.
Posted by as...@apache.org.
Hiding the lucene async event queue from the list of queues.
I added a new flag to the queue - isMetaQueue, which controls whether a
queue will show up in getAllQueues. This also has the effect of
preventing the queue from showing up in a generated xml file.
This is necessary because our queue needs to be constructed with an
async event listener that has a reference to the index. If the queue is
generated and added to the xml, it will end up trying to create a
listener before the index is created.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d88ef883
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d88ef883
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d88ef883
Branch: refs/heads/develop
Commit: d88ef883b23eb8dd465376ccb5038d789f797bb6
Parents: abe9d47
Author: Dan Smith <up...@apache.org>
Authored: Wed Oct 7 15:04:39 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Thu Oct 8 10:26:02 2015 -0700
----------------------------------------------------------------------
.../internal/AsyncEventQueueFactoryImpl.java | 9 +++++++--
.../asyncqueue/internal/AsyncEventQueueImpl.java | 3 +++
.../gemfire/internal/cache/GemFireCacheImpl.java | 14 ++++++++++++--
.../internal/cache/wan/AbstractGatewaySender.java | 7 +++++++
.../internal/cache/wan/GatewaySenderAttributes.java | 5 +++++
.../internal/LuceneIndexForPartitionedRegion.java | 7 ++++++-
.../lucene/internal/LuceneServiceImplJUnitTest.java | 6 +++++-
7 files changed, 45 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d88ef883/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/AsyncEventQueueFactoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/AsyncEventQueueFactoryImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/AsyncEventQueueFactoryImpl.java
index f413218..caef0fc 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/AsyncEventQueueFactoryImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/AsyncEventQueueFactoryImpl.java
@@ -184,8 +184,9 @@ public class AsyncEventQueueFactoryImpl implements AsyncEventQueueFactory {
// AsyncEventQueueImpl.getSenderIdFromAsyncEventQueueId(asyncQueueId));
addAsyncEventListener(listener);
GatewaySender sender = create(AsyncEventQueueImpl.getSenderIdFromAsyncEventQueueId(asyncQueueId));
- asyncEventQueue = new AsyncEventQueueImpl(sender, listener);
- ((GemFireCacheImpl) cache).addAsyncEventQueue(asyncEventQueue);
+ AsyncEventQueueImpl queue = new AsyncEventQueueImpl(sender, listener);
+ asyncEventQueue = queue;
+ ((GemFireCacheImpl) cache).addAsyncEventQueue(queue);
} else if (this.cache instanceof CacheCreation) {
asyncEventQueue = new AsyncEventQueueCreation(asyncQueueId, attrs, listener);
((CacheCreation) cache).addAsyncEventQueue(asyncEventQueue);
@@ -282,4 +283,8 @@ public class AsyncEventQueueFactoryImpl implements AsyncEventQueueFactory {
this.attrs.isHDFSQueue = isHDFSQueue;
return this;
}
+ public AsyncEventQueueFactory setIsMetaQueue(boolean isMetaQueue) {
+ this.attrs.isMetaQueue = isMetaQueue;
+ return this;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d88ef883/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/AsyncEventQueueImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/AsyncEventQueueImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/AsyncEventQueueImpl.java
index 71e8d2a..9a7698a 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/AsyncEventQueueImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/AsyncEventQueueImpl.java
@@ -180,6 +180,9 @@ public class AsyncEventQueueImpl implements AsyncEventQueue {
return sender.isParallel();
}
+ public boolean isMetaQueue() {
+ return ((AbstractGatewaySender)sender).getIsMetaQueue();
+ }
public void destroy() {
((AbstractGatewaySender)this.sender).destroy();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d88ef883/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
index 6fe639b..cf93dac 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
@@ -387,6 +387,12 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
* {@link #allGatewaySendersLock}
*/
private volatile Set<GatewaySender> allGatewaySenders = Collections.emptySet();
+
+ /**
+ * The list of all async event queues added to the cache.
+ * CopyOnWriteArrayList is used to allow concurrent add, remove and retrieval operations.
+ */
+ private volatile Set<AsyncEventQueue> allVisibleAsyncEventQueues = new CopyOnWriteArraySet<AsyncEventQueue>();
/**
* The list of all async event queues added to the cache.
@@ -3881,8 +3887,11 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
}
}
- public void addAsyncEventQueue(AsyncEventQueue asyncQueue) {
+ public void addAsyncEventQueue(AsyncEventQueueImpl asyncQueue) {
this.allAsyncEventQueues.add(asyncQueue);
+ if(!asyncQueue.isMetaQueue()) {
+ this.allVisibleAsyncEventQueues.add(asyncQueue);
+ }
system
.handleResourceEvent(ResourceEvent.ASYNCEVENTQUEUE_CREATE, asyncQueue);
}
@@ -3925,7 +3934,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
}
public Set<AsyncEventQueue> getAsyncEventQueues() {
- return this.allAsyncEventQueues;
+ return this.allVisibleAsyncEventQueues;
}
public AsyncEventQueue getAsyncEventQueue(String id) {
@@ -3949,6 +3958,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
// using gateway senders lock since async queue uses a gateway sender
synchronized (allGatewaySendersLock) {
this.allAsyncEventQueues.remove(asyncQueue);
+ this.allVisibleAsyncEventQueues.remove(asyncQueue);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d88ef883/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
index 3bd2992..e49708f 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
@@ -152,6 +152,8 @@ public abstract class AbstractGatewaySender implements GatewaySender,
protected boolean isHDFSQueue;
+ protected boolean isMetaQueue;
+
private int parallelismForReplicatedRegion;
protected AbstractGatewaySenderEventProcessor eventProcessor;
@@ -252,6 +254,7 @@ public abstract class AbstractGatewaySender implements GatewaySender,
this.myDSId = InternalDistributedSystem.getAnyInstance().getDistributionManager().getDistributedSystemId();
this.serialNumber = DistributionAdvisor.createSerialNumber();
this.isHDFSQueue = attrs.isHDFSQueue();
+ this.isMetaQueue = attrs.isMetaQueue();
if (!(this.cache instanceof CacheCreation)) {
this.stopper = new Stopper(cache.getCancelCriterion());
this.senderAdvisor = GatewaySenderAdvisor.createGatewaySenderAdvisor(this);
@@ -476,6 +479,10 @@ public abstract class AbstractGatewaySender implements GatewaySender,
return this.isHDFSQueue;
}
+ public boolean getIsMetaQueue() {
+ return this.isMetaQueue;
+ }
+
public InternalDistributedSystem getSystem() {
return (InternalDistributedSystem)this.cache.getDistributedSystem();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d88ef883/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderAttributes.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderAttributes.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderAttributes.java
index 1d0b4f1..2df11aa 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderAttributes.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderAttributes.java
@@ -22,6 +22,7 @@ public class GatewaySenderAttributes {
public static final boolean DEFAULT_IS_BUCKETSORTED = true;
public static final boolean DEFAULT_IS_HDFSQUEUE = false;
+ public static final boolean DEFAULT_IS_META_QUEUE = false;
public int socketBufferSize = GatewaySender.DEFAULT_SOCKET_BUFFER_SIZE;
@@ -73,6 +74,7 @@ public class GatewaySenderAttributes {
public boolean isBucketSorted = GatewaySenderAttributes.DEFAULT_IS_BUCKETSORTED;
public boolean isHDFSQueue = GatewaySenderAttributes.DEFAULT_IS_HDFSQUEUE;
+ public boolean isMetaQueue = GatewaySenderAttributes.DEFAULT_IS_META_QUEUE;
public int getSocketBufferSize() {
return this.socketBufferSize;
@@ -183,4 +185,7 @@ public class GatewaySenderAttributes {
public boolean isHDFSQueue() {
return this.isHDFSQueue;
}
+ public boolean isMetaQueue() {
+ return this.isMetaQueue;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d88ef883/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
index 60085e4..f9e2c1d 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
@@ -14,9 +14,11 @@ import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.PartitionAttributesFactory;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory;
+import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueFactoryImpl;
import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl;
import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
import com.gemstone.gemfire.cache.lucene.LuceneIndex;
@@ -26,7 +28,9 @@ import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer;
import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.LuceneSerializer;
import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
+import com.gemstone.gemfire.internal.cache.InternalRegionArguments;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import com.gemstone.gemfire.internal.cache.RegionFactoryImpl;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
/* wrapper of IndexWriter */
@@ -102,13 +106,14 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
repositoryManager = new PartitionedRepositoryManager(dataRegion, (PartitionedRegion)fileRegion, (PartitionedRegion)chunkRegion, mapper, analyzer);
// create AEQ, AEQ listner and specify the listener to repositoryManager
- AsyncEventQueueFactory factory = cache.createAsyncEventQueueFactory();
+ AsyncEventQueueFactoryImpl factory = (AsyncEventQueueFactoryImpl) cache.createAsyncEventQueueFactory();
if (withPersistence) {
factory.setPersistent(true);
}
factory.setParallel(true); // parallel AEQ for PR
factory.setMaximumQueueMemory(1000);
factory.setDispatcherThreads(1);
+ factory.setIsMetaQueue(true);
LuceneEventListener listener = new LuceneEventListener(repositoryManager);
String aeqId = LuceneServiceImpl.getUniqueIndexName(getName(), regionPath);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d88ef883/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
index 5ec2725..eff2813 100644
--- a/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
+++ b/gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java
@@ -6,6 +6,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -123,7 +124,7 @@ public class LuceneServiceImplJUnitTest {
@Test
public void testCreateIndexForPR() throws IOException, ParseException {
getService();
- createPR("PR1", false);
+ LocalRegion userRegion = createPR("PR1", false);
LuceneIndexImpl index1 = (LuceneIndexImpl)service.createIndex("index1", "PR1", "field1", "field2", "field3");
assertTrue(index1 instanceof LuceneIndexForPartitionedRegion);
LuceneIndexForPartitionedRegion index1PR = (LuceneIndexForPartitionedRegion)index1;
@@ -146,6 +147,9 @@ public class LuceneServiceImplJUnitTest {
String aeqId = LuceneServiceImpl.getUniqueIndexName(index1.getName(), index1.getRegionPath());
AsyncEventQueueImpl aeq = (AsyncEventQueueImpl)cache.getAsyncEventQueue(aeqId);
assertTrue(aeq != null);
+
+ //Make sure our queue doesn't show up in the list of async event queues
+ assertEquals(Collections.emptySet(), cache.getAsyncEventQueues());
}
@Test
[26/50] [abbrv] incubator-geode git commit: Merge remote-tracking
branch 'origin/develop' into feature/GEODE-11
Posted by as...@apache.org.
Merge remote-tracking branch 'origin/develop' into feature/GEODE-11
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3e07ec2f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3e07ec2f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3e07ec2f
Branch: refs/heads/develop
Commit: 3e07ec2f1114bfdb1a42b1eafd6347c913731a3a
Parents: 71cd7c6 17fdf57
Author: Dan Smith <up...@apache.org>
Authored: Thu Oct 8 17:32:27 2015 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Thu Oct 8 17:32:27 2015 -0700
----------------------------------------------------------------------
README.md | 2 +-
build.gradle | 13 +-
.../src/test/java/AgentUtilJUnitTest.java | 109 -
.../management/internal/AgentUtilJUnitTest.java | 106 +
.../com/gemstone/gemfire/DataSerializer.java | 11 +-
.../gemfire/admin/GemFireMemberStatus.java | 13 +-
.../gemfire/admin/SystemMemberBridgeServer.java | 5 +-
.../gemfire/admin/SystemMemberCache.java | 27 -
.../DistributedSystemHealthMonitor.java | 2 +-
.../admin/internal/SystemMemberCacheImpl.java | 17 +-
.../jmx/internal/SystemMemberCacheJmxImpl.java | 13 -
.../gemfire/cache/AttributesFactory.java | 31 -
.../java/com/gemstone/gemfire/cache/Cache.java | 27 -
.../gemfire/cache/DiskStoreFactory.java | 15 +-
.../gemfire/cache/DynamicRegionFactory.java | 121 +-
.../gemstone/gemfire/cache/EvictionAction.java | 3 +-
.../gemfire/cache/EvictionAlgorithm.java | 3 +-
.../gemfire/cache/client/PoolFactory.java | 10 +-
.../cache/client/internal/AbstractOp.java | 2 +-
.../cache/client/internal/BridgePoolImpl.java | 479 -----
.../internal/BridgeServerLoadMessage.java | 99 -
.../client/internal/CacheServerLoadMessage.java | 99 +
.../client/internal/ConnectionFactoryImpl.java | 7 +-
.../cache/client/internal/ConnectionImpl.java | 6 +-
.../cache/client/internal/DestroyOp.java | 5 -
.../client/internal/EndpointManagerImpl.java | 8 +-
.../internal/ExplicitConnectionSourceImpl.java | 85 +-
.../gemfire/cache/client/internal/GetOp.java | 5 -
.../gemfire/cache/client/internal/PoolImpl.java | 14 +-
.../gemfire/cache/client/internal/PutOp.java | 5 -
.../cache/client/internal/QueueManagerImpl.java | 14 +-
.../cache/client/internal/QueueStateImpl.java | 6 +-
.../internal/RegisterDataSerializersOp.java | 8 +-
.../internal/RegisterInstantiatorsOp.java | 8 +-
.../client/internal/ServerRegionProxy.java | 44 +-
.../internal/FunctionServiceManager.java | 3 +-
.../cache/query/internal/CompiledSelect.java | 34 +-
.../cache/query/internal/DefaultQuery.java | 9 +-
.../cache/query/internal/RuntimeIterator.java | 3 -
.../index/FunctionalIndexCreationHelper.java | 1 -
.../query/internal/index/PartitionedIndex.java | 16 +-
.../gemfire/cache/server/ServerLoadProbe.java | 10 +-
.../gemfire/cache/server/ServerMetrics.java | 10 +-
.../cache/server/internal/LoadMonitor.java | 12 +-
.../gemfire/cache/util/BridgeClient.java | 156 --
.../gemfire/cache/util/BridgeLoader.java | 607 ------
.../gemfire/cache/util/BridgeMembership.java | 55 -
.../cache/util/BridgeMembershipEvent.java | 23 -
.../cache/util/BridgeMembershipListener.java | 41 -
.../util/BridgeMembershipListenerAdapter.java | 43 -
.../gemfire/cache/util/BridgeServer.java | 442 ----
.../gemfire/cache/util/BridgeWriter.java | 795 -------
.../cache/util/BridgeWriterException.java | 48 -
.../util/EndpointDoesNotExistException.java | 34 -
.../gemfire/cache/util/EndpointException.java | 61 -
.../cache/util/EndpointExistsException.java | 28 -
.../cache/util/EndpointInUseException.java | 27 -
.../util/IncompatibleVersionException.java | 47 -
.../util/ServerRefusedConnectionException.java | 36 -
.../UniversalMembershipListenerAdapter.java | 352 ---
.../cache/util/UnknownVersionException.java | 39 -
.../gemfire/cache/util/VersionException.java | 45 -
.../gemstone/gemfire/cache/util/package.html | 3 -
.../gemfire/distributed/DistributedSystem.java | 38 +-
.../gemfire/distributed/ServerLauncher.java | 4 +-
.../FunctionExecutionPooledExecutor.java | 7 +-
.../internal/InternalDistributedSystem.java | 12 +-
.../internal/PooledExecutorWithDMStats.java | 7 +-
.../distributed/internal/ServerLocator.java | 10 +-
.../jgroup/JGroupMembershipManager.java | 6 +-
.../gemstone/gemfire/internal/DSFIDFactory.java | 12 +-
.../internal/DataSerializableFixedID.java | 6 +-
.../internal/InternalDataSerializer.java | 33 +-
.../gemstone/gemfire/internal/NanoTimer.java | 37 +-
.../gemfire/internal/SharedLibrary.java | 20 +-
.../gemstone/gemfire/internal/SocketCloser.java | 241 +++
.../gemfire/internal/SocketCreator.java | 98 -
.../internal/admin/ClientStatsManager.java | 7 -
.../gemfire/internal/admin/GemFireVM.java | 2 +-
.../admin/remote/BridgeServerResponse.java | 18 +-
.../admin/remote/DurableClientInfoResponse.java | 4 +-
.../admin/remote/RemoteBridgeServer.java | 10 +-
.../internal/admin/remote/RemoteCacheInfo.java | 6 +-
.../internal/admin/remote/RemoteGemFireVM.java | 2 +-
.../internal/cache/AbstractBridgeServer.java | 425 ----
.../internal/cache/AbstractCacheServer.java | 398 ++++
.../gemfire/internal/cache/AbstractRegion.java | 52 -
.../gemfire/internal/cache/BridgeObserver.java | 89 -
.../internal/cache/BridgeObserverAdapter.java | 107 -
.../internal/cache/BridgeObserverHolder.java | 53 -
.../internal/cache/BridgeRegionEventImpl.java | 108 -
.../internal/cache/BridgeServerAdvisor.java | 165 --
.../internal/cache/BridgeServerImpl.java | 816 -------
.../gemfire/internal/cache/BucketAdvisor.java | 2 +-
.../gemfire/internal/cache/CacheConfig.java | 8 +-
.../internal/cache/CacheServerAdvisor.java | 164 ++
.../gemfire/internal/cache/CacheServerImpl.java | 812 +++++++
.../internal/cache/ClientRegionEventImpl.java | 108 +
.../internal/cache/ClientServerObserver.java | 90 +
.../cache/ClientServerObserverAdapter.java | 107 +
.../cache/ClientServerObserverHolder.java | 53 +
.../internal/cache/DestroyRegionOperation.java | 6 +-
.../cache/DistributedCacheOperation.java | 10 +-
.../cache/DistributedClearOperation.java | 6 +-
.../internal/cache/DistributedRegion.java | 6 -
.../gemfire/internal/cache/ExpiryTask.java | 38 +-
.../cache/FindDurableQueueProcessor.java | 4 +-
.../internal/cache/GemFireCacheImpl.java | 92 +-
.../gemfire/internal/cache/GridAdvisor.java | 6 +-
.../gemfire/internal/cache/LocalRegion.java | 48 +-
.../cache/MinimumSystemRequirements.java | 4 +-
.../internal/cache/PartitionedRegion.java | 8 +-
.../gemfire/internal/cache/PoolFactoryImpl.java | 171 +-
.../gemfire/internal/cache/PoolManagerImpl.java | 19 -
.../gemfire/internal/cache/RegionEventImpl.java | 2 +-
.../internal/cache/RemotePutMessage.java | 56 +-
.../gemfire/internal/cache/TXCommitMessage.java | 45 +-
.../gemfire/internal/cache/TXEntryState.java | 19 +-
.../cache/control/HeapMemoryMonitor.java | 1 +
.../internal/cache/control/MemoryEvent.java | 9 +-
.../cache/control/OffHeapMemoryMonitor.java | 88 +-
.../internal/cache/doc-files/properties.html | 4 +-
.../cache/execute/InternalFunctionService.java | 4 +-
.../internal/cache/ha/HARegionQueue.java | 6 +-
.../internal/cache/partitioned/GetMessage.java | 6 +
.../cache/partitioned/PartitionMessage.java | 2 +-
.../PartitionedRegionObserverHolder.java | 2 +-
.../internal/cache/partitioned/PutMessage.java | 21 +-
.../rebalance/ParallelBucketOperator.java | 6 +
.../internal/cache/tier/ConnectionProxy.java | 160 +-
.../cache/tier/InternalBridgeMembership.java | 715 ------
.../cache/tier/InternalClientMembership.java | 617 ++++++
.../cache/tier/sockets/AcceptorImpl.java | 20 +-
.../cache/tier/sockets/CacheClientNotifier.java | 26 +-
.../cache/tier/sockets/CacheClientProxy.java | 38 +-
.../cache/tier/sockets/CacheClientUpdater.java | 12 +-
.../tier/sockets/ClientBlacklistProcessor.java | 4 +-
.../RemoveClientFromBlacklistMessage.java | 4 +-
.../cache/tier/sockets/ServerConnection.java | 8 +-
.../doc-files/communication-architecture.fig | 4 +-
.../wan/serial/SerialGatewaySenderQueue.java | 2 +
.../cache/xmlcache/BridgeServerCreation.java | 249 ---
.../internal/cache/xmlcache/CacheCreation.java | 47 +-
.../cache/xmlcache/CacheServerCreation.java | 238 ++
.../cache/xmlcache/CacheXmlGenerator.java | 41 +-
.../internal/cache/xmlcache/CacheXmlParser.java | 18 +-
.../cache/xmlcache/ClientCacheCreation.java | 5 -
.../xmlcache/RegionAttributesCreation.java | 9 -
.../gemfire/internal/i18n/LocalizedStrings.java | 20 +-
.../internal/i18n/ParentLocalizedStrings.java | 81 +-
.../gemfire/internal/lang/SystemUtils.java | 35 +-
.../gemfire/internal/logging/LogService.java | 11 +-
.../internal/logging/log4j/Configurator.java | 8 +
.../offheap/OffHeapCachedDeserializable.java | 20 +
.../offheap/SimpleMemoryAllocatorImpl.java | 44 +-
.../gemfire/internal/offheap/StoredObject.java | 26 +-
.../gemstone/gemfire/internal/redis/Coder.java | 194 +-
.../internal/redis/ExecutionHandlerContext.java | 3 +-
.../gemfire/internal/redis/RegionProvider.java | 53 +-
.../size/ReflectionSingleObjectSizer.java | 4 +-
.../gemfire/internal/tcp/Connection.java | 130 +-
.../gemfire/internal/tcp/ConnectionTable.java | 95 +-
.../gemfire/internal/tcp/MsgOutputStream.java | 4 +-
.../gfsh/aggregator/AggregateFunction.java | 67 -
.../tools/gfsh/aggregator/AggregateResults.java | 126 --
.../aggregator/AggregatorPartitionFunction.java | 54 -
.../tools/gfsh/app/CommandExecutable.java | 8 -
.../gemfire/internal/tools/gfsh/app/Gfsh.java | 2027 ------------------
.../internal/tools/gfsh/app/GfshVersion.java | 455 ----
.../internal/tools/gfsh/app/Nextable.java | 8 -
.../tools/gfsh/app/ServerExecutable.java | 11 -
.../app/aggregator/AggregateFunctionTask.java | 62 -
.../tools/gfsh/app/aggregator/Aggregator.java | 549 -----
.../app/aggregator/AggregatorException.java | 50 -
.../gfsh/app/aggregator/AggregatorPeer.java | 254 ---
.../functions/util/LocalRegionInfoFunction.java | 235 --
.../functions/util/RegionCreateFunction.java | 81 -
.../functions/util/RegionDestroyFunction.java | 86 -
.../tools/gfsh/app/cache/CacheBase.java | 178 --
.../gfsh/app/cache/InstantiatorClassLoader.java | 101 -
.../tools/gfsh/app/cache/data/GenericMap.java | 196 --
.../gfsh/app/cache/data/GenericMessage.java | 807 -------
.../app/cache/data/InvalidTypeException.java | 28 -
.../tools/gfsh/app/cache/data/ListMap.java | 197 --
.../gfsh/app/cache/data/ListMapMessage.java | 615 ------
.../tools/gfsh/app/cache/data/ListMessage.java | 594 -----
.../tools/gfsh/app/cache/data/Listable.java | 45 -
.../tools/gfsh/app/cache/data/MapMessage.java | 629 ------
.../tools/gfsh/app/cache/data/Mappable.java | 50 -
.../tools/gfsh/app/cache/index/EntryMap.java | 80 -
.../tools/gfsh/app/cache/index/IndexInfo.java | 52 -
.../tools/gfsh/app/cache/index/Indexer.java | 13 -
.../gfsh/app/cache/index/IndexerManager.java | 32 -
.../gfsh/app/cache/index/LookupService.java | 352 ---
.../app/cache/index/LookupServiceException.java | 64 -
.../gfsh/app/cache/index/task/ForceGCTask.java | 32 -
.../app/cache/index/task/IndexInfoTask.java | 131 --
.../app/cache/index/task/QuerySizeTask.java | 134 --
.../gfsh/app/cache/index/task/QueryTask.java | 323 ---
.../tools/gfsh/app/command/CommandClient.java | 417 ----
.../gfsh/app/command/CommandException.java | 31 -
.../app/command/CommandResultsListener.java | 15 -
.../tools/gfsh/app/command/task/EchoTask.java | 63 -
.../task/PartitionedRegionAttributeTask.java | 205 --
.../gfsh/app/command/task/QueryResults.java | 123 --
.../tools/gfsh/app/command/task/QueryTask.java | 522 -----
.../task/RefreshAggregatorRegionTask.java | 53 -
.../gfsh/app/command/task/RegionClearTask.java | 85 -
.../gfsh/app/command/task/RegionCreateTask.java | 162 --
.../app/command/task/RegionDestroyTask.java | 97 -
.../gfsh/app/command/task/RegionPathTask.java | 156 --
.../gfsh/app/command/task/RegionSizeTask.java | 70 -
.../gfsh/app/command/task/data/MemberInfo.java | 79 -
.../task/data/PartitionAttributeInfo.java | 124 --
.../command/task/data/RegionAttributeInfo.java | 286 ---
.../internal/tools/gfsh/app/commands/bcp.java | 527 -----
.../internal/tools/gfsh/app/commands/cd.java | 79 -
.../tools/gfsh/app/commands/classloader.java | 323 ---
.../internal/tools/gfsh/app/commands/clear.java | 197 --
.../tools/gfsh/app/commands/connect.java | 124 --
.../internal/tools/gfsh/app/commands/db.java | 312 ---
.../internal/tools/gfsh/app/commands/debug.java | 48 -
.../tools/gfsh/app/commands/deploy.java | 271 ---
.../internal/tools/gfsh/app/commands/echo.java | 59 -
.../internal/tools/gfsh/app/commands/fetch.java | 48 -
.../internal/tools/gfsh/app/commands/gc.java | 93 -
.../internal/tools/gfsh/app/commands/get.java | 143 --
.../internal/tools/gfsh/app/commands/help.java | 40 -
.../internal/tools/gfsh/app/commands/index.java | 395 ----
.../internal/tools/gfsh/app/commands/key.java | 67 -
.../internal/tools/gfsh/app/commands/local.java | 101 -
.../internal/tools/gfsh/app/commands/ls.java | 584 -----
.../internal/tools/gfsh/app/commands/mkdir.java | 253 ---
.../internal/tools/gfsh/app/commands/next.java | 63 -
.../tools/gfsh/app/commands/optional/look.java | 166 --
.../tools/gfsh/app/commands/optional/perf.java | 150 --
.../internal/tools/gfsh/app/commands/pr.java | 209 --
.../tools/gfsh/app/commands/property.java | 85 -
.../internal/tools/gfsh/app/commands/put.java | 490 -----
.../internal/tools/gfsh/app/commands/pwd.java | 37 -
.../tools/gfsh/app/commands/rebalance.java | 186 --
.../tools/gfsh/app/commands/refresh.java | 67 -
.../internal/tools/gfsh/app/commands/rm.java | 175 --
.../internal/tools/gfsh/app/commands/rmdir.java | 249 ---
.../tools/gfsh/app/commands/select.java | 139 --
.../internal/tools/gfsh/app/commands/show.java | 240 ---
.../internal/tools/gfsh/app/commands/size.java | 281 ---
.../internal/tools/gfsh/app/commands/value.java | 48 -
.../internal/tools/gfsh/app/commands/which.java | 189 --
.../internal/tools/gfsh/app/commands/zone.java | 49 -
.../tools/gfsh/app/function/GfshData.java | 86 -
.../tools/gfsh/app/function/GfshFunction.java | 149 --
.../tools/gfsh/app/function/command/clear.java | 95 -
.../tools/gfsh/app/function/command/deploy.java | 111 -
.../tools/gfsh/app/function/command/gc.java | 49 -
.../tools/gfsh/app/function/command/index.java | 199 --
.../tools/gfsh/app/function/command/ls.java | 80 -
.../tools/gfsh/app/function/command/pr.java | 118 -
.../gfsh/app/function/command/rebalance.java | 129 --
.../tools/gfsh/app/function/command/rm.java | 43 -
.../tools/gfsh/app/function/command/which.java | 159 --
.../tools/gfsh/app/misc/util/ClassFinder.java | 209 --
.../gfsh/app/misc/util/DataSerializerEx.java | 98 -
.../app/misc/util/QueueDispatcherListener.java | 11 -
.../app/misc/util/QueueDispatcherThread.java | 87 -
.../gfsh/app/misc/util/ReflectionUtil.java | 303 ---
.../tools/gfsh/app/misc/util/StringUtil.java | 142 --
.../app/misc/util/SystemClassPathManager.java | 171 --
.../gfsh/app/pogo/InvalidKeyException.java | 34 -
.../internal/tools/gfsh/app/pogo/KeyType.java | 96 -
.../tools/gfsh/app/pogo/KeyTypeManager.java | 199 --
.../internal/tools/gfsh/app/pogo/MapLite.java | 1136 ----------
.../tools/gfsh/app/pogo/MapLiteSerializer.java | 338 ---
.../internal/tools/gfsh/app/util/DBUtil.java | 1094 ----------
.../tools/gfsh/app/util/DBUtilException.java | 48 -
.../tools/gfsh/app/util/GfshResultsBag.java | 600 ------
.../tools/gfsh/app/util/ObjectUtil.java | 164 --
.../tools/gfsh/app/util/OutputUtil.java | 255 ---
.../internal/tools/gfsh/app/util/PrintUtil.java | 1683 ---------------
.../tools/gfsh/app/util/SimplePrintUtil.java | 1366 ------------
.../tools/gfsh/command/AbstractCommandTask.java | 136 --
.../tools/gfsh/command/CommandResults.java | 119 -
.../tools/gfsh/command/CommandTask.java | 23 -
.../internal/tools/gfsh/util/RegionUtil.java | 829 -------
.../internal/beans/CacheServerBridge.java | 20 +-
.../beans/GatewayReceiverMBeanBridge.java | 4 +-
.../internal/beans/ManagementAdapter.java | 42 +-
.../management/internal/beans/ServerBridge.java | 6 +-
.../cli/functions/ContunuousQueryFunction.java | 4 +-
.../cli/functions/CreateHDFSStoreFunction.java | 4 +-
.../functions/GetMemberInformationFunction.java | 4 +-
.../internal/cli/i18n/CliStrings.java | 2 +-
.../web/controllers/WanCommandsController.java | 2 +-
.../management/membership/ClientMembership.java | 8 +-
.../gemfire/pdx/internal/TypeRegistry.java | 15 +-
.../gemfire/redis/GemFireRedisServer.java | 11 +-
.../util/concurrent/SynchronousQueueNoSpin.java | 1144 ----------
.../gemfire/cache/cache-9.0.xsd | 26 -
.../batterytest/greplogs/ExpectedStrings.java | 4 +-
.../com/gemstone/gemfire/TXExpiryJUnitTest.java | 505 +++--
.../cache/AttributesFactoryJUnitTest.java | 18 -
.../gemfire/cache/Bug52289JUnitTest.java | 81 +
.../gemstone/gemfire/cache/ClientHelper.java | 1 -
.../cache/ClientServerTimeSyncDUnitTest.java | 9 +-
.../cache/ConnectionPoolAndLoaderDUnitTest.java | 4 +-
.../internal/AutoConnectionSourceDUnitTest.java | 23 +-
.../AutoConnectionSourceWithUDPDUnitTest.java | 4 +-
.../internal/ConnectionPoolImplJUnitTest.java | 11 +-
.../internal/LocatorLoadBalancingDUnitTest.java | 10 +-
.../cache/client/internal/LocatorTestBase.java | 12 +-
.../internal/RegionWithHDFSBasicDUnitTest.java | 4 +-
.../hdfs/internal/RegionWithHDFSTestBase.java | 4 +-
.../management/MemoryThresholdsDUnitTest.java | 4 +-
.../MemoryThresholdsOffHeapDUnitTest.java | 4 +-
.../gemfire/cache/query/QueryJUnitTest.java | 91 +
.../query/dunit/CloseCacheAuthorization.java | 2 -
.../query/dunit/PdxStringQueryDUnitTest.java | 16 +-
.../query/dunit/QueryUsingPoolDUnitTest.java | 12 +-
.../cache/query/dunit/RemoteQueryDUnitTest.java | 90 +-
...esourceManagerWithQueryMonitorDUnitTest.java | 4 +-
.../cache/query/functional/GroupByTestImpl.java | 2 +-
.../query/functional/StructSetOrResultsSet.java | 260 +--
...rrentIndexInitOnOverflowRegionDUnitTest.java | 4 +-
.../query/internal/index/IndexUseJUnitTest.java | 52 +
.../cache30/BridgeMembershipDUnitTest.java | 1660 --------------
.../BridgeMembershipSelectorDUnitTest.java | 16 -
.../gemfire/cache30/BridgeTestCase.java | 376 ----
.../gemfire/cache30/BridgeWriterDUnitTest.java | 418 ----
.../cache30/BridgeWriterSelectorDUnitTest.java | 16 -
.../gemfire/cache30/Bug38741DUnitTest.java | 10 +-
.../gemstone/gemfire/cache30/CacheTestCase.java | 27 +-
.../gemfire/cache30/CacheXml30DUnitTest.java | 127 --
.../gemfire/cache30/CacheXml40DUnitTest.java | 8 +-
.../gemfire/cache30/CacheXml41DUnitTest.java | 28 +-
.../gemfire/cache30/CacheXml45DUnitTest.java | 4 +-
.../gemfire/cache30/CacheXml51DUnitTest.java | 8 +-
.../gemfire/cache30/CacheXml57DUnitTest.java | 1 -
.../cache30/ClientMembershipDUnitTest.java | 1642 ++++++++++++++
.../ClientMembershipSelectorDUnitTest.java | 16 +
.../ClientRegisterInterestDUnitTest.java | 418 ++++
...ClientRegisterInterestSelectorDUnitTest.java | 16 +
.../gemfire/cache30/ClientServerTestCase.java | 376 ++++
.../gemfire/cache30/MultiVMRegionTestCase.java | 12 +-
.../gemfire/cache30/RegionTestCase.java | 14 +-
.../AbstractServerLauncherJUnitTestCase.java | 4 +-
.../LocatorLauncherRemoteFileJUnitTest.java | 8 +-
.../LocatorLauncherRemoteJUnitTest.java | 57 +-
.../ServerLauncherLocalJUnitTest.java | 51 +-
.../ServerLauncherRemoteFileJUnitTest.java | 2 -
.../ServerLauncherRemoteJUnitTest.java | 8 +-
.../ServerLauncherWithSpringJUnitTest.java | 2 +
.../internal/ProductUseLogDUnitTest.java | 2 +-
.../disttx/DistributedTransactionDUnitTest.java | 4 +-
.../gemstone/gemfire/internal/FDDUnitTest.java | 12 +-
.../gemfire/internal/NanoTimer2JUnitTest.java | 79 -
.../gemfire/internal/NanoTimerJUnitTest.java | 121 +-
.../gemfire/internal/SocketCloserJUnitTest.java | 180 ++
.../internal/SocketCloserWithWaitJUnitTest.java | 22 +
.../internal/cache/Bug39079DUnitTest.java | 6 +-
.../internal/cache/Bug41957DUnitTest.java | 6 +-
...ssagesRegionCreationAndDestroyJUnitTest.java | 10 +-
.../cache/ClientServerGetAllDUnitTest.java | 41 +-
.../cache/ClientServerTransactionDUnitTest.java | 157 +-
.../cache/ConcurrentMapOpsDUnitTest.java | 75 +-
.../cache/DeltaPropagationDUnitTest.java | 8 +-
.../cache/DeltaPropagationStatsDUnitTest.java | 2 +-
.../internal/cache/DiskRegionJUnitTest.java | 39 +-
.../internal/cache/EventTrackerDUnitTest.java | 8 +-
.../internal/cache/GridAdvisorDUnitTest.java | 106 +-
.../internal/cache/HABug36773DUnitTest.java | 8 +-
.../HAOverflowMemObjectSizerDUnitTest.java | 12 +-
.../cache/OldValueImporterTestBase.java | 165 ++
.../cache/RemotePutReplyMessageJUnitTest.java | 37 +
.../cache/RemoteTransactionDUnitTest.java | 68 +
.../control/RebalanceOperationDUnitTest.java | 6 +-
.../cache/execute/Bug51193DUnitTest.java | 4 +-
.../internal/cache/functions/TestFunction.java | 10 +-
.../cache/ha/Bug36853EventsExpiryDUnitTest.java | 8 +-
.../internal/cache/ha/Bug48571DUnitTest.java | 2 +-
.../cache/ha/EventIdOptimizationDUnitTest.java | 12 +-
.../internal/cache/ha/FailoverDUnitTest.java | 22 +-
.../internal/cache/ha/HABugInPutDUnitTest.java | 8 +-
.../internal/cache/ha/HAClearDUnitTest.java | 10 +-
.../cache/ha/HAConflationDUnitTest.java | 8 +-
.../internal/cache/ha/HADuplicateDUnitTest.java | 10 +-
.../cache/ha/HAEventIdPropagationDUnitTest.java | 10 +-
.../internal/cache/ha/HAGIIDUnitTest.java | 14 +-
.../cache/ha/HARQueueNewImplDUnitTest.java | 66 +-
.../cache/ha/HASlowReceiverDUnitTest.java | 10 +-
.../ha/OperationsPropagationDUnitTest.java | 8 +-
.../internal/cache/ha/PutAllDUnitTest.java | 12 +-
.../cache/ha/StatsBugDUnitDisabledTest.java | 14 +-
.../cache/partitioned/Bug43684DUnitTest.java | 4 +-
...tentColocatedPartitionedRegionDUnitTest.java | 2 +-
.../PutPutReplyMessageJUnitTest.java | 38 +
.../fixed/FixedPartitioningTestBase.java | 6 +-
.../tier/sockets/AcceptorImplJUnitTest.java | 62 +-
...rdCompatibilityCommandDUnitDisabledTest.java | 235 --
...CompatibilityHandshakeDUnitDisabledTest.java | 218 --
...mpatibilityHigherVersionClientDUnitTest.java | 4 +-
...rdCompatibilityMessageDUnitDisabledTest.java | 299 ---
.../BridgeServerMaxConnectionsJUnitTest.java | 221 --
...geServerSelectorMaxConnectionsJUnitTest.java | 19 -
.../tier/sockets/BridgeWriterMiscDUnitTest.java | 1384 ------------
.../BridgeWriterMiscSelectorDUnitTest.java | 27 -
.../cache/tier/sockets/Bug36269DUnitTest.java | 4 +-
.../cache/tier/sockets/Bug36457DUnitTest.java | 18 +-
.../cache/tier/sockets/Bug36805DUnitTest.java | 6 +-
.../cache/tier/sockets/Bug36995DUnitTest.java | 11 +-
.../cache/tier/sockets/Bug37210DUnitTest.java | 10 +-
.../CacheServerMaxConnectionsJUnitTest.java | 220 ++
...heServerSelectorMaxConnectionsJUnitTest.java | 19 +
.../cache/tier/sockets/CacheServerTestUtil.java | 51 +-
.../CacheServerTransactionsDUnitTest.java | 4 +-
.../tier/sockets/ClearPropagationDUnitTest.java | 4 +-
.../tier/sockets/ClientConflationDUnitTest.java | 20 +-
.../sockets/ClientHealthMonitorJUnitTest.java | 6 +-
.../sockets/ClientInterestNotifyDUnitTest.java | 14 +-
.../tier/sockets/ClientServerMiscDUnitTest.java | 1381 ++++++++++++
.../ClientServerMiscSelectorDUnitTest.java | 27 +
.../cache/tier/sockets/ConflationDUnitTest.java | 24 +-
.../tier/sockets/ConnectionProxyJUnitTest.java | 257 +--
.../DataSerializerPropogationDUnitTest.java | 36 +-
.../DestroyEntryPropagationDUnitTest.java | 12 +-
.../DurableClientReconnectDUnitTest.java | 10 +-
.../sockets/DurableClientStatsDUnitTest.java | 10 +-
.../sockets/DurableRegistrationDUnitTest.java | 8 +-
.../sockets/DurableResponseMatrixDUnitTest.java | 10 +-
.../sockets/EventIDVerificationDUnitTest.java | 10 +-
.../ForceInvalidateEvictionDUnitTest.java | 10 +-
.../cache/tier/sockets/HAInterestBaseTest.java | 64 +-
.../tier/sockets/HAInterestPart2DUnitTest.java | 12 +-
.../sockets/HAStartupAndFailoverDUnitTest.java | 81 +-
.../tier/sockets/InterestListDUnitTest.java | 4 +-
.../sockets/InterestListEndpointDUnitTest.java | 18 +-
.../sockets/InterestListFailoverDUnitTest.java | 6 +-
.../sockets/InterestListRecoveryDUnitTest.java | 10 +-
.../sockets/InterestResultPolicyDUnitTest.java | 4 +-
.../tier/sockets/RedundancyLevelJUnitTest.java | 14 +-
.../sockets/RedundancyLevelPart1DUnitTest.java | 4 +-
.../sockets/RedundancyLevelPart3DUnitTest.java | 6 +-
.../tier/sockets/RedundancyLevelTestBase.java | 51 +-
.../tier/sockets/RegionCloseDUnitTest.java | 14 +-
...erInterestBeforeRegionCreationDUnitTest.java | 6 +-
.../sockets/RegisterInterestKeysDUnitTest.java | 4 +-
.../sockets/ReliableMessagingDUnitTest.java | 24 +-
.../internal/cache/tier/sockets/TestPut.java | 53 -
.../sockets/UpdatePropagationDUnitTest.java | 10 +-
...UpdatesFromNonInterestEndPointDUnitTest.java | 4 +-
.../compression/SnappyCompressorJUnitTest.java | 2 +-
.../logging/LogServiceIntegrationJUnitTest.java | 209 ++
.../LogServiceIntegrationTestSupport.java | 24 +
.../internal/logging/LogServiceJUnitTest.java | 190 +-
.../LogServiceUserDirIntegrationJUnitTest.java | 70 +
.../logging/LoggingIntegrationTestSuite.java | 3 +-
.../internal/logging/LoggingUnitTestSuite.java | 1 +
.../offheap/OffHeapValidationJUnitTest.java | 45 +-
.../OffHeapWriteObjectAsByteArrayJUnitTest.java | 101 +
.../internal/size/ObjectSizerJUnitTest.java | 14 +-
...ersalMembershipListenerAdapterDUnitTest.java | 32 +-
.../WanCommandsControllerJUnitTest.java | 124 ++
.../gemfire/pdx/ByteSourceJUnitTest.java | 4 +-
.../pdx/PdxFormatterPutGetJUnitTest.java | 4 +-
.../gemfire/redis/RedisDistDUnitTest.java | 15 +-
...hTimeoutOfWaitForOutputToMatchJUnitTest.java | 3 +-
.../test/java/dunit/DistributedTestCase.java | 62 +-
.../java/dunit/standalone/DUnitLauncher.java | 8 +-
.../gemfire/codeAnalysis/excludedClasses.txt | 2 +-
.../sanctionedDataSerializables.txt | 14 +-
.../codeAnalysis/sanctionedSerializables.txt | 9 -
.../tier/sockets/RedundancyLevelJUnitTest.xml | 21 +-
.../cache/util/AutoBalancerJUnitTest.java | 55 +-
472 files changed, 11445 insertions(+), 44140 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e07ec2f/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e07ec2f/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e07ec2f/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
----------------------------------------------------------------------
diff --cc gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
index 2e2ec2b,0347d67..31de4e9
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
@@@ -52,9 -52,9 +52,8 @@@ import com.gemstone.gemfire.cache.async
import com.gemstone.gemfire.cache.client.Pool;
import com.gemstone.gemfire.cache.client.PoolFactory;
import com.gemstone.gemfire.cache.client.PoolManager;
- import com.gemstone.gemfire.cache.client.internal.BridgePoolImpl;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
import com.gemstone.gemfire.cache.execute.FunctionService;
-import com.gemstone.gemfire.cache.lucene.LuceneService;
import com.gemstone.gemfire.cache.query.CqAttributes;
import com.gemstone.gemfire.cache.query.CqException;
import com.gemstone.gemfire.cache.query.CqExistsException;