[flink] 02/02: [FLINK-21831][state][changelog] Add missing delegation of KeyGroupedInternalPriorityQueue

[pn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pnowojski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit db448344a672b901b69416a016f43f02f155e046
Author: Piotr Nowojski <pi...@gmail.com>
AuthorDate: Fri Mar 19 13:20:49 2021 +0100

    [FLINK-21831][state][changelog] Add missing delegation of KeyGroupedInternalPriorityQueue
    
    KeyGroupedInternalPriorityQueue provides public methods that will be modifying
    the delegated state backend, so it has to be proxyd as well.
---
 .../ChangelogKeyGroupedPriorityQueue.java          | 88 ++++++++++++++++++++++
 .../changelog/ChangelogKeyedStateBackend.java      |  3 +-
 2 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyGroupedPriorityQueue.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyGroupedPriorityQueue.java
new file mode 100644
index 0000000..feae8c3
--- /dev/null
+++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyGroupedPriorityQueue.java
@@ -0,0 +1,88 @@
+/*
+ * 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 org.apache.flink.state.changelog;
+
+import org.apache.flink.runtime.state.KeyGroupedInternalPriorityQueue;
+import org.apache.flink.util.CloseableIterator;
+
+import javax.annotation.Nullable;
+
+import java.util.Collection;
+import java.util.Set;
+
+/**
+ * A {@link KeyGroupedInternalPriorityQueue} that keeps state on the underlying delegated {@link
+ * KeyGroupedInternalPriorityQueue} as well as on the state change log.
+ */
+public class ChangelogKeyGroupedPriorityQueue<T> implements KeyGroupedInternalPriorityQueue<T> {
+    private final KeyGroupedInternalPriorityQueue<T> delegatedPriorityQueue;
+
+    public ChangelogKeyGroupedPriorityQueue(
+            KeyGroupedInternalPriorityQueue<T> delegatedPriorityQueue) {
+        this.delegatedPriorityQueue = delegatedPriorityQueue;
+    }
+
+    @Override
+    public Set<T> getSubsetForKeyGroup(int keyGroupId) {
+        return delegatedPriorityQueue.getSubsetForKeyGroup(keyGroupId);
+    }
+
+    @Nullable
+    @Override
+    public T poll() {
+        return delegatedPriorityQueue.poll();
+    }
+
+    @Nullable
+    @Override
+    public T peek() {
+        return delegatedPriorityQueue.peek();
+    }
+
+    @Override
+    public boolean add(T toAdd) {
+        return delegatedPriorityQueue.add(toAdd);
+    }
+
+    @Override
+    public boolean remove(T toRemove) {
+        return delegatedPriorityQueue.remove(toRemove);
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return delegatedPriorityQueue.isEmpty();
+    }
+
+    @Override
+    public int size() {
+        return delegatedPriorityQueue.size();
+    }
+
+    @Override
+    public void addAll(@Nullable Collection<? extends T> toAdd) {
+        delegatedPriorityQueue.addAll(toAdd);
+    }
+
+    @Override
+    public CloseableIterator<T> iterator() {
+        // TODO: Wrap with loggingIterator implemented in FLINK-21355
+        return delegatedPriorityQueue.iterator();
+    }
+}
diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyedStateBackend.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyedStateBackend.java
index b4afabb..2f37d4e 100644
--- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyedStateBackend.java
+++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyedStateBackend.java
@@ -247,7 +247,8 @@ class ChangelogKeyedStateBackend<K>
             KeyGroupedInternalPriorityQueue<T> create(
                     @Nonnull String stateName,
                     @Nonnull TypeSerializer<T> byteOrderedElementSerializer) {
-        return keyedStateBackend.create(stateName, byteOrderedElementSerializer);
+        return new ChangelogKeyGroupedPriorityQueue<T>(
+                keyedStateBackend.create(stateName, byteOrderedElementSerializer));
     }
 
     @VisibleForTesting