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
commit 2b4db30a4597d37b9870a9ae85fc6469cc90a1b7
Author: Udo <ukohlme...@pivotal.io>
AuthorDate: Wed Mar 7 15:08:33 2018 -0800
GEODE-4685: Addressing review comments
---
.../geode/connectors/jdbc/JdbcAsyncWriter.java | 6 +--
.../apache/geode/connectors/jdbc/JdbcWriter.java | 6 +--
.../geode/cache/query/internal/DefaultQuery.java | 19 ++++------
.../cache/query/internal/index/IndexManager.java | 18 ++++-----
.../internal/streaming/StreamingOperation.java | 44 ++++++++++------------
.../geode/internal/cache/GemFireCacheImpl.java | 19 +++++++++-
.../apache/geode/internal/cache/InternalCache.java | 4 ++
.../internal/cache/partitioned/QueryMessage.java | 7 ++--
.../apache/geode/pdx/internal/TypeRegistry.java | 2 +-
.../geode/cache/query/PdxStringQueryJUnitTest.java | 6 +--
.../cache/query/dunit/PdxStringQueryDUnitTest.java | 6 +--
.../geode/internal/PdxDeleteFieldJUnitTest.java | 8 ++--
.../apache/geode/pdx/PdxClientServerDUnitTest.java | 7 ++--
.../apache/geode/pdx/PdxSerializableJUnitTest.java | 12 +++---
.../cache/query/internal/cq/CqServiceImpl.java | 6 +--
.../lucene/internal/IndexRepositoryFactory.java | 6 +--
.../cache/lucene/internal/LuceneEventListener.java | 6 +--
.../internal/LuceneEventListenerJUnitTest.java | 6 +--
18 files changed, 100 insertions(+), 88 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 e4af171..f6d2d6b 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
@@ -61,8 +61,8 @@ public class JdbcAsyncWriter extends AbstractJdbcCallback
implements AsyncEventL
checkInitialized((InternalCache)
events.get(0).getRegion().getRegionService());
}
- Boolean initialPdxReadSerialized =
cache.getPdxRegistry().getPdxReadSerializedOverride();
- cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ Boolean initialPdxReadSerialized = cache.getPdxReadSerializedOverride();
+ cache.setPdxReadSerializedOverride(true);
try {
for (AsyncEvent event : events) {
@@ -76,7 +76,7 @@ public class JdbcAsyncWriter extends AbstractJdbcCallback
implements AsyncEventL
}
}
} finally {
-
cache.getPdxRegistry().setPdxReadSerializedOverride(initialPdxReadSerialized);
+ cache.setPdxReadSerializedOverride(initialPdxReadSerialized);
}
return true;
}
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 81b4709..777a5f3 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
@@ -83,8 +83,8 @@ public class JdbcWriter<K, V> extends AbstractJdbcCallback
implements CacheWrite
}
private PdxInstance getPdxNewValue(EntryEvent<K, V> event) {
- Boolean initialPdxReadSerialized =
cache.getPdxRegistry().getPdxReadSerializedOverride();
- cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ Boolean initialPdxReadSerialized = cache.getPdxReadSerializedOverride();
+ cache.setPdxReadSerializedOverride(true);
try {
Object newValue = event.getNewValue();
if (!(newValue instanceof PdxInstance)) {
@@ -102,7 +102,7 @@ public class JdbcWriter<K, V> extends AbstractJdbcCallback
implements CacheWrite
}
return (PdxInstance) newValue;
} finally {
-
cache.getPdxRegistry().setPdxReadSerializedOverride(initialPdxReadSerialized);
+ cache.setPdxReadSerializedOverride(initialPdxReadSerialized);
}
}
}
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 74e6686..09d128f 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
@@ -126,9 +126,7 @@ public class DefaultQuery implements Query {
public static TestHook testHook;
- /**
- * indicates query executed remotely
- */
+ /** indicates query executed remotely */
private boolean isRemoteQuery = false;
// to prevent objects from getting deserialized
@@ -219,11 +217,10 @@ public class DefaultQuery implements Query {
}
};
- // /**
- // * Caches the fields not found in any Pdx version. This threadlocal will
be cleaned up after
- // query
- // * execution completes in {@linkplain
#executeUsingContext(ExecutionContext)}
- // */
+ /**
+ * Caches the fields not found in any Pdx version. This threadlocal will be
cleaned up after query
+ * execution completes in {@linkplain #executeUsingContext(ExecutionContext)}
+ */
private static final ThreadLocal<Map<String, Set<String>>>
pdxClassToFieldsMap =
ThreadLocal.withInitial(HashMap::new);
@@ -319,10 +316,10 @@ public class DefaultQuery implements Query {
QueryExecutor qe = checkQueryOnPR(params);
Object result = null;
- Boolean initialPdxReadSerialized =
this.cache.getPdxRegistry().getPdxReadSerializedOverride();
+ Boolean initialPdxReadSerialized =
this.cache.getPdxReadSerializedOverride();
try {
// Setting the readSerialized flag for local queries
- this.cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ this.cache.setPdxReadSerializedOverride(true);
ExecutionContext context = new QueryExecutionContext(params, this.cache,
this);
indexObserver = this.startTrace();
if (qe != null) {
@@ -399,7 +396,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().setPdxReadSerializedOverride(initialPdxReadSerialized);
+ this.cache.setPdxReadSerializedOverride(initialPdxReadSerialized);
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 4340b7c..9700fb3 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
@@ -273,8 +273,8 @@ public class IndexManager {
LocalizedStrings.IndexCreationMsg_CANCELED_DUE_TO_LOW_MEMORY.toLocalizedString());
}
- boolean oldReadSerialized =
this.cache.getPdxRegistry().getPdxReadSerializedOverride();
- this.cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ boolean oldReadSerialized = this.cache.getPdxReadSerializedOverride();
+ this.cache.setPdxReadSerializedOverride(true);
TXStateProxy tx = null;
if (!((InternalCache) this.cache).isClient()) {
@@ -429,7 +429,7 @@ public class IndexManager {
return index;
} finally {
-
this.cache.getPdxRegistry().setPdxReadSerializedOverride(oldReadSerialized);
+ this.cache.setPdxReadSerializedOverride(oldReadSerialized);
((TXManagerImpl)
this.cache.getCacheTransactionManager()).unpauseTransaction(tx);
}
@@ -904,8 +904,8 @@ public class IndexManager {
}
boolean throwException = false;
HashMap<String, Exception> exceptionsMap = new HashMap<String,
Exception>();
- boolean oldReadSerialized =
this.cache.getPdxRegistry().getPdxReadSerializedOverride();
- this.cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ boolean oldReadSerialized = this.cache.getPdxReadSerializedOverride();
+ this.cache.setPdxReadSerializedOverride(true);
try {
Iterator entryIter = ((LocalRegion) region).getBestIterator(true);
while (entryIter.hasNext()) {
@@ -946,7 +946,7 @@ public class IndexManager {
throw new MultiIndexCreationException(exceptionsMap);
}
} finally {
-
this.cache.getPdxRegistry().setPdxReadSerializedOverride(oldReadSerialized);
+ this.cache.setPdxReadSerializedOverride(oldReadSerialized);
notifyAfterUpdate();
}
}
@@ -1001,8 +1001,8 @@ public class IndexManager {
*/
private void processAction(RegionEntry entry, int action, int opCode) throws
QueryException {
final long startPA = getCachePerfStats().startIndexUpdate();
- Boolean initialPdxReadSerialized =
this.cache.getPdxRegistry().getPdxReadSerializedOverride();
- this.cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ Boolean initialPdxReadSerialized =
this.cache.getPdxReadSerializedOverride();
+ this.cache.setPdxReadSerializedOverride(true);
TXStateProxy tx = null;
if (!this.cache.isClient()) {
tx = ((TXManagerImpl)
this.cache.getCacheTransactionManager()).pauseTransaction();
@@ -1147,7 +1147,7 @@ public class IndexManager {
}
}
} finally {
-
this.cache.getPdxRegistry().setPdxReadSerializedOverride(initialPdxReadSerialized);
+ this.cache.setPdxReadSerializedOverride(initialPdxReadSerialized);
((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 5c6675f..5493b77 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
@@ -55,6 +55,7 @@ import
org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegionQueryEvaluator;
import org.apache.geode.internal.cache.Token;
@@ -156,9 +157,7 @@ public abstract class StreamingOperation {
int msgsProcessed = 0;
int numMsgs = 0;
- /**
- * Return true if this is the very last reply msg to process for this
member
- */
+ /** Return true if this is the very last reply msg to process for this
member */
protected synchronized boolean trackMessage(StreamingReplyMessage m) {
this.msgsProcessed++;
@@ -221,12 +220,12 @@ public abstract class StreamingOperation {
}
if (isLast) {
super.process(msg, false); // removes from members and cause us to
- // ignore future messages received from that member
+ // ignore future messages received from
that member
}
} finally {
this.msgsBeingProcessed.decrementAndGet();
checkIfDone(); // check to see if decrementing msgsBeingProcessed
requires signalling to
- // proceed
+ // proceed
}
}
@@ -324,7 +323,7 @@ public abstract class StreamingOperation {
// for the next objects, disallow stream from allocating more
storage
do {
outStream.disallowExpansion(CHUNK_FULL); // sets the mark where
rollback occurs on
- // CHUNK_FULL
+ // CHUNK_FULL
nextObject = getNextReplyObject();
@@ -353,8 +352,8 @@ public abstract class StreamingOperation {
break; // receiver no longer cares
}
outStream.reset(); // ready for reuse, assumes replyWithData
- // does not queue the message but outStream has
- // already been used
+ // does not queue the message but outStream has
+ // already been used
} while (nextObject != Token.END_OF_STREAM);
// } catch (CancelException e) {
// // if cache is closed, we cannot send a reply (correct?)
@@ -429,30 +428,28 @@ public abstract class StreamingOperation {
public static class StreamingReplyMessage extends ReplyMessage {
- /**
- * the number of this message
- */
+ /** the number of this message */
protected int msgNum;
- /**
- * whether this message is the last one in this series
- */
+ /** whether this message is the last one in this series */
protected boolean lastMsg;
private transient HeapDataOutputStream chunkStream; // used only on
sending side, null means
- // abort
+ // abort
private transient int numObjects; // used only on sending side
private transient List objectList = null; // used only on receiving side
private boolean pdxReadSerialized = false; // used to read PDX types in
serialized form.
private transient boolean isCanceled = false; // used only on receiving
side and if
- // messageProcessor is of type
- // PartitionedRegionQueryEvaluator.StreamingQueryPartitionResponse
+ // messageProcessor is of
type
+ //
PartitionedRegionQueryEvaluator.StreamingQueryPartitionResponse
+
/**
* @param chunkStream the data to send back, if null then all the
following parameters are
* ignored and any future replies from this member will be ignored,
and the streaming of
* chunks is considered aborted by the receiver.
+ *
* @param msgNum message number in this series (0-based)
* @param lastMsg if this is the last message in this series
*/
@@ -494,9 +491,7 @@ public abstract class StreamingOperation {
return isCanceled;
}
- /**
- * Return the objects in this chunk as a List, used only on receiving side
- */
+ /** Return the objects in this chunk as a List, used only on receiving
side */
public List getObjects() {
return this.objectList;
}
@@ -520,8 +515,9 @@ public abstract class StreamingOperation {
InternalCache cache = null;
Boolean initialPdxReadSerialized = false;
try {
- cache = (InternalCache) CacheFactory.getAnyInstance();
- initialPdxReadSerialized =
cache.getPdxRegistry().getPdxReadSerializedOverride();
+ cache =
+ (InternalCache) GemFireCacheImpl.getForPdx("fromData invocation in
StreamingOperation");
+ initialPdxReadSerialized = cache.getPdxReadSerializedOverride();
} catch (CacheClosedException e) {
}
@@ -533,7 +529,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 != null) {
- cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ cache.setPdxReadSerializedOverride(true);
}
try {
ReplyProcessor21 messageProcessor =
ReplyProcessor21.getProcessor(processorId);
@@ -579,7 +575,7 @@ public abstract class StreamingOperation {
}
} finally {
if (this.pdxReadSerialized && cache != null) {
-
cache.getPdxRegistry().setPdxReadSerializedOverride(initialPdxReadSerialized);
+ cache.setPdxReadSerializedOverride(initialPdxReadSerialized);
}
}
}
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 b6e3a0e..37b8259 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
@@ -5156,7 +5156,7 @@ public class GemFireCacheImpl implements InternalCache,
InternalClientCache, Has
@Override
public void setReadSerializedForCurrentThread(boolean value) {
PdxInstanceImpl.setPdxReadSerialized(value);
- this.getPdxRegistry().setPdxReadSerializedOverride(value);
+ this.setPdxReadSerializedOverride(value);
}
// test hook
@@ -5316,4 +5316,21 @@ public class GemFireCacheImpl implements InternalCache,
InternalClientCache, Has
}
return result;
}
+
+ @Override
+ public Boolean getPdxReadSerializedOverride() {
+ TypeRegistry pdxRegistry = this.getPdxRegistry();
+ if (pdxRegistry != null) {
+ return pdxRegistry.getPdxReadSerializedOverride();
+ }
+ return false;
+ }
+
+ @Override
+ public void setPdxReadSerializedOverride(boolean pdxReadSerialized) {
+ TypeRegistry pdxRegistry = this.getPdxRegistry();
+ if (pdxRegistry != null) {
+ pdxRegistry.setPdxReadSerializedOverride(pdxReadSerialized);
+ }
+ }
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
index 0283474..d9f989f 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
@@ -355,4 +355,8 @@ public interface InternalCache extends Cache,
Extensible<Cache>, CacheTime {
* or the result of calling PdxInstance.getObject on obj.
*/
Object convertPdxInstanceIfNeeded(Object obj);
+
+ Boolean getPdxReadSerializedOverride();
+
+ void setPdxReadSerializedOverride(boolean pdxReadSerialized);
}
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 8098c41..1ab675e 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,9 +169,8 @@ public class QueryMessage extends
StreamingPartitionOperation.StreamingPartition
DefaultQuery query = new DefaultQuery(this.queryString, pr.getCache(),
false);
// Remote query, use the PDX types in serialized form.
- Boolean initialPdxReadSerialized =
- pr.getCache().getPdxRegistry().getPdxReadSerializedOverride();
- pr.getCache().getPdxRegistry().setPdxReadSerializedOverride(true);
+ Boolean initialPdxReadSerialized =
pr.getCache().getPdxReadSerializedOverride();
+ pr.getCache().setPdxReadSerializedOverride(true);
// In case of "select *" queries we can keep the results in serialized
form and send
query.setRemoteQuery(true);
QueryObserver indexObserver = query.startTrace();
@@ -251,7 +250,7 @@ public class QueryMessage extends
StreamingPartitionOperation.StreamingPartition
if (isQueryTraced) {
this.resultCollector.remove(queryTraceList);
}
-
pr.getCache().getPdxRegistry().setPdxReadSerializedOverride(initialPdxReadSerialized);
+ pr.getCache().setPdxReadSerializedOverride(initialPdxReadSerialized);
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 85575c8..869dc47 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
@@ -65,7 +65,7 @@ public class TypeRegistry {
private final InternalCache cache;
- private static final ThreadLocal<Boolean> pdxReadSerializedOverride =
+ private final ThreadLocal<Boolean> pdxReadSerializedOverride =
ThreadLocal.withInitial(() -> Boolean.FALSE);
public TypeRegistry(InternalCache cache, boolean disableTypeRegistry) {
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 36a7060..2d25edc 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
@@ -226,7 +226,7 @@ public class PdxStringQueryJUnitTest {
for (Object key : map.keySet()) {
assertTrue(key instanceof PdxString);
}
- cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ cache.setPdxReadSerializedOverride(true);
executeQueriesValidateResults(INDEX_TYPE_RANGE);
queryService.removeIndex(index);
region.clear();
@@ -350,7 +350,7 @@ public class PdxStringQueryJUnitTest {
}
private void executeQueriesValidateResults(int indexType) throws Exception {
- cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ cache.setPdxReadSerializedOverride(true);
String[] query = {"select count(*) from /exampleRegion",
"select count(*) from /exampleRegion p, p.positions.values v",
@@ -611,7 +611,7 @@ public class PdxStringQueryJUnitTest {
while (iter.hasNext()) {
validateResult(secIdsList, iter.next());
}
- cache.getPdxRegistry().setPdxReadSerializedOverride(false);
+ cache.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 7b31dd3..b32ba6d 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
@@ -2002,15 +2002,15 @@ public class PdxStringQueryDUnitTest extends
JUnit4CacheTestCase {
// to simulate remote query
vm0.invoke("Create server", () -> {
- Boolean previousPdxReadSerializedFlag =
cache.getPdxRegistry().getPdxReadSerializedOverride();
- cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ Boolean previousPdxReadSerializedFlag =
cache.getPdxReadSerializedOverride();
+ cache.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().setPdxReadSerializedOverride(previousPdxReadSerializedFlag);
+ cache.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 9eddb1d..5239d4c 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
@@ -131,14 +131,14 @@ public class PdxDeleteFieldJUnitTest {
assertEquals(2L, deserializedPdxValue.fieldToDelete);
}
PdxType pt;
- cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ cache.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().setPdxReadSerializedOverride(false);
+ cache.setPdxReadSerializedOverride(false);
}
assertEquals(PdxValue.class.getName(), pt.getClassName());
PdxField field = pt.getPdxField("fieldToDelete");
@@ -153,7 +153,7 @@ public class PdxDeleteFieldJUnitTest {
// fieldToDelete should now be 0 (the default) instead of 2.
assertEquals(0L, deserializedPdxValue.fieldToDelete);
}
- cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ cache.setPdxReadSerializedOverride(true);
try {
PdxInstance pi = (PdxInstance)
BlobHelper.deserializeBlob(pdxValueBytes);
assertEquals(1, pi.getField("value"));
@@ -164,7 +164,7 @@ public class PdxDeleteFieldJUnitTest {
assertEquals(1, deserializedPdxValue.value);
assertEquals(0L, deserializedPdxValue.fieldToDelete);
} finally {
- cache.getPdxRegistry().setPdxReadSerializedOverride(false);
+ cache.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 7ef14a0..9e53131 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
@@ -349,9 +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().getPdxReadSerializedOverride();
- cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ Boolean previousPdxReadSerializedFlag =
cache.getPdxReadSerializedOverride();
+ cache.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().setPdxReadSerializedOverride(previousPdxReadSerializedFlag);
+ cache.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 0f3ef62..37ac5f9 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
@@ -1094,8 +1094,8 @@ public class PdxSerializableJUnitTest {
// this method adds coverage for bug 43236
@Test
public void testObjectPdxInstance() throws IOException,
ClassNotFoundException {
- Boolean previousPdxReadSerializedFlag =
cache.getPdxRegistry().getPdxReadSerializedOverride();
- cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ Boolean previousPdxReadSerializedFlag =
cache.getPdxReadSerializedOverride();
+ cache.setPdxReadSerializedOverride(true);
PdxReaderImpl.TESTHOOK_TRACKREADS = true;
try {
PdxInstance pi = (PdxInstance) serializeAndDeserialize(new
ObjectHolder("hello"));
@@ -1110,15 +1110,15 @@ public class PdxSerializableJUnitTest {
assertEquals("hello", v3.getObject());
assertEquals("goodbye", wpi.getField("f1"));
} finally {
-
cache.getPdxRegistry().setPdxReadSerializedOverride(previousPdxReadSerializedFlag);
+ cache.setPdxReadSerializedOverride(previousPdxReadSerializedFlag);
PdxReaderImpl.TESTHOOK_TRACKREADS = false;
}
}
@Test
public void testObjectArrayPdxInstance() throws IOException,
ClassNotFoundException {
- Boolean previousPdxReadSerializedFlag =
cache.getPdxRegistry().getPdxReadSerializedOverride();
- cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ Boolean previousPdxReadSerializedFlag =
cache.getPdxReadSerializedOverride();
+ cache.setPdxReadSerializedOverride(true);
PdxReaderImpl.TESTHOOK_TRACKREADS = true;
try {
LongFieldHolder[] v = new LongFieldHolder[] {new LongFieldHolder(1), new
LongFieldHolder(2)};
@@ -1140,7 +1140,7 @@ public class PdxSerializableJUnitTest {
"expected " + Arrays.toString(v) + " but had " +
Arrays.toString(nv2));
}
} finally {
-
cache.getPdxRegistry().setPdxReadSerializedOverride(previousPdxReadSerializedFlag);
+ cache.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 8f99f87..c96a6e6 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,12 +1187,12 @@ public class CqServiceImpl implements CqService {
processRegionEvent(event, localProfile, profiles, frInfo);
} else {
// Use the PDX types in serialized form.
- Boolean initialPdxReadSerialized =
this.cache.getPdxRegistry().getPdxReadSerializedOverride();
- this.cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ Boolean initialPdxReadSerialized =
this.cache.getPdxReadSerializedOverride();
+ this.cache.setPdxReadSerializedOverride(true);
try {
processEntryEvent(event, localProfile, profiles, frInfo);
} finally {
-
this.cache.getPdxRegistry().setPdxReadSerializedOverride(initialPdxReadSerialized);
+ this.cache.setPdxReadSerializedOverride(initialPdxReadSerialized);
}
}
}
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 ee64cc1..0047b94 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
@@ -96,8 +96,8 @@ public class IndexRepositoryFactory {
final IndexRepository repo;
InternalCache cache = (InternalCache) userRegion.getRegionService();
- boolean initialPdxReadSerializedFlag =
cache.getPdxRegistry().getPdxReadSerializedOverride();
- cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ boolean initialPdxReadSerializedFlag =
cache.getPdxReadSerializedOverride();
+ cache.setPdxReadSerializedOverride(true);
try {
// bucketTargetingMap handles partition resolver (via bucketId as
callbackArg)
Map bucketTargetingMap = getBucketTargetingMap(fileAndChunkBucket,
bucketId);
@@ -128,7 +128,7 @@ public class IndexRepositoryFactory {
} finally {
if (!success) {
lockService.unlock(lockName);
-
cache.getPdxRegistry().setPdxReadSerializedOverride(initialPdxReadSerializedFlag);
+ cache.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 b9209e7..9c04d44 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
@@ -78,8 +78,8 @@ 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
- Boolean initialPdxReadSerialized =
this.cache.getPdxRegistry().getPdxReadSerializedOverride();
- cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ Boolean initialPdxReadSerialized =
this.cache.getPdxReadSerializedOverride();
+ cache.setPdxReadSerializedOverride(true);
Set<IndexRepository> affectedRepos = new HashSet<>();
@@ -118,7 +118,7 @@ public class LuceneEventListener implements
AsyncEventListener {
} catch (IOException e) {
throw new InternalGemFireError("Unable to save to lucene index", e);
} finally {
-
cache.getPdxRegistry().setPdxReadSerializedOverride(initialPdxReadSerialized);
+ cache.setPdxReadSerializedOverride(initialPdxReadSerialized);
}
}
diff --git
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
index 5b4c259..49a487a 100644
---
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
+++
b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
@@ -99,14 +99,14 @@ public class LuceneEventListenerJUnitTest {
doNothing().when(mockTypeRegistry)
.setPdxReadSerializedOverride((Boolean) valueCapture.capture());
- boolean originalPdxReadSerialized =
cache.getPdxRegistry().getPdxReadSerializedOverride();
+ boolean originalPdxReadSerialized = cache.getPdxReadSerializedOverride();
try {
- cache.getPdxRegistry().setPdxReadSerializedOverride(true);
+ cache.setPdxReadSerializedOverride(true);
Assert.assertTrue((Boolean) valueCapture.getValue());
listener.process(new LinkedList<>());
Assert.assertTrue(!(Boolean) valueCapture.getValue());
} finally {
-
cache.getPdxRegistry().setPdxReadSerializedOverride(originalPdxReadSerialized);
+ cache.setPdxReadSerializedOverride(originalPdxReadSerialized);
}
}
--
To stop receiving notification emails like this one, please contact
u...@apache.org.
