This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-4685
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-4685 by this
push:
new c89367c GEODE-4685: Renamed the readPdxSerialized override to
something more user-friendly
c89367c is described below
commit c89367c866adb30fbd99a464cae8971ca22c02e6
Author: Udo <[email protected]>
AuthorDate: Tue Feb 27 10:40:07 2018 -0800
GEODE-4685: Renamed the readPdxSerialized override to something more
user-friendly
---
.../apache/geode/connectors/jdbc/JdbcAsyncWriter.java | 5 ++---
.../org/apache/geode/connectors/jdbc/JdbcWriter.java | 6 ++----
.../apache/geode/cache/query/internal/DefaultQuery.java | 5 ++---
.../geode/cache/query/internal/index/IndexManager.java | 17 ++++++++---------
.../internal/streaming/StreamingOperation.java | 4 ++--
.../apache/geode/internal/cache/GemFireCacheImpl.java | 5 ++---
.../geode/internal/cache/partitioned/QueryMessage.java | 4 ++--
.../org/apache/geode/pdx/internal/TypeRegistry.java | 4 ++--
.../geode/cache/query/PdxStringQueryJUnitTest.java | 7 +++----
.../cache/query/dunit/PdxStringQueryDUnitTest.java | 7 +++----
.../apache/geode/internal/PdxDeleteFieldJUnitTest.java | 9 ++++-----
.../org/apache/geode/pdx/PdxClientServerDUnitTest.java | 7 +++----
.../org/apache/geode/pdx/PdxSerializableJUnitTest.java | 13 ++++++-------
.../geode/cache/query/internal/cq/CqServiceImpl.java | 4 ++--
.../cache/lucene/internal/IndexRepositoryFactory.java | 7 +++----
.../cache/lucene/internal/LuceneEventListener.java | 5 ++---
16 files changed, 48 insertions(+), 61 deletions(-)
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
index 8d68c95..03a3ae6 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
@@ -23,7 +23,6 @@ import org.apache.geode.CopyHelper;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.asyncqueue.AsyncEvent;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
-import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.connectors.jdbc.internal.AbstractJdbcCallback;
import org.apache.geode.connectors.jdbc.internal.SqlHandler;
import org.apache.geode.internal.cache.InternalCache;
@@ -65,7 +64,7 @@ public class JdbcAsyncWriter extends AbstractJdbcCallback
implements AsyncEventL
try {
for (AsyncEvent event : events) {
internalCache = (InternalCache) event.getRegion().getRegionService();
- internalCache.getPdxRegistry().overridePdxReadSerialized(true);
+ internalCache.getPdxRegistry().setPdxReadSerializedOverride(true);
try {
getSqlHandler().write(event.getRegion(), event.getOperation(),
event.getKey(),
getPdxInstance(event));
@@ -77,7 +76,7 @@ public class JdbcAsyncWriter extends AbstractJdbcCallback
implements AsyncEventL
}
} finally {
if (internalCache != null) {
- internalCache.getPdxRegistry().overridePdxReadSerialized(false);
+ internalCache.getPdxRegistry().setPdxReadSerializedOverride(false);
}
}
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcWriter.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcWriter.java
index 708a427..442dff5 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcWriter.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcWriter.java
@@ -20,9 +20,7 @@ import org.apache.geode.cache.CacheWriter;
import org.apache.geode.cache.CacheWriterException;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.RegionEvent;
-import org.apache.geode.cache.RegionService;
import org.apache.geode.cache.SerializedCacheValue;
-import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.connectors.jdbc.internal.AbstractJdbcCallback;
import org.apache.geode.connectors.jdbc.internal.SqlHandler;
import org.apache.geode.internal.cache.InternalCache;
@@ -80,7 +78,7 @@ public class JdbcWriter<K, V> extends AbstractJdbcCallback
implements CacheWrite
private PdxInstance getPdxNewValue(EntryEvent<K, V> event) {
InternalCache internalCache = (InternalCache)
event.getRegion().getRegionService();
- internalCache.getPdxRegistry().overridePdxReadSerialized(true);
+ internalCache.getPdxRegistry().setPdxReadSerializedOverride(true);
try {
Object newValue = event.getNewValue();
if (!(newValue instanceof PdxInstance)) {
@@ -98,7 +96,7 @@ public class JdbcWriter<K, V> extends AbstractJdbcCallback
implements CacheWrite
}
return (PdxInstance) newValue;
} finally {
- internalCache.getPdxRegistry().overridePdxReadSerialized(false);
+ internalCache.getPdxRegistry().setPdxReadSerializedOverride(false);
}
}
}
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
index 2e18029..03c723a 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheRuntimeException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.internal.ProxyCache;
@@ -321,7 +320,7 @@ public class DefaultQuery implements Query {
Object result = null;
try {
// Setting the readSerialized flag for local queries
- this.cache.getPdxRegistry().overridePdxReadSerialized(true);
+ this.cache.getPdxRegistry().setPdxReadSerializedOverride(true);
ExecutionContext context = new QueryExecutionContext(params, this.cache,
this);
indexObserver = this.startTrace();
if (qe != null) {
@@ -398,7 +397,7 @@ public class DefaultQuery implements Query {
"Query was canceled. It may be due to low memory or the query was
running longer than the MAX_QUERY_EXECUTION_TIME.");
}
} finally {
- this.cache.getPdxRegistry().overridePdxReadSerialized(false);
+ this.cache.getPdxRegistry().setPdxReadSerializedOverride(false);
if (queryMonitor != null) {
queryMonitor.stopMonitoringQueryThread(Thread.currentThread(), this);
}
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
index b726b51..6880465 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
@@ -52,7 +52,6 @@ import org.apache.geode.cache.query.QueryException;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.internal.CompiledPath;
import org.apache.geode.cache.query.internal.CompiledValue;
-import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.ExecutionContext;
import org.apache.geode.cache.query.internal.MapIndexable;
import org.apache.geode.cache.query.internal.NullToken;
@@ -274,8 +273,8 @@ public class IndexManager {
LocalizedStrings.IndexCreationMsg_CANCELED_DUE_TO_LOW_MEMORY.toLocalizedString());
}
- boolean oldReadSerialized =
this.cache.getPdxRegistry().getPdxReadSerialized();
- this.cache.getPdxRegistry().overridePdxReadSerialized(true);
+ boolean oldReadSerialized =
this.cache.getPdxRegistry().getPdxReadSerializedOverride();
+ this.cache.getPdxRegistry().setPdxReadSerializedOverride(true);
TXStateProxy tx = null;
if (!((InternalCache) this.cache).isClient()) {
@@ -430,7 +429,7 @@ public class IndexManager {
return index;
} finally {
- this.cache.getPdxRegistry().overridePdxReadSerialized(oldReadSerialized);
+
this.cache.getPdxRegistry().setPdxReadSerializedOverride(oldReadSerialized);
((TXManagerImpl)
this.cache.getCacheTransactionManager()).unpauseTransaction(tx);
}
@@ -905,8 +904,8 @@ public class IndexManager {
}
boolean throwException = false;
HashMap<String, Exception> exceptionsMap = new HashMap<String,
Exception>();
- boolean oldReadSerialized =
this.cache.getPdxRegistry().getPdxReadSerialized();
- this.cache.getPdxRegistry().overridePdxReadSerialized(true);
+ boolean oldReadSerialized =
this.cache.getPdxRegistry().getPdxReadSerializedOverride();
+ this.cache.getPdxRegistry().setPdxReadSerializedOverride(true);
try {
Iterator entryIter = ((LocalRegion) region).getBestIterator(true);
while (entryIter.hasNext()) {
@@ -947,7 +946,7 @@ public class IndexManager {
throw new MultiIndexCreationException(exceptionsMap);
}
} finally {
- this.cache.getPdxRegistry().overridePdxReadSerialized(oldReadSerialized);
+
this.cache.getPdxRegistry().setPdxReadSerializedOverride(oldReadSerialized);
notifyAfterUpdate();
}
}
@@ -1002,7 +1001,7 @@ public class IndexManager {
*/
private void processAction(RegionEntry entry, int action, int opCode) throws
QueryException {
final long startPA = getCachePerfStats().startIndexUpdate();
- this.cache.getPdxRegistry().overridePdxReadSerialized(true);
+ this.cache.getPdxRegistry().setPdxReadSerializedOverride(true);
TXStateProxy tx = null;
if (!this.cache.isClient()) {
tx = ((TXManagerImpl)
this.cache.getCacheTransactionManager()).pauseTransaction();
@@ -1147,7 +1146,7 @@ public class IndexManager {
}
}
} finally {
- this.cache.getPdxRegistry().overridePdxReadSerialized(false);
+ this.cache.getPdxRegistry().setPdxReadSerializedOverride(false);
((TXManagerImpl)
this.cache.getCacheTransactionManager()).unpauseTransaction(tx);
getCachePerfStats().endIndexUpdate(startPA);
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
index 6405b27..c7ef43e 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
@@ -511,7 +511,7 @@ public abstract class StreamingOperation {
// Check if the PDX types needs to be kept in serialized form.
// This will make readObject() to return PdxInstance form.
if (this.pdxReadSerialized) {
- cache.getPdxRegistry().overridePdxReadSerialized(true);
+ cache.getPdxRegistry().setPdxReadSerializedOverride(true);
}
try {
ReplyProcessor21 messageProcessor =
ReplyProcessor21.getProcessor(processorId);
@@ -557,7 +557,7 @@ public abstract class StreamingOperation {
}
} finally {
if (this.pdxReadSerialized) {
- cache.getPdxRegistry().overridePdxReadSerialized(false);
+ cache.getPdxRegistry().setPdxReadSerializedOverride(false);
}
}
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index b2c035d..f0aa07e 100755
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -134,7 +134,6 @@ import org.apache.geode.cache.client.internal.PoolImpl;
import org.apache.geode.cache.control.ResourceManager;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.query.QueryService;
-import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.DefaultQueryService;
import org.apache.geode.cache.query.internal.InternalQueryService;
import org.apache.geode.cache.query.internal.QueryMonitor;
@@ -5057,7 +5056,7 @@ public class GemFireCacheImpl implements InternalCache,
InternalClientCache, Has
* requested getObject() on the PdxInstance.
*/
public boolean getPdxReadSerializedByAnyGemFireServices() {
- Boolean pdxReadSerializedOverriden =
this.getPdxRegistry().getPdxReadSerialized();
+ Boolean pdxReadSerializedOverriden =
this.getPdxRegistry().getPdxReadSerializedOverride();
return (getPdxReadSerialized() || pdxReadSerializedOverriden)
&& PdxInstanceImpl.getPdxReadSerialized();
}
@@ -5152,7 +5151,7 @@ public class GemFireCacheImpl implements InternalCache,
InternalClientCache, Has
@Override
public void setReadSerializedForCurrentThread(boolean value) {
PdxInstanceImpl.setPdxReadSerialized(value);
- this.getPdxRegistry().overridePdxReadSerialized(value);
+ this.getPdxRegistry().setPdxReadSerializedOverride(value);
}
// test hook
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java
index 537aa47..0410502 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java
@@ -169,7 +169,7 @@ public class QueryMessage extends
StreamingPartitionOperation.StreamingPartition
DefaultQuery query = new DefaultQuery(this.queryString, pr.getCache(),
false);
// Remote query, use the PDX types in serialized form.
- pr.getCache().getPdxRegistry().overridePdxReadSerialized(true);
+ pr.getCache().getPdxRegistry().setPdxReadSerializedOverride(true);
// In case of "select *" queries we can keep the results in serialized
form and send
query.setRemoteQuery(true);
QueryObserver indexObserver = query.startTrace();
@@ -249,7 +249,7 @@ public class QueryMessage extends
StreamingPartitionOperation.StreamingPartition
if (isQueryTraced) {
this.resultCollector.remove(queryTraceList);
}
- pr.getCache().getPdxRegistry().overridePdxReadSerialized(false);
+ pr.getCache().getPdxRegistry().setPdxReadSerializedOverride(false);
query.setRemoteQuery(false);
query.endTrace(indexObserver, traceStartTime, this.resultCollector);
}
diff --git
a/geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistry.java
b/geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistry.java
index c9e3417..85575c8 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistry.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/TypeRegistry.java
@@ -536,11 +536,11 @@ public class TypeRegistry {
return result;
}
- public Boolean getPdxReadSerialized() {
+ public Boolean getPdxReadSerializedOverride() {
return pdxReadSerializedOverride.get();
}
- public void overridePdxReadSerialized(boolean overridePdxReadSerialized) {
+ public void setPdxReadSerializedOverride(boolean overridePdxReadSerialized) {
pdxReadSerializedOverride.set(overridePdxReadSerialized);
}
}
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java
index e0df096..871dad4 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java
@@ -26,7 +26,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
-import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.QueryObserver;
import org.apache.geode.cache.query.internal.index.CompactRangeIndex;
import org.apache.geode.cache.query.internal.index.IndexStore.IndexStoreEntry;
@@ -226,7 +225,7 @@ public class PdxStringQueryJUnitTest {
for (Object key : map.keySet()) {
assertTrue(key instanceof PdxString);
}
- cache.getPdxRegistry().overridePdxReadSerialized(true);
+ cache.getPdxRegistry().setPdxReadSerializedOverride(true);
executeQueriesValidateResults(INDEX_TYPE_RANGE);
queryService.removeIndex(index);
region.clear();
@@ -350,7 +349,7 @@ public class PdxStringQueryJUnitTest {
}
private void executeQueriesValidateResults(int indexType) throws Exception {
- cache.getPdxRegistry().overridePdxReadSerialized(true);
+ cache.getPdxRegistry().setPdxReadSerializedOverride(true);
String[] query = {"select count(*) from /exampleRegion",
"select count(*) from /exampleRegion p, p.positions.values v",
@@ -611,7 +610,7 @@ public class PdxStringQueryJUnitTest {
while (iter.hasNext()) {
validateResult(secIdsList, iter.next());
}
- cache.getPdxRegistry().overridePdxReadSerialized(false);
+ cache.getPdxRegistry().setPdxReadSerializedOverride(false);
}
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
index 2a4af4f..9c67c22 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
@@ -47,7 +47,6 @@ import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.PortfolioPdx;
import org.apache.geode.cache.query.data.PositionPdx;
-import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.index.CompactRangeIndex;
import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.cache.query.internal.index.IndexStore.IndexStoreEntry;
@@ -2002,15 +2001,15 @@ public class PdxStringQueryDUnitTest extends
JUnit4CacheTestCase {
// to simulate remote query
vm0.invoke("Create server", () -> {
- Boolean previousPdxReadSerializedFlag =
cache.getPdxRegistry().getPdxReadSerialized();
- cache.getPdxRegistry().overridePdxReadSerialized(true);
+ Boolean previousPdxReadSerializedFlag =
cache.getPdxRegistry().getPdxReadSerializedOverride();
+ cache.getPdxRegistry().setPdxReadSerializedOverride(true);
try {
for (int i = 0; i < qs.length; i++) {
SelectResults sr = (SelectResults)
getCache().getQueryService().newQuery(qs[i]).execute();
assertEquals("Did not get expected result from query: " + qs[i] + "
", 2, sr.size());
}
} finally {
-
cache.getPdxRegistry().overridePdxReadSerialized(previousPdxReadSerializedFlag);
+
cache.getPdxRegistry().setPdxReadSerializedOverride(previousPdxReadSerializedFlag);
}
return null;
});
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
index 33f4c09..9eddb1d 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
@@ -132,14 +131,14 @@ public class PdxDeleteFieldJUnitTest {
assertEquals(2L, deserializedPdxValue.fieldToDelete);
}
PdxType pt;
- cache.getPdxRegistry().overridePdxReadSerialized(true);
+ cache.getPdxRegistry().setPdxReadSerializedOverride(true);
try {
PdxInstanceImpl pi = (PdxInstanceImpl)
BlobHelper.deserializeBlob(pdxValueBytes);
pt = pi.getPdxType();
assertEquals(1, pi.getField("value"));
assertEquals(2L, pi.getField("fieldToDelete"));
} finally {
- cache.getPdxRegistry().overridePdxReadSerialized(false);
+ cache.getPdxRegistry().setPdxReadSerializedOverride(false);
}
assertEquals(PdxValue.class.getName(), pt.getClassName());
PdxField field = pt.getPdxField("fieldToDelete");
@@ -154,7 +153,7 @@ public class PdxDeleteFieldJUnitTest {
// fieldToDelete should now be 0 (the default) instead of 2.
assertEquals(0L, deserializedPdxValue.fieldToDelete);
}
- cache.getPdxRegistry().overridePdxReadSerialized(true);
+ cache.getPdxRegistry().setPdxReadSerializedOverride(true);
try {
PdxInstance pi = (PdxInstance)
BlobHelper.deserializeBlob(pdxValueBytes);
assertEquals(1, pi.getField("value"));
@@ -165,7 +164,7 @@ public class PdxDeleteFieldJUnitTest {
assertEquals(1, deserializedPdxValue.value);
assertEquals(0L, deserializedPdxValue.fieldToDelete);
} finally {
- cache.getPdxRegistry().overridePdxReadSerialized(false);
+ cache.getPdxRegistry().setPdxReadSerializedOverride(false);
}
TypeRegistry tr = ((GemFireCacheImpl) cache).getPdxRegistry();
// Clear the local registry so we will regenerate a type for the same
class
diff --git
a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
index 5cb0b898..f7bb80f 100644
---
a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.cache.client.PoolFactory;
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.cache.client.internal.PoolImpl;
-import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.AvailablePortHelper;
@@ -350,8 +349,8 @@ public class PdxClientServerDUnitTest extends
JUnit4CacheTestCase {
final SerializableCallable checkValue = new SerializableCallable() {
public Object call() throws Exception {
Region r = getRootRegion("testSimplePdx");
- Boolean previousPdxReadSerializedFlag =
cache.getPdxRegistry().getPdxReadSerialized();
- cache.getPdxRegistry().overridePdxReadSerialized(true);
+ Boolean previousPdxReadSerializedFlag =
cache.getPdxRegistry().getPdxReadSerializedOverride();
+ cache.getPdxRegistry().setPdxReadSerializedOverride(true);
try {
Object v = r.get(1);
if (!(v instanceof PdxInstance)) {
@@ -365,7 +364,7 @@ public class PdxClientServerDUnitTest extends
JUnit4CacheTestCase {
}
assertEquals(v, v2);
} finally {
-
cache.getPdxRegistry().overridePdxReadSerialized(previousPdxReadSerializedFlag);
+
cache.getPdxRegistry().setPdxReadSerializedOverride(previousPdxReadSerializedFlag);
}
return null;
}
diff --git
a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
index f6869bb..0f3ef62 100644
---
a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
@@ -54,7 +54,6 @@ import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.internal.DSCODE;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.PdxSerializerObject;
@@ -1095,8 +1094,8 @@ public class PdxSerializableJUnitTest {
// this method adds coverage for bug 43236
@Test
public void testObjectPdxInstance() throws IOException,
ClassNotFoundException {
- Boolean previousPdxReadSerializedFlag =
cache.getPdxRegistry().getPdxReadSerialized();
- cache.getPdxRegistry().overridePdxReadSerialized(true);
+ Boolean previousPdxReadSerializedFlag =
cache.getPdxRegistry().getPdxReadSerializedOverride();
+ cache.getPdxRegistry().setPdxReadSerializedOverride(true);
PdxReaderImpl.TESTHOOK_TRACKREADS = true;
try {
PdxInstance pi = (PdxInstance) serializeAndDeserialize(new
ObjectHolder("hello"));
@@ -1111,15 +1110,15 @@ public class PdxSerializableJUnitTest {
assertEquals("hello", v3.getObject());
assertEquals("goodbye", wpi.getField("f1"));
} finally {
-
cache.getPdxRegistry().overridePdxReadSerialized(previousPdxReadSerializedFlag);
+
cache.getPdxRegistry().setPdxReadSerializedOverride(previousPdxReadSerializedFlag);
PdxReaderImpl.TESTHOOK_TRACKREADS = false;
}
}
@Test
public void testObjectArrayPdxInstance() throws IOException,
ClassNotFoundException {
- Boolean previousPdxReadSerializedFlag =
cache.getPdxRegistry().getPdxReadSerialized();
- cache.getPdxRegistry().overridePdxReadSerialized(true);
+ Boolean previousPdxReadSerializedFlag =
cache.getPdxRegistry().getPdxReadSerializedOverride();
+ cache.getPdxRegistry().setPdxReadSerializedOverride(true);
PdxReaderImpl.TESTHOOK_TRACKREADS = true;
try {
LongFieldHolder[] v = new LongFieldHolder[] {new LongFieldHolder(1), new
LongFieldHolder(2)};
@@ -1141,7 +1140,7 @@ public class PdxSerializableJUnitTest {
"expected " + Arrays.toString(v) + " but had " +
Arrays.toString(nv2));
}
} finally {
-
cache.getPdxRegistry().overridePdxReadSerialized(previousPdxReadSerializedFlag);
+
cache.getPdxRegistry().setPdxReadSerializedOverride(previousPdxReadSerializedFlag);
PdxReaderImpl.TESTHOOK_TRACKREADS = false;
}
}
diff --git
a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
index 48908c8..d40708b 100644
---
a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
+++
b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
@@ -1187,11 +1187,11 @@ public class CqServiceImpl implements CqService {
processRegionEvent(event, localProfile, profiles, frInfo);
} else {
// Use the PDX types in serialized form.
- this.cache.getPdxRegistry().overridePdxReadSerialized(true);
+ this.cache.getPdxRegistry().setPdxReadSerializedOverride(true);
try {
processEntryEvent(event, localProfile, profiles, frInfo);
} finally {
- this.cache.getPdxRegistry().overridePdxReadSerialized(false);
+ this.cache.getPdxRegistry().setPdxReadSerializedOverride(false);
}
}
}
diff --git
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexRepositoryFactory.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexRepositoryFactory.java
index fae8963..bfaee79 100644
---
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexRepositoryFactory.java
+++
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/IndexRepositoryFactory.java
@@ -32,7 +32,6 @@ import
org.apache.geode.cache.lucene.internal.directory.RegionDirectory;
import org.apache.geode.cache.lucene.internal.partition.BucketTargetingMap;
import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
import org.apache.geode.cache.lucene.internal.repository.IndexRepositoryImpl;
-import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.distributed.DistributedLockService;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.EntrySnapshot;
@@ -97,8 +96,8 @@ public class IndexRepositoryFactory {
final IndexRepository repo;
InternalCache cache = (InternalCache) userRegion.getRegionService();
- boolean initialPdxReadSerializedFlag =
cache.getPdxRegistry().getPdxReadSerialized();
- cache.getPdxRegistry().overridePdxReadSerialized(true);
+ boolean initialPdxReadSerializedFlag =
cache.getPdxRegistry().getPdxReadSerializedOverride();
+ cache.getPdxRegistry().setPdxReadSerializedOverride(true);
try {
// bucketTargetingMap handles partition resolver (via bucketId as
callbackArg)
Map bucketTargetingMap = getBucketTargetingMap(fileAndChunkBucket,
bucketId);
@@ -129,7 +128,7 @@ public class IndexRepositoryFactory {
} finally {
if (!success) {
lockService.unlock(lockName);
-
cache.getPdxRegistry().overridePdxReadSerialized(initialPdxReadSerializedFlag);
+
cache.getPdxRegistry().setPdxReadSerializedOverride(initialPdxReadSerializedFlag);
}
}
}
diff --git
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventListener.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventListener.java
index 8a04f8e..2a227f7 100644
---
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventListener.java
+++
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneEventListener.java
@@ -32,7 +32,6 @@ import org.apache.geode.cache.asyncqueue.AsyncEvent;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
import org.apache.geode.cache.lucene.internal.repository.IndexRepository;
import org.apache.geode.cache.lucene.internal.repository.RepositoryManager;
-import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.internal.cache.BucketNotFoundException;
import org.apache.geode.internal.cache.EntrySnapshot;
import org.apache.geode.internal.cache.InternalCache;
@@ -79,7 +78,7 @@ public class LuceneEventListener implements
AsyncEventListener {
protected boolean process(final List<AsyncEvent> events) {
// Try to get a PDX instance if possible, rather than a deserialized object
- cache.getPdxRegistry().overridePdxReadSerialized(true);
+ cache.getPdxRegistry().setPdxReadSerializedOverride(true);
Set<IndexRepository> affectedRepos = new HashSet<>();
@@ -118,7 +117,7 @@ public class LuceneEventListener implements
AsyncEventListener {
} catch (IOException e) {
throw new InternalGemFireError("Unable to save to lucene index", e);
} finally {
- cache.getPdxRegistry().overridePdxReadSerialized(false);
+ cache.getPdxRegistry().setPdxReadSerializedOverride(false);
}
}
--
To stop receiving notification emails like this one, please contact
[email protected].
