fredia commented on code in PR #23938: URL: https://github.com/apache/flink/pull/23938#discussion_r1432205407
########## flink-runtime/src/test/java/org/apache/flink/runtime/state/OperatorStateRestoreOperationTest.java: ########## @@ -0,0 +1,112 @@ +/* + * 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.runtime.state; + +import org.apache.flink.api.common.ExecutionConfig; +import org.apache.flink.api.common.state.BroadcastState; +import org.apache.flink.api.common.state.ListStateDescriptor; +import org.apache.flink.api.common.state.MapStateDescriptor; +import org.apache.flink.core.fs.CloseableRegistry; +import org.apache.flink.runtime.checkpoint.CheckpointOptions; +import org.apache.flink.runtime.state.memory.MemCheckpointStreamFactory; + +import org.jetbrains.annotations.Nullable; Review Comment: ```suggestion import javax.annotation.Nullable; ``` ########## flink-runtime/src/test/java/org/apache/flink/runtime/state/OperatorStateRestoreOperationTest.java: ########## @@ -0,0 +1,112 @@ +/* + * 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.runtime.state; + +import org.apache.flink.api.common.ExecutionConfig; +import org.apache.flink.api.common.state.BroadcastState; +import org.apache.flink.api.common.state.ListStateDescriptor; +import org.apache.flink.api.common.state.MapStateDescriptor; +import org.apache.flink.core.fs.CloseableRegistry; +import org.apache.flink.runtime.checkpoint.CheckpointOptions; +import org.apache.flink.runtime.state.memory.MemCheckpointStreamFactory; + +import org.jetbrains.annotations.Nullable; +import org.junit.Test; + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; + Review Comment: Need some comments here, otherwise `checkstyle` would be fail. ########## flink-runtime/src/main/java/org/apache/flink/runtime/state/OperatorStateRestoreOperation.java: ########## @@ -168,9 +170,25 @@ public Void restore() throws Exception { } } + // sort state by offsets + List<Map.Entry<String, OperatorStateHandle.StateMetaInfo>> entries = + stateHandle.getStateNameToPartitionOffsets().entrySet().stream() + .sorted( + Comparator.comparingLong( + entry -> { + OperatorStateHandle.StateMetaInfo + stateMetaInfo = entry.getValue(); + long[] offsets = stateMetaInfo.getOffsets(); + if (offsets == null || offsets.length == 0) { + return Long.MIN_VALUE; + } else { + return offsets[0]; + } Review Comment: ```suggestion Preconditions.checkNotNull(offsets); Preconditions.checkState(offsets.length > 0); return offsets[0]; ``` I think we should throw exceptions as early as possible. ########## flink-runtime/src/main/java/org/apache/flink/runtime/state/OperatorStateRestoreOperation.java: ########## @@ -168,9 +170,25 @@ public Void restore() throws Exception { } } + // sort state by offsets Review Comment: How about describing the root cause here? something like: > sort state handles by offsets to avoid building `SnappyFramedInputStream` with EOF stream. And IIUC, we only need to sort the state handles when compression is enabled? ########## flink-runtime/src/test/java/org/apache/flink/runtime/state/OperatorStateRestoreOperationTest.java: ########## @@ -0,0 +1,112 @@ +/* + * 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.runtime.state; + +import org.apache.flink.api.common.ExecutionConfig; +import org.apache.flink.api.common.state.BroadcastState; +import org.apache.flink.api.common.state.ListStateDescriptor; +import org.apache.flink.api.common.state.MapStateDescriptor; +import org.apache.flink.core.fs.CloseableRegistry; +import org.apache.flink.runtime.checkpoint.CheckpointOptions; +import org.apache.flink.runtime.state.memory.MemCheckpointStreamFactory; + +import org.jetbrains.annotations.Nullable; +import org.junit.Test; Review Comment: ```suggestion import org.junit.jupiter.api.Test; ``` The newly added tests should preferably use JUnit 5. https://flink.apache.org/how-to-contribute/code-style-and-quality-common/#:~:text=Testing-,%23,-Tooling -- 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: issues-unsubscr...@flink.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
