[GitHub] [geode] DonalEvans commented on a change in pull request #6104: GEODE-9016: Fix the NPE for PutAll with CQ LOCAL_DESTROY message type

[GitBox <gi...@apache.org>]

DonalEvans commented on a change in pull request #6104:
URL: https://github.com/apache/geode/pull/6104#discussion_r590881622



##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
##########
@@ -716,7 +716,7 @@ protected void _distribute() {
    * This is similar to CacheClientNotifier.removeDestroyTokensFromCqResultKeys() where the
    * destroyed events for local CQs are handled.
    */
-  private void removeDestroyTokensFromCqResultKeys(FilterRoutingInfo filterRouting) {
+  protected void removeDestroyTokensFromCqResultKeys(FilterRoutingInfo filterRouting) {

Review comment:
       This method (and the overridden version in DistributedPutAllOperation) can be package-private instead of protected. It's best to keep visibility as restricted as possible.

##########
File path: geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
##########
@@ -120,6 +123,60 @@
 
   private static int bridgeServerPort;
 
+  @Test
+  public void testPutAllWithCQLocalDestroy() throws Exception {

Review comment:
       This method never throws an `Exception` so this is not necessary.

##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
##########
@@ -814,6 +818,46 @@ protected FilterRoutingInfo getRecipientFilterRouting(Set cacheOpRecipients) {
     return consolidated;
   }
 
+  @Override
+  protected void removeDestroyTokensFromCqResultKeys(FilterRoutingInfo filterRouting) {
+    for (InternalDistributedMember m : filterRouting.getMembers()) {
+      FilterInfo filterInfo = filterRouting.getFilterInfo(m);
+      if (filterInfo.getCQs() == null) {
+        continue;
+      }
+
+      CacheDistributionAdvisor.CacheProfile cf =
+          (CacheDistributionAdvisor.CacheProfile) ((Bucket) getRegion()).getPartitionedRegion()
+              .getCacheDistributionAdvisor().getProfile(m);
+
+      if (cf == null || cf.filterProfile == null || cf.filterProfile.isLocalProfile()
+          || cf.filterProfile.getCqMap().isEmpty()) {
+        continue;
+      }
+
+      for (Object value : cf.filterProfile.getCqMap().values()) {
+        ServerCQ cq = (ServerCQ) value;
+
+        for (Map.Entry<Long, Integer> e : filterInfo.getCQs().entrySet()) {
+          Long cqID = e.getKey();
+          // For the CQs satisfying the event with destroy CQEvent, remove
+          // the entry from CQ cache.
+          for (int i = 0; i < this.putAllData.length; i++) {

Review comment:
       Until this line, the code in this method and in `DistributedCacheOperation.removeDestroyTokensFromCqResultKeys
   ()` is identical. Would it be possible to extract the duplicated code to a method in `DistributedCacheOperation` that both classes could use, rather than duplicating it?




----------------------------------------------------------------
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.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org