DonalEvans commented on a change in pull request #7262:
URL: https://github.com/apache/geode/pull/7262#discussion_r819030581
##########
File path:
geode-core/src/main/java/org/apache/geode/cache/query/internal/index/RangeIndex.java
##########
@@ -1080,10 +1079,11 @@ private void addValuesToResultSingleKeyToRemove(Object
entriesMap, Collection re
}
}
- private void addValuesToResult(final Object entriesMap, final Collection<?>
result,
+ private void addValuesToResult(final Object entriesMap, final
Collection<Object> result,
final Object keyToRemove, final CompiledValue iterOps, final
RuntimeIterator runtimeItr,
Review comment:
For consistency, could `runtimeItr` be renamed "independentIterator"
please?
##########
File path:
geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexProtocol.java
##########
@@ -96,13 +96,14 @@ void query(Object key, int operator, Collection results,
Set keysToRemove,
* @param results The Collection object used for fetching the index results
* @param context ExecutionContext object
*/
- void query(Object key, int operator, Collection results, ExecutionContext
context)
+ void query(Object key, int operator, Collection<Object> results,
ExecutionContext context)
throws TypeMismatchException, FunctionDomainException,
NameResolutionException,
QueryInvocationTargetException;
- void query(Object key, int operator, Collection results, CompiledValue
iterOp,
- RuntimeIterator indpndntItr, ExecutionContext context, List projAttrib,
- SelectResults intermediateResults, boolean isIntersection) throws
TypeMismatchException,
+ void query(Object key, int operator, Collection<Object> results,
CompiledValue iterOp,
+ RuntimeIterator indpndntItr, ExecutionContext context, List<?>
projAttrib,
Review comment:
For consistency with other changes in this PR, could `indpndntItr` be
renamed "independentIterator" here?
##########
File path:
geode-core/src/main/java/org/apache/geode/cache/query/internal/index/RangeIndex.java
##########
@@ -1109,9 +1109,10 @@ private void addValuesToResult(final Object entriesMap,
final Collection<?> resu
}
private void addValuesToResultFromMap(final Map<Object, Object> entriesMap,
- final Collection<?> result, final Object keyToRemove, final
CompiledValue iterOps,
+ final Collection<Object> result, final Object keyToRemove, final
CompiledValue iterOps,
final RuntimeIterator runtimeItr, final ExecutionContext context, final
List<?> projAttrib,
Review comment:
For consistency, could `runtimeItr` be renamed "independentIterator"
please?
##########
File path:
geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
##########
@@ -242,11 +239,11 @@ public Object execute(Object[] params) throws
FunctionDomainException, TypeMisma
// For local queries returning pdx objects wrap the resultset with
// ResultsCollectionPdxDeserializerWrapper
// which deserializes these pdx objects.
- if (needsPDXDeserializationWrapper(true /* is query on PR */)
+ if (needsPDXDeserializationWrapper( /* is query on PR */)
Review comment:
Small nitpick, but this comment and the similar one on line 284 can
probably be removed, or at least moved outside the parentheses for the method
call.
##########
File path:
geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
##########
@@ -80,15 +80,15 @@
public int putAllDataSize;
- protected boolean isBridgeOp = false;
+ protected boolean isBridgeOp;
static final byte USED_FAKE_EVENT_ID = 0x01;
static final byte NOTIFY_ONLY = 0x02;
static final byte FILTER_ROUTING = 0x04;
static final byte VERSION_TAG = 0x08;
static final byte POSDUP = 0x10;
static final byte PERSISTENT_TAG = 0x20;
- static final byte HAS_CALLBACKARG = 0x40;
+ // static final byte HAS_CALLBACKARG = 0x40;
Review comment:
Should this commented-out code be removed?
##########
File path:
geode-core/src/main/java/org/apache/geode/cache/query/internal/index/AbstractIndex.java
##########
@@ -283,9 +284,11 @@ public void query(Object key, int operator, Collection
results, ExecutionContext
}
@Override
- public void query(Object key, int operator, Collection results, @Retained
CompiledValue iterOp,
- RuntimeIterator indpndntItr, ExecutionContext context, List projAttrib,
- SelectResults intermediateResults, boolean isIntersection) throws
TypeMismatchException,
+ public void query(Object key, int operator, Collection<Object> results,
+ @Retained CompiledValue iterOp,
+ RuntimeIterator runtimeIterator, ExecutionContext context, List<?>
projAttrib,
Review comment:
In `lockedQuery()` the variable name used for the `RuntimeIterator` in
the method signature is "independentIterator". Also, in code that calls this
`query()` method, the variable name is a variation of "independentIterator".
Could it also be named "independentIterator" in this method signature for
consistency?
##########
File path:
geode-core/src/main/java/org/apache/geode/internal/cache/TXRemoteCommitMessage.java
##########
@@ -65,7 +65,8 @@ public static RemoteCommitResponse send(Cache cache, int
txUniqId,
InternalDistributedMember onBehalfOfClientMember, DistributedMember
recipient) {
final InternalDistributedSystem system =
(InternalDistributedSystem) cache.getDistributedSystem();
- final Set<DistributedMember> recipients = Collections.singleton(recipient);
+ final Set<InternalDistributedMember> recipients =
+ Collections.singleton((InternalDistributedMember) recipient);
Review comment:
It's difficult to tell in a PR of this size, but is there a specific
reason that this is being changed from the interface `DistributedMember` to the
concrete class `InternalDistributedMember`?
##########
File path:
geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
##########
@@ -76,18 +78,18 @@
public int removeAllDataSize;
- protected boolean isBridgeOp = false;
+ protected boolean isBridgeOp;
static final byte USED_FAKE_EVENT_ID = 0x01;
static final byte NOTIFY_ONLY = 0x02;
static final byte FILTER_ROUTING = 0x04;
static final byte VERSION_TAG = 0x08;
static final byte POSDUP = 0x10;
static final byte PERSISTENT_TAG = 0x20;
- static final byte HAS_CALLBACKARG = 0x40;
+ // static final byte HAS_CALLBACKARG = 0x40;
Review comment:
Should this commented-out code just be removed?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
