You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by mi...@apache.org on 2024/08/12 15:32:21 UTC

(kafka) branch trunk updated: MINOR: Move LeaderEpochCheckpointFileWithFailureHandlerTest to storage (#16829)

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

mimaison pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new b52469fa284 MINOR: Move LeaderEpochCheckpointFileWithFailureHandlerTest to storage (#16829)
b52469fa284 is described below

commit b52469fa284279197f6c21cba606dcf6920f4b10
Author: Mickael Maison <mi...@users.noreply.github.com>
AuthorDate: Mon Aug 12 17:32:14 2024 +0200

    MINOR: Move LeaderEpochCheckpointFileWithFailureHandlerTest to storage (#16829)
    
    
    Reviewers: Chia-Ping Tsai <ch...@gmail.com>
---
 ...EpochCheckpointFileWithFailureHandlerTest.scala | 67 ------------------
 ...rEpochCheckpointFileWithFailureHandlerTest.java | 82 ++++++++++++++++++++++
 2 files changed, 82 insertions(+), 67 deletions(-)

diff --git a/core/src/test/scala/unit/kafka/server/checkpoints/LeaderEpochCheckpointFileWithFailureHandlerTest.scala b/core/src/test/scala/unit/kafka/server/checkpoints/LeaderEpochCheckpointFileWithFailureHandlerTest.scala
deleted file mode 100644
index a32228a7eea..00000000000
--- a/core/src/test/scala/unit/kafka/server/checkpoints/LeaderEpochCheckpointFileWithFailureHandlerTest.scala
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
-  * 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 kafka.server.checkpoints
-
-import kafka.utils.{Logging, TestUtils}
-import org.apache.kafka.storage.internals.checkpoint.LeaderEpochCheckpointFile
-import org.apache.kafka.storage.internals.log.{EpochEntry, LogDirFailureChannel}
-import org.junit.jupiter.api.Assertions._
-import org.junit.jupiter.api.Test
-
-class LeaderEpochCheckpointFileWithFailureHandlerTest extends Logging {
-
-  @Test
-  def shouldPersistAndOverwriteAndReloadFile(): Unit ={
-    val file = TestUtils.tempFile("temp-checkpoint-file", System.nanoTime().toString)
-
-    val checkpoint = new LeaderEpochCheckpointFile(file, new LogDirFailureChannel(1))
-
-    //Given
-    val epochs = java.util.Arrays.asList(new EpochEntry(0, 1L), new EpochEntry(1, 2L), new EpochEntry(2, 3L))
-
-    //When
-    checkpoint.write(epochs)
-
-    //Then
-    assertEquals(epochs, checkpoint.read())
-
-    //Given overwrite
-    val epochs2 = java.util.Arrays.asList(new EpochEntry(3, 4L), new EpochEntry(4, 5L))
-
-    //When
-    checkpoint.write(epochs2)
-
-    //Then
-    assertEquals(epochs2, checkpoint.read())
-  }
-
-  @Test
-  def shouldRetainValuesEvenIfCheckpointIsRecreated(): Unit ={
-    val file = TestUtils.tempFile("temp-checkpoint-file", System.nanoTime().toString)
-
-    //Given a file with data in
-    val checkpoint = new LeaderEpochCheckpointFile(file, new LogDirFailureChannel(1))
-    val epochs = java.util.Arrays.asList(new EpochEntry(0, 1L), new EpochEntry(1, 2L), new EpochEntry(2, 3L))
-    checkpoint.write(epochs)
-
-    //When we recreate
-    val checkpoint2 = new LeaderEpochCheckpointFile(file, new LogDirFailureChannel(1))
-
-    //The data should still be there
-    assertEquals(epochs, checkpoint2.read())
-  }
-}
diff --git a/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpointFileWithFailureHandlerTest.java b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpointFileWithFailureHandlerTest.java
new file mode 100644
index 00000000000..a320c0dcb71
--- /dev/null
+++ b/storage/src/test/java/org/apache/kafka/storage/internals/checkpoint/LeaderEpochCheckpointFileWithFailureHandlerTest.java
@@ -0,0 +1,82 @@
+/*
+ * 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.kafka.storage.internals.checkpoint;
+
+import org.apache.kafka.storage.internals.log.EpochEntry;
+import org.apache.kafka.storage.internals.log.LogDirFailureChannel;
+import org.apache.kafka.test.TestUtils;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class LeaderEpochCheckpointFileWithFailureHandlerTest {
+
+    @Test
+    public void shouldPersistAndOverwriteAndReloadFile() throws IOException {
+        File file = TestUtils.tempFile("temp-checkpoint-file", String.valueOf(System.nanoTime()));
+
+        LeaderEpochCheckpointFile checkpoint = new LeaderEpochCheckpointFile(file, new LogDirFailureChannel(1));
+
+        //Given
+        List<EpochEntry> epochs = Arrays.asList(
+                new EpochEntry(0, 1L),
+                new EpochEntry(1, 2L),
+                new EpochEntry(2, 3L));
+
+        //When
+        checkpoint.write(epochs);
+
+        //Then
+        assertEquals(epochs, checkpoint.read());
+
+        //Given overwrite
+        List<EpochEntry> epochs2 = Arrays.asList(
+                new EpochEntry(3, 4L),
+                new EpochEntry(4, 5L));
+
+        //When
+        checkpoint.write(epochs2);
+
+        //Then
+        assertEquals(epochs2, checkpoint.read());
+    }
+
+    @Test
+    public void shouldRetainValuesEvenIfCheckpointIsRecreated() throws IOException {
+        File file = TestUtils.tempFile("temp-checkpoint-file", String.valueOf(System.nanoTime()));
+
+        //Given a file with data in
+        LeaderEpochCheckpointFile checkpoint = new LeaderEpochCheckpointFile(file, new LogDirFailureChannel(1));
+        List<EpochEntry> epochs = Arrays.asList(
+                new EpochEntry(0, 1L),
+                new EpochEntry(1, 2L),
+                new EpochEntry(2, 3L));
+        checkpoint.write(epochs);
+
+        //When we recreate
+        LeaderEpochCheckpointFile checkpoint2 = new LeaderEpochCheckpointFile(file, new LogDirFailureChannel(1));
+
+        //The data should still be there
+        assertEquals(epochs, checkpoint2.read());
+    }
+}