diff --git a/python/pyspark/sql/tests/pandas/test_pandas_transform_with_state.py b/python/pyspark/sql/tests/pandas/test_pandas_transform_with_state.py
index 527fb7d370e78..6d79a8c267531 100644
--- a/python/pyspark/sql/tests/pandas/test_pandas_transform_with_state.py
+++ b/python/pyspark/sql/tests/pandas/test_pandas_transform_with_state.py
@@ -1923,10 +1923,6 @@ def conf(cls):
         cfg.set("spark.sql.streaming.stateStore.checkpointFormatVersion", "2")
         return cfg
 
-    # TODO(SPARK-53332): Add test back when checkpoint v2 support exists for snapshotStartBatchId
-    def test_transform_with_value_state_metadata(self):
-        pass
-
 
 class TransformWithStateInPySparkWithCheckpointV2TestsMixin(TransformWithStateInPySparkTestsMixin):
     @classmethod
@@ -1935,10 +1931,6 @@ def conf(cls):
         cfg.set("spark.sql.streaming.stateStore.checkpointFormatVersion", "2")
         return cfg
 
-    # TODO(SPARK-53332): Add test back when checkpoint v2 support exists for snapshotStartBatchId
-    def test_transform_with_value_state_metadata(self):
-        pass
-
 
 class TransformWithStateInPandasTests(TransformWithStateInPandasTestsMixin, ReusedSQLTestCase):
     pass
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/state/StateDataSource.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/state/StateDataSource.scala
index 54d3c45d237b1..fea4d345b8d04 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/state/StateDataSource.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/state/StateDataSource.scala
@@ -610,14 +610,6 @@ object StateSourceOptions extends DataSourceOptions {
       )
     }
 
-    if (startOperatorStateUniqueIds.isDefined) {
-      if (fromSnapshotOptions.isDefined) {
-        throw StateDataSourceErrors.invalidOptionValue(
-          SNAPSHOT_START_BATCH_ID,
-          "Snapshot reading is currently not supported with checkpoint v2.")
-      }
-    }
-
     StateSourceOptions(
       resolvedCpLocation, batchId.get, operatorId, storeName, joinSide,
       readChangeFeed, fromSnapshotOptions, readChangeFeedOptions,
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/state/StatePartitionReader.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/state/StatePartitionReader.scala
index 7180fe483fcc1..619e374c00def 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/state/StatePartitionReader.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/state/StatePartitionReader.scala
@@ -206,7 +206,9 @@ class StatePartitionReader(
         provider.asInstanceOf[SupportsFineGrainedReplay]
           .replayReadStateFromSnapshot(
             fromSnapshotOptions.snapshotStartBatchId + 1,
-            partition.sourceOptions.batchId + 1)
+            partition.sourceOptions.batchId + 1,
+            getStartStoreUniqueId,
+            getEndStoreUniqueId)
     }
   }
 
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/state/StreamStreamJoinStatePartitionReader.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/state/StreamStreamJoinStatePartitionReader.scala
index bf0e8968789c9..4946977e72b7e 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/state/StreamStreamJoinStatePartitionReader.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/state/StreamStreamJoinStatePartitionReader.scala
@@ -24,7 +24,7 @@ import org.apache.spark.sql.connector.read.{InputPartition, PartitionReader, Par
 import org.apache.spark.sql.execution.datasources.v2.state.StateSourceOptions.JoinSideValues
 import org.apache.spark.sql.execution.datasources.v2.state.utils.SchemaUtil
 import org.apache.spark.sql.execution.streaming.operators.stateful.StatefulOperatorStateInfo
-import org.apache.spark.sql.execution.streaming.operators.stateful.join.{JoinStateManagerStoreGenerator, SymmetricHashJoinStateManager}
+import org.apache.spark.sql.execution.streaming.operators.stateful.join.{JoinStateManagerStoreGenerator, SnapshotOptions, SymmetricHashJoinStateManager}
 import org.apache.spark.sql.execution.streaming.operators.stateful.join.StreamingSymmetricHashJoinHelper.{JoinSide, LeftSide, RightSide}
 import org.apache.spark.sql.execution.streaming.state.StateStoreConf
 import org.apache.spark.sql.types.{BooleanType, StructType}
@@ -78,22 +78,40 @@ class StreamStreamJoinStatePartitionReader(
 
   private val startStateStoreCheckpointIds =
     SymmetricHashJoinStateManager.getStateStoreCheckpointIds(
-    partition.partition,
-    partition.sourceOptions.startOperatorStateUniqueIds,
-    usesVirtualColumnFamilies)
+      partition.partition,
+      partition.sourceOptions.startOperatorStateUniqueIds,
+      usesVirtualColumnFamilies)
 
-  private val keyToNumValuesStateStoreCkptId = if (joinSide == LeftSide) {
+  private val endStateStoreCheckpointIds =
+    SymmetricHashJoinStateManager.getStateStoreCheckpointIds(
+      partition.partition,
+      partition.sourceOptions.endOperatorStateUniqueIds,
+      usesVirtualColumnFamilies)
+
+  private val startKeyToNumValuesStateStoreCkptId = if (joinSide == LeftSide) {
     startStateStoreCheckpointIds.left.keyToNumValues
   } else {
     startStateStoreCheckpointIds.right.keyToNumValues
   }
 
-  private val keyWithIndexToValueStateStoreCkptId = if (joinSide == LeftSide) {
+  private val startKeyWithIndexToValueStateStoreCkptId = if (joinSide == LeftSide) {
     startStateStoreCheckpointIds.left.keyWithIndexToValue
   } else {
     startStateStoreCheckpointIds.right.keyWithIndexToValue
   }
 
+  private val endKeyToNumValuesStateStoreCkptId = if (joinSide == LeftSide) {
+    endStateStoreCheckpointIds.left.keyToNumValues
+  } else {
+    endStateStoreCheckpointIds.right.keyToNumValues
+  }
+
+  private val endKeyWithIndexToValueStateStoreCkptId = if (joinSide == LeftSide) {
+    endStateStoreCheckpointIds.left.keyWithIndexToValue
+  } else {
+    endStateStoreCheckpointIds.right.keyWithIndexToValue
+  }
+
   /*
    * This is to handle the difference of schema across state format versions. The major difference
    * is whether we have added new field(s) in addition to the fields from input schema.
@@ -150,13 +168,19 @@ class StreamStreamJoinStatePartitionReader(
         storeConf = storeConf,
         hadoopConf = hadoopConf.value,
         partitionId = partition.partition,
-        keyToNumValuesStateStoreCkptId = keyToNumValuesStateStoreCkptId,
-        keyWithIndexToValueStateStoreCkptId = keyWithIndexToValueStateStoreCkptId,
+        keyToNumValuesStateStoreCkptId = startKeyToNumValuesStateStoreCkptId,
+        keyWithIndexToValueStateStoreCkptId = startKeyWithIndexToValueStateStoreCkptId,
         formatVersion,
         skippedNullValueCount = None,
         useStateStoreCoordinator = false,
-        snapshotStartVersion =
-          partition.sourceOptions.fromSnapshotOptions.map(_.snapshotStartBatchId + 1),
+        snapshotOptions =
+          partition.sourceOptions.fromSnapshotOptions.map(opts => SnapshotOptions(
+            snapshotVersion = opts.snapshotStartBatchId + 1,
+            endVersion = partition.sourceOptions.batchId + 1,
+            startKeyToNumValuesStateStoreCkptId = startKeyToNumValuesStateStoreCkptId,
+            startKeyWithIndexToValueStateStoreCkptId = startKeyWithIndexToValueStateStoreCkptId,
+            endKeyToNumValuesStateStoreCkptId = endKeyToNumValuesStateStoreCkptId,
+            endKeyWithIndexToValueStateStoreCkptId = endKeyWithIndexToValueStateStoreCkptId)),
         joinStoreGenerator = new JoinStateManagerStoreGenerator()
       )
     }
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/join/SymmetricHashJoinStateManager.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/join/SymmetricHashJoinStateManager.scala
index c0965747722e5..579267892abd8 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/join/SymmetricHashJoinStateManager.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/join/SymmetricHashJoinStateManager.scala
@@ -59,6 +59,8 @@ import org.apache.spark.util.NextIterator
  *                                  store providers being used in this class. If true, Spark will
  *                                  take care of management for state store providers, e.g. running
  *                                  maintenance task for these providers.
+ * @param snapshotOptions       Options controlling snapshot-based state replay for the state data
+ *                              source reader.
  * @param joinStoreGenerator    The generator to create state store instances, re-using the same
  *                              instance when the join implementation uses virtual column families
  *                              for join version 3.
@@ -95,15 +97,20 @@ abstract class SymmetricHashJoinStateManager(
     stateFormatVersion: Int,
     skippedNullValueCount: Option[SQLMetric] = None,
     useStateStoreCoordinator: Boolean = true,
-    snapshotStartVersion: Option[Long] = None,
+    snapshotOptions: Option[SnapshotOptions] = None,
     joinStoreGenerator: JoinStateManagerStoreGenerator) extends Logging {
   import SymmetricHashJoinStateManager._
 
   protected val keySchema = StructType(
     joinKeys.zipWithIndex.map { case (k, i) => StructField(s"field$i", k.dataType, k.nullable) })
   protected val keyAttributes = toAttributes(keySchema)
-  protected val keyToNumValues = new KeyToNumValuesStore(stateFormatVersion)
-  protected val keyWithIndexToValue = new KeyWithIndexToValueStore(stateFormatVersion)
+
+  protected val keyToNumValues = new KeyToNumValuesStore(
+    stateFormatVersion,
+    snapshotOptions.map(_.getKeyToNumValuesHandlerOpts()))
+  protected val keyWithIndexToValue = new KeyWithIndexToValueStore(
+    stateFormatVersion,
+    snapshotOptions.map(_.getKeyWithIndexToValueHandlerOpts()))
 
   /*
   =====================================================
@@ -456,7 +463,8 @@ abstract class SymmetricHashJoinStateManager(
   /** Helper trait for invoking common functionalities of a state store. */
   protected abstract class StateStoreHandler(
       stateStoreType: StateStoreType,
-      stateStoreCkptId: Option[String]) extends Logging {
+      stateStoreCkptId: Option[String],
+      handlerSnapshotOptions: Option[HandlerSnapshotOptions] = None) extends Logging {
     private var stateStoreProvider: StateStoreProvider = _
 
     /** StateStore that the subclasses of this class is going to operate on */
@@ -497,7 +505,7 @@ abstract class SymmetricHashJoinStateManager(
       }
       val storeProviderId = StateStoreProviderId(stateInfo.get, partitionId, storeName)
       val store = if (useStateStoreCoordinator) {
-        assert(snapshotStartVersion.isEmpty, "Should not use state store coordinator " +
+        assert(handlerSnapshotOptions.isEmpty, "Should not use state store coordinator " +
           "when reading state as data source.")
         joinStoreGenerator.getStore(
           storeProviderId, keySchema, valueSchema, NoPrefixKeyStateEncoderSpec(keySchema),
@@ -509,13 +517,19 @@ abstract class SymmetricHashJoinStateManager(
           storeProviderId, keySchema, valueSchema, NoPrefixKeyStateEncoderSpec(keySchema),
           useColumnFamilies = useVirtualColumnFamilies, storeConf, hadoopConf,
           useMultipleValuesPerKey = false, stateSchemaProvider = None)
-        if (snapshotStartVersion.isDefined) {
+        if (handlerSnapshotOptions.isDefined) {
           if (!stateStoreProvider.isInstanceOf[SupportsFineGrainedReplay]) {
             throw StateStoreErrors.stateStoreProviderDoesNotSupportFineGrainedReplay(
               stateStoreProvider.getClass.toString)
           }
+          val opts = handlerSnapshotOptions.get
           stateStoreProvider.asInstanceOf[SupportsFineGrainedReplay]
-            .replayStateFromSnapshot(snapshotStartVersion.get, stateInfo.get.storeVersion)
+            .replayStateFromSnapshot(
+              opts.snapshotVersion,
+              opts.endVersion,
+              readOnly = true,
+              opts.startStateStoreCkptId,
+              opts.endStateStoreCkptId)
         } else {
           stateStoreProvider.getStore(stateInfo.get.storeVersion, stateStoreCkptId)
         }
@@ -539,9 +553,12 @@ abstract class SymmetricHashJoinStateManager(
 
 
   /** A wrapper around a [[StateStore]] that stores [key -> number of values]. */
-  protected class KeyToNumValuesStore(val stateFormatVersion: Int)
-    extends StateStoreHandler(KeyToNumValuesType, keyToNumValuesStateStoreCkptId) {
-
+  protected class KeyToNumValuesStore(
+      val stateFormatVersion: Int,
+      val handlerSnapshotOptions: Option[HandlerSnapshotOptions] = None)
+    extends StateStoreHandler(
+      KeyToNumValuesType, keyToNumValuesStateStoreCkptId, handlerSnapshotOptions) {
+SnapshotOptions
     private val useVirtualColumnFamilies = stateFormatVersion == 3
     private val longValueSchema = new StructType().add("value", "long")
     private val longToUnsafeRow = UnsafeProjection.create(longValueSchema)
@@ -707,8 +724,11 @@ abstract class SymmetricHashJoinStateManager(
    * A wrapper around a [[StateStore]] that stores the mapping; the mapping depends on the
    * state format version - please refer implementations of [[KeyWithIndexToValueRowConverter]].
    */
-  protected class KeyWithIndexToValueStore(stateFormatVersion: Int)
-    extends StateStoreHandler(KeyWithIndexToValueType, keyWithIndexToValueStateStoreCkptId) {
+  protected class KeyWithIndexToValueStore(
+      stateFormatVersion: Int,
+      handlerSnapshotOptions: Option[HandlerSnapshotOptions] = None)
+    extends StateStoreHandler(
+      KeyWithIndexToValueType, keyWithIndexToValueStateStoreCkptId, handlerSnapshotOptions) {
 
     private val useVirtualColumnFamilies = stateFormatVersion == 3
     private val keyWithIndexExprs = keyAttributes :+ Literal(1L)
@@ -848,11 +868,11 @@ class SymmetricHashJoinStateManagerV1(
     stateFormatVersion: Int,
     skippedNullValueCount: Option[SQLMetric] = None,
     useStateStoreCoordinator: Boolean = true,
-    snapshotStartVersion: Option[Long] = None,
+    snapshotOptions: Option[SnapshotOptions] = None,
     joinStoreGenerator: JoinStateManagerStoreGenerator) extends SymmetricHashJoinStateManager(
   joinSide, inputValueAttributes, joinKeys, stateInfo, storeConf, hadoopConf,
   partitionId, keyToNumValuesStateStoreCkptId, keyWithIndexToValueStateStoreCkptId,
-  stateFormatVersion, skippedNullValueCount, useStateStoreCoordinator, snapshotStartVersion,
+  stateFormatVersion, skippedNullValueCount, useStateStoreCoordinator, snapshotOptions,
   joinStoreGenerator) {
 
   /** Commit all the changes to all the state stores */
@@ -927,11 +947,11 @@ class SymmetricHashJoinStateManagerV2(
     stateFormatVersion: Int,
     skippedNullValueCount: Option[SQLMetric] = None,
     useStateStoreCoordinator: Boolean = true,
-    snapshotStartVersion: Option[Long] = None,
+    snapshotOptions: Option[SnapshotOptions] = None,
     joinStoreGenerator: JoinStateManagerStoreGenerator) extends SymmetricHashJoinStateManager(
   joinSide, inputValueAttributes, joinKeys, stateInfo, storeConf, hadoopConf,
   partitionId, keyToNumValuesStateStoreCkptId, keyWithIndexToValueStateStoreCkptId,
-  stateFormatVersion, skippedNullValueCount, useStateStoreCoordinator, snapshotStartVersion,
+  stateFormatVersion, skippedNullValueCount, useStateStoreCoordinator, snapshotOptions,
   joinStoreGenerator) {
 
   /** Commit all the changes to the state store */
@@ -1034,20 +1054,20 @@ object SymmetricHashJoinStateManager {
       stateFormatVersion: Int,
       skippedNullValueCount: Option[SQLMetric] = None,
       useStateStoreCoordinator: Boolean = true,
-      snapshotStartVersion: Option[Long] = None,
+      snapshotOptions: Option[SnapshotOptions] = None,
       joinStoreGenerator: JoinStateManagerStoreGenerator): SymmetricHashJoinStateManager = {
     if (stateFormatVersion == 3) {
       new SymmetricHashJoinStateManagerV2(
         joinSide, inputValueAttributes, joinKeys, stateInfo, storeConf, hadoopConf,
         partitionId, keyToNumValuesStateStoreCkptId, keyWithIndexToValueStateStoreCkptId,
-        stateFormatVersion, skippedNullValueCount, useStateStoreCoordinator, snapshotStartVersion,
+        stateFormatVersion, skippedNullValueCount, useStateStoreCoordinator, snapshotOptions,
         joinStoreGenerator
       )
     } else {
       new SymmetricHashJoinStateManagerV1(
         joinSide, inputValueAttributes, joinKeys, stateInfo, storeConf, hadoopConf,
         partitionId, keyToNumValuesStateStoreCkptId, keyWithIndexToValueStateStoreCkptId,
-        stateFormatVersion, skippedNullValueCount, useStateStoreCoordinator, snapshotStartVersion,
+        stateFormatVersion, skippedNullValueCount, useStateStoreCoordinator, snapshotOptions,
         joinStoreGenerator
       )
     }
@@ -1280,3 +1300,36 @@ object SymmetricHashJoinStateManager {
     }
   }
 }
+
+/**
+ * Options controlling snapshot-based state replay for state data source reader.
+ */
+case class SnapshotOptions(
+    snapshotVersion: Long,
+    endVersion: Long,
+    startKeyToNumValuesStateStoreCkptId: Option[String] = None,
+    startKeyWithIndexToValueStateStoreCkptId: Option[String] = None,
+    endKeyToNumValuesStateStoreCkptId: Option[String] = None,
+    endKeyWithIndexToValueStateStoreCkptId: Option[String] = None) {
+
+  def getKeyToNumValuesHandlerOpts(): HandlerSnapshotOptions =
+    HandlerSnapshotOptions(
+      snapshotVersion = snapshotVersion,
+      endVersion = endVersion,
+      startStateStoreCkptId = startKeyToNumValuesStateStoreCkptId,
+      endStateStoreCkptId = endKeyToNumValuesStateStoreCkptId)
+
+  def getKeyWithIndexToValueHandlerOpts(): HandlerSnapshotOptions =
+    HandlerSnapshotOptions(
+      snapshotVersion = snapshotVersion,
+      endVersion = endVersion,
+      startStateStoreCkptId = startKeyWithIndexToValueStateStoreCkptId,
+      endStateStoreCkptId = endKeyWithIndexToValueStateStoreCkptId)
+}
+
+/** Snapshot options specialized for a single state store handler. */
+private[join] case class HandlerSnapshotOptions(
+    snapshotVersion: Long,
+    endVersion: Long,
+    startStateStoreCkptId: Option[String],
+    endStateStoreCkptId: Option[String])
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/HDFSBackedStateStoreProvider.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/HDFSBackedStateStoreProvider.scala
index f37a26012e222..b0e6c2df1bd37 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/HDFSBackedStateStoreProvider.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/HDFSBackedStateStoreProvider.scala
@@ -972,10 +972,22 @@ private[sql] class HDFSBackedStateStoreProvider extends StateStoreProvider with
    *
    * @param snapshotVersion checkpoint version of the snapshot to start with
    * @param endVersion   checkpoint version to end with
+   * @param readOnly whether the state store should be read-only
+   * @param snapshotVersionStateStoreCkptId state store checkpoint ID of the snapshot version
+   * @param endVersionStateStoreCkptId state store checkpoint ID of the end version
    * @return [[HDFSBackedStateStore]]
    */
   override def replayStateFromSnapshot(
-      snapshotVersion: Long, endVersion: Long, readOnly: Boolean): StateStore = {
+      snapshotVersion: Long,
+      endVersion: Long,
+      readOnly: Boolean,
+      snapshotVersionStateStoreCkptId: Option[String] = None,
+      endVersionStateStoreCkptId: Option[String] = None): StateStore = {
+    if (snapshotVersionStateStoreCkptId.isDefined || endVersionStateStoreCkptId.isDefined) {
+      throw StateStoreErrors.stateStoreCheckpointIdsNotSupported(
+        "HDFSBackedStateStoreProvider does not support checkpointFormatVersion > 1 " +
+        "but a state store checkpointID is passed in")
+    }
     val newMap = replayLoadedMapFromSnapshot(snapshotVersion, endVersion)
     logInfo(log"Retrieved snapshot at version " +
       log"${MDC(LogKeys.STATE_STORE_VERSION, snapshotVersion)} and apply delta files to version " +
@@ -990,10 +1002,21 @@ private[sql] class HDFSBackedStateStoreProvider extends StateStoreProvider with
    *
    * @param snapshotVersion checkpoint version of the snapshot to start with
    * @param endVersion   checkpoint version to end with
+   * @param snapshotVersionStateStoreCkptId state store checkpoint ID of the snapshot version
+   * @param endVersionStateStoreCkptId state store checkpoint ID of the end version
    * @return [[HDFSBackedReadStateStore]]
    */
-  override def replayReadStateFromSnapshot(snapshotVersion: Long, endVersion: Long):
+  override def replayReadStateFromSnapshot(
+      snapshotVersion: Long,
+      endVersion: Long,
+      snapshotVersionStateStoreCkptId: Option[String] = None,
+      endVersionStateStoreCkptId: Option[String] = None):
     ReadStateStore = {
+    if (snapshotVersionStateStoreCkptId.isDefined || endVersionStateStoreCkptId.isDefined) {
+      throw StateStoreErrors.stateStoreCheckpointIdsNotSupported(
+        "HDFSBackedStateStoreProvider does not support checkpointFormatVersion > 1 " +
+        "but a state store checkpointID is passed in")
+    }
     val newMap = replayLoadedMapFromSnapshot(snapshotVersion, endVersion)
     logInfo(log"Retrieved snapshot at version " +
       log"${MDC(LogKeys.STATE_STORE_VERSION, snapshotVersion)} and apply delta files to version " +
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDB.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDB.scala
index 1e65b737e2bf5..651617119f45a 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDB.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDB.scala
@@ -677,13 +677,20 @@ class RocksDB(
    *
    * @param snapshotVersion version of the snapshot to start with
    * @param endVersion end version
+   * @param snapshotVersionStateStoreCkptId state store checkpoint ID of the snapshot version
+   * @param endVersionStateStoreCkptId state store checkpoint ID of the end version
    * @return A RocksDB instance loaded with the state endVersion replayed from snapshotVersion.
    *         Note that the instance will be read-only since this method is only used in State Data
    *         Source.
    */
-  def loadFromSnapshot(snapshotVersion: Long, endVersion: Long): RocksDB = {
+  def loadFromSnapshot(
+      snapshotVersion: Long,
+      endVersion: Long,
+      snapshotVersionStateStoreCkptId: Option[String] = None,
+      endVersionStateStoreCkptId: Option[String] = None): RocksDB = {
     val startTime = System.currentTimeMillis()
 
+    assert(snapshotVersionStateStoreCkptId.isDefined == endVersionStateStoreCkptId.isDefined)
     assert(snapshotVersion >= 0 && endVersion >= snapshotVersion)
     recordedMetrics = None
     loadMetrics.clear()
@@ -692,7 +699,11 @@ class RocksDB(
       log"Loading snapshot at version ${MDC(LogKeys.VERSION_NUM, snapshotVersion)} and apply " +
       log"changelog files to version ${MDC(LogKeys.VERSION_NUM, endVersion)}.")
     try {
-      replayFromCheckpoint(snapshotVersion, endVersion)
+      replayFromCheckpoint(
+        snapshotVersion,
+        endVersion,
+        snapshotVersionStateStoreCkptId,
+        endVersionStateStoreCkptId)
 
       logInfo(
         log"Loaded snapshot at version ${MDC(LogKeys.VERSION_NUM, snapshotVersion)} and apply " +
@@ -720,11 +731,19 @@ class RocksDB(
    *
    * @param snapshotVersion start checkpoint version
    * @param endVersion end version
+   * @param snapshotVersionStateStoreCkptId state store checkpoint ID of the snapshot version
+   * @param endVersionStateStoreCkptId state store checkpoint ID of the end version
    */
-  private def replayFromCheckpoint(snapshotVersion: Long, endVersion: Long): Any = {
+  private def replayFromCheckpoint(
+      snapshotVersion: Long,
+      endVersion: Long,
+      snapshotVersionStateStoreCkptId: Option[String] = None,
+      endVersionStateStoreCkptId: Option[String] = None): Any = {
+    assert(snapshotVersionStateStoreCkptId.isDefined == endVersionStateStoreCkptId.isDefined)
+
     closeDB()
     val metadata = fileManager.loadCheckpointFromDfs(snapshotVersion,
-      workingDir, rocksDBFileMapping)
+      workingDir, rocksDBFileMapping, snapshotVersionStateStoreCkptId)
     loadedVersion = snapshotVersion
     lastSnapshotVersion = snapshotVersion
 
@@ -756,7 +775,17 @@ class RocksDB(
 
     if (loadedVersion != endVersion) {
       val versionsAndUniqueIds: Array[(Long, Option[String])] =
+      if (endVersionStateStoreCkptId.isDefined) {
+        val fullVersionLineage = getFullLineage(
+          loadedVersion + 1,
+          endVersion,
+          endVersionStateStoreCkptId)
+        fullVersionLineage
+          .sortBy(_.version)
+          .map(item => (item.version, Some(item.checkpointUniqueId)))
+      } else {
         (loadedVersion + 1 to endVersion).map((_, None)).toArray
+      }
       replayChangelog(versionsAndUniqueIds)
       loadedVersion = endVersion
     }
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDBFileManager.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDBFileManager.scala
index 0063f960c4757..2015a5e27a2c0 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDBFileManager.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDBFileManager.scala
@@ -42,7 +42,6 @@ import org.apache.spark.internal.LogKeys.{DFS_FILE, VERSION_NUM}
 import org.apache.spark.io.CompressionCodec
 import org.apache.spark.sql.errors.QueryExecutionErrors
 import org.apache.spark.sql.execution.streaming.checkpointing.CheckpointFileManager
-import org.apache.spark.sql.internal.SQLConf
 import org.apache.spark.util.ArrayImplicits._
 import org.apache.spark.util.Utils
 
@@ -1032,7 +1031,7 @@ case class RocksDBCheckpointMetadata(
 
 /** Helper class for [[RocksDBCheckpointMetadata]] */
 object RocksDBCheckpointMetadata {
-  val VERSION = SQLConf.get.stateStoreCheckpointFormatVersion
+  val VERSION = 1
 
   implicit val format: Formats = Serialization.formats(NoTypeHints)
 
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDBStateStoreProvider.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDBStateStoreProvider.scala
index ce2a216534ea0..edcebca466a53 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDBStateStoreProvider.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDBStateStoreProvider.scala
@@ -844,10 +844,17 @@ private[sql] class RocksDBStateStoreProvider
    *
    * @param snapshotVersion checkpoint version of the snapshot to start with
    * @param endVersion   checkpoint version to end with
+   * @param readOnly whether the state store should be read-only
+   * @param snapshotVersionStateStoreCkptId state store checkpoint ID of the snapshot version
+   * @param endVersionStateStoreCkptId state store checkpoint ID of the end version
    * @return [[StateStore]]
    */
   override def replayStateFromSnapshot(
-      snapshotVersion: Long, endVersion: Long, readOnly: Boolean): StateStore = {
+      snapshotVersion: Long,
+      endVersion: Long,
+      readOnly: Boolean,
+      snapshotVersionStateStoreCkptId: Option[String] = None,
+      endVersionStateStoreCkptId: Option[String] = None): StateStore = {
     try {
       if (snapshotVersion < 1) {
         throw QueryExecutionErrors.unexpectedStateStoreVersion(snapshotVersion)
@@ -857,7 +864,11 @@ private[sql] class RocksDBStateStoreProvider
       }
       val stamp = stateMachine.acquireStamp()
       try {
-        rocksDB.loadFromSnapshot(snapshotVersion, endVersion)
+        rocksDB.loadFromSnapshot(
+          snapshotVersion,
+          endVersion,
+          snapshotVersionStateStoreCkptId,
+          endVersionStateStoreCkptId)
         new RocksDBStateStore(endVersion, stamp, readOnly)
       } catch {
         case e: Throwable =>
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/StateStore.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/StateStore.scala
index f94eecd1dd422..701b51a896a66 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/StateStore.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/StateStore.scala
@@ -799,9 +799,17 @@ trait SupportsFineGrainedReplay {
    *
    * @param snapshotVersion checkpoint version of the snapshot to start with
    * @param endVersion   checkpoint version to end with
+   * @param readOnly whether the state store should be read-only
+   * @param snapshotVersionStateStoreCkptId state store checkpoint ID of the snapshot version
+   * @param endVersionStateStoreCkptId state store checkpoint ID of the end version
+   * @return An instance of [[StateStore]] representing state data of the given version
    */
   def replayStateFromSnapshot(
-      snapshotVersion: Long, endVersion: Long, readOnly: Boolean = false): StateStore
+      snapshotVersion: Long,
+      endVersion: Long,
+      readOnly: Boolean = false,
+      snapshotVersionStateStoreCkptId: Option[String] = None,
+      endVersionStateStoreCkptId: Option[String] = None): StateStore
 
   /**
    * Return an instance of [[ReadStateStore]] representing state data of the given version.
@@ -812,9 +820,22 @@ trait SupportsFineGrainedReplay {
    *
    * @param snapshotVersion checkpoint version of the snapshot to start with
    * @param endVersion   checkpoint version to end with
+   * @param snapshotVersionStateStoreCkptId state store checkpoint ID of the snapshot version
+   * @param endVersionStateStoreCkptId state store checkpoint ID of the end version
+   * @return An instance of [[ReadStateStore]] representing state data of the given version
    */
-  def replayReadStateFromSnapshot(snapshotVersion: Long, endVersion: Long): ReadStateStore = {
-    new WrappedReadStateStore(replayStateFromSnapshot(snapshotVersion, endVersion, readOnly = true))
+  def replayReadStateFromSnapshot(
+      snapshotVersion: Long,
+      endVersion: Long,
+      snapshotVersionStateStoreCkptId: Option[String] = None,
+      endVersionStateStoreCkptId: Option[String] = None): ReadStateStore = {
+    new WrappedReadStateStore(
+      replayStateFromSnapshot(
+        snapshotVersion,
+        endVersion,
+        readOnly = true,
+        snapshotVersionStateStoreCkptId,
+        endVersionStateStoreCkptId))
   }
 
   /**
@@ -828,6 +849,7 @@ trait SupportsFineGrainedReplay {
    * @param startVersion starting changelog version
    * @param endVersion ending changelog version
    * @param colFamilyNameOpt optional column family name to read from
+   * @param endVersionStateStoreCkptId state store checkpoint ID of the end version
    * @return iterator that gives tuple(recordType: [[RecordType.Value]], nested key: [[UnsafeRow]],
    *         nested value: [[UnsafeRow]], batchId: [[Long]])
    */
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/.metadata.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/.metadata.crc
new file mode 100644
index 0000000000000..0077d932abb16
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/.metadata.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/.0.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/.0.crc
new file mode 100644
index 0000000000000..6517c631b5dc8
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/.0.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/.1.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/.1.crc
new file mode 100644
index 0000000000000..39f2f14a006c1
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/.1.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/.2.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/.2.crc
new file mode 100644
index 0000000000000..662bf12a1e70a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/.2.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/.3.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/.3.crc
new file mode 100644
index 0000000000000..56298bcef36aa
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/.3.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/0 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/0
new file mode 100644
index 0000000000000..36accb022a9f8
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/0
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":0,"stateUniqueIds":{"0":[["502abf89-6c11-49e0-b008-5e2f90008d17"],["d9007f70-cd0c-43ef-9389-afcec6b669a4"],["d5647a99-4b94-4683-ae80-67db2b5d40b8"],["385921b6-ce74-4827-9294-d7b7b5cd8374"],["c6a353ef-6d1b-4d80-8cc8-ed61f286ef96"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/1 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/1
new file mode 100644
index 0000000000000..519a920cb76f7
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/1
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":0,"stateUniqueIds":{"0":[["c80c40ef-6092-497d-badd-733e1cc8929f"],["3f85db1c-439d-413c-920d-aa7fe300f9af"],["35b5e88f-381b-4d77-bcae-77c70d54b4b9"],["67f09fbd-c2af-4bf6-a1d0-8bca968ac2e6"],["793e52db-29f8-4304-9863-fccc9fc95314"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/2 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/2
new file mode 100644
index 0000000000000..1ab5db959cba7
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/2
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":0,"stateUniqueIds":{"0":[["02123a76-a01a-4304-8094-802f16d55e31"],["e27e4639-ab69-483c-bf19-f9daec0d8328"],["ec14cef6-eadb-4493-962c-e108b5b8acae"],["1cdac062-90db-4c25-986c-68eecec0c062"],["ce2bc745-a873-47e1-8dab-a4a90e9e9b80"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/3 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/3
new file mode 100644
index 0000000000000..3650c98d3e91e
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/commits/3
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":0,"stateUniqueIds":{"0":[["bf826c41-d5f6-4abb-bf56-379167c045cd"],["e2a4feae-a4e3-4183-b07b-db9b8e0794a5"],["64a2a298-f3f7-4670-9629-c36cd3fac1ea"],["bfdda7d9-f699-4e2b-acbd-8cf1687fd017"],["54731796-ed79-463f-a4ee-fbd027dc3374"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/metadata b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/metadata
new file mode 100644
index 0000000000000..63a519624fda1
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/metadata
@@ -0,0 +1 @@
+{"id":"ccaf96d0-9b51-437a-a2c6-f53efd7e6be4"}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/.0.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/.0.crc
new file mode 100644
index 0000000000000..ef6f303c7d1b3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/.0.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/.1.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/.1.crc
new file mode 100644
index 0000000000000..71d0ec9ffabe0
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/.1.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/.2.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/.2.crc
new file mode 100644
index 0000000000000..c7fa59377427a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/.2.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/.3.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/.3.crc
new file mode 100644
index 0000000000000..23efae5598460
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/.3.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/0 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/0
new file mode 100644
index 0000000000000..c8afa546745c6
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/0
@@ -0,0 +1,3 @@
+v1
+{"batchWatermarkMs":0,"batchTimestampMs":1757005975492,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"3","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+0
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/1 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/1
new file mode 100644
index 0000000000000..59cc15d2007de
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/1
@@ -0,0 +1,3 @@
+v1
+{"batchWatermarkMs":0,"batchTimestampMs":1757005979699,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"3","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+1
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/2 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/2
new file mode 100644
index 0000000000000..70eb97a4da27e
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/2
@@ -0,0 +1,3 @@
+v1
+{"batchWatermarkMs":0,"batchTimestampMs":1757005982176,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"3","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+2
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/3 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/3
new file mode 100644
index 0000000000000..35f0a86c477d7
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/offsets/3
@@ -0,0 +1,3 @@
+v1
+{"batchWatermarkMs":0,"batchTimestampMs":1757005984499,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"3","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+3
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.1_502abf89-6c11-49e0-b008-5e2f90008d17.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.1_502abf89-6c11-49e0-b008-5e2f90008d17.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.1_502abf89-6c11-49e0-b008-5e2f90008d17.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.2_c80c40ef-6092-497d-badd-733e1cc8929f.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.2_c80c40ef-6092-497d-badd-733e1cc8929f.changelog.crc
new file mode 100644
index 0000000000000..1cfdb6a5856c3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.2_c80c40ef-6092-497d-badd-733e1cc8929f.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.2_c80c40ef-6092-497d-badd-733e1cc8929f.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.2_c80c40ef-6092-497d-badd-733e1cc8929f.zip.crc
new file mode 100644
index 0000000000000..bf0ca1026aedb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.2_c80c40ef-6092-497d-badd-733e1cc8929f.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.3_02123a76-a01a-4304-8094-802f16d55e31.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.3_02123a76-a01a-4304-8094-802f16d55e31.changelog.crc
new file mode 100644
index 0000000000000..7f2380c99314b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.3_02123a76-a01a-4304-8094-802f16d55e31.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.4_bf826c41-d5f6-4abb-bf56-379167c045cd.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.4_bf826c41-d5f6-4abb-bf56-379167c045cd.changelog.crc
new file mode 100644
index 0000000000000..6978c3c8fd743
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.4_bf826c41-d5f6-4abb-bf56-379167c045cd.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.4_bf826c41-d5f6-4abb-bf56-379167c045cd.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.4_bf826c41-d5f6-4abb-bf56-379167c045cd.zip.crc
new file mode 100644
index 0000000000000..871b75b09a264
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/.4_bf826c41-d5f6-4abb-bf56-379167c045cd.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/1_502abf89-6c11-49e0-b008-5e2f90008d17.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/1_502abf89-6c11-49e0-b008-5e2f90008d17.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/1_502abf89-6c11-49e0-b008-5e2f90008d17.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/2_c80c40ef-6092-497d-badd-733e1cc8929f.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/2_c80c40ef-6092-497d-badd-733e1cc8929f.changelog
new file mode 100644
index 0000000000000..8a3a8b03482b5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/2_c80c40ef-6092-497d-badd-733e1cc8929f.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/2_c80c40ef-6092-497d-badd-733e1cc8929f.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/2_c80c40ef-6092-497d-badd-733e1cc8929f.zip
new file mode 100644
index 0000000000000..c438e58056974
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/2_c80c40ef-6092-497d-badd-733e1cc8929f.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/3_02123a76-a01a-4304-8094-802f16d55e31.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/3_02123a76-a01a-4304-8094-802f16d55e31.changelog
new file mode 100644
index 0000000000000..3c5d660a67660
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/3_02123a76-a01a-4304-8094-802f16d55e31.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/4_bf826c41-d5f6-4abb-bf56-379167c045cd.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/4_bf826c41-d5f6-4abb-bf56-379167c045cd.changelog
new file mode 100644
index 0000000000000..3fd7558f5ee35
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/4_bf826c41-d5f6-4abb-bf56-379167c045cd.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/4_bf826c41-d5f6-4abb-bf56-379167c045cd.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/4_bf826c41-d5f6-4abb-bf56-379167c045cd.zip
new file mode 100644
index 0000000000000..b7c537c2f6708
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/4_bf826c41-d5f6-4abb-bf56-379167c045cd.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/_metadata/.schema.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/_metadata/.schema.crc
new file mode 100644
index 0000000000000..3275b7dbda7a4
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/_metadata/.schema.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/_metadata/schema b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/_metadata/schema
new file mode 100644
index 0000000000000..70ebb77e1b781
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/0/_metadata/schema differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.1_d9007f70-cd0c-43ef-9389-afcec6b669a4.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.1_d9007f70-cd0c-43ef-9389-afcec6b669a4.changelog.crc
new file mode 100644
index 0000000000000..dc44db792fea2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.1_d9007f70-cd0c-43ef-9389-afcec6b669a4.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.2_3f85db1c-439d-413c-920d-aa7fe300f9af.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.2_3f85db1c-439d-413c-920d-aa7fe300f9af.changelog.crc
new file mode 100644
index 0000000000000..475e45be6c793
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.2_3f85db1c-439d-413c-920d-aa7fe300f9af.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.2_3f85db1c-439d-413c-920d-aa7fe300f9af.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.2_3f85db1c-439d-413c-920d-aa7fe300f9af.zip.crc
new file mode 100644
index 0000000000000..7ea27891cb63d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.2_3f85db1c-439d-413c-920d-aa7fe300f9af.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.3_e27e4639-ab69-483c-bf19-f9daec0d8328.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.3_e27e4639-ab69-483c-bf19-f9daec0d8328.changelog.crc
new file mode 100644
index 0000000000000..d1bc70e1d71d3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.3_e27e4639-ab69-483c-bf19-f9daec0d8328.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.4_e2a4feae-a4e3-4183-b07b-db9b8e0794a5.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.4_e2a4feae-a4e3-4183-b07b-db9b8e0794a5.changelog.crc
new file mode 100644
index 0000000000000..7a92c620178f0
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.4_e2a4feae-a4e3-4183-b07b-db9b8e0794a5.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.4_e2a4feae-a4e3-4183-b07b-db9b8e0794a5.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.4_e2a4feae-a4e3-4183-b07b-db9b8e0794a5.zip.crc
new file mode 100644
index 0000000000000..43008bb32ac4c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/.4_e2a4feae-a4e3-4183-b07b-db9b8e0794a5.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/1_d9007f70-cd0c-43ef-9389-afcec6b669a4.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/1_d9007f70-cd0c-43ef-9389-afcec6b669a4.changelog
new file mode 100644
index 0000000000000..8b95d7f20c6e2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/1_d9007f70-cd0c-43ef-9389-afcec6b669a4.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/2_3f85db1c-439d-413c-920d-aa7fe300f9af.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/2_3f85db1c-439d-413c-920d-aa7fe300f9af.changelog
new file mode 100644
index 0000000000000..e2c7d563fdfa5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/2_3f85db1c-439d-413c-920d-aa7fe300f9af.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/2_3f85db1c-439d-413c-920d-aa7fe300f9af.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/2_3f85db1c-439d-413c-920d-aa7fe300f9af.zip
new file mode 100644
index 0000000000000..e402d0e3cd79a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/2_3f85db1c-439d-413c-920d-aa7fe300f9af.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/3_e27e4639-ab69-483c-bf19-f9daec0d8328.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/3_e27e4639-ab69-483c-bf19-f9daec0d8328.changelog
new file mode 100644
index 0000000000000..c692f9880c8d6
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/3_e27e4639-ab69-483c-bf19-f9daec0d8328.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/4_e2a4feae-a4e3-4183-b07b-db9b8e0794a5.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/4_e2a4feae-a4e3-4183-b07b-db9b8e0794a5.changelog
new file mode 100644
index 0000000000000..9d53943ceb435
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/4_e2a4feae-a4e3-4183-b07b-db9b8e0794a5.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/4_e2a4feae-a4e3-4183-b07b-db9b8e0794a5.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/4_e2a4feae-a4e3-4183-b07b-db9b8e0794a5.zip
new file mode 100644
index 0000000000000..43c3e7dd7d5f8
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/4_e2a4feae-a4e3-4183-b07b-db9b8e0794a5.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/SSTs/.000008-76d123c4-8ad7-4365-9c6a-632d352f04a3.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/SSTs/.000008-76d123c4-8ad7-4365-9c6a-632d352f04a3.sst.crc
new file mode 100644
index 0000000000000..34a2cbf8b7d8f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/SSTs/.000008-76d123c4-8ad7-4365-9c6a-632d352f04a3.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/SSTs/.000009-b27fc453-a65d-40d3-8c74-30157baa9099.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/SSTs/.000009-b27fc453-a65d-40d3-8c74-30157baa9099.sst.crc
new file mode 100644
index 0000000000000..e636f655df12c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/SSTs/.000009-b27fc453-a65d-40d3-8c74-30157baa9099.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/SSTs/000008-76d123c4-8ad7-4365-9c6a-632d352f04a3.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/SSTs/000008-76d123c4-8ad7-4365-9c6a-632d352f04a3.sst
new file mode 100644
index 0000000000000..3fe0c70dd3a9a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/SSTs/000008-76d123c4-8ad7-4365-9c6a-632d352f04a3.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/SSTs/000009-b27fc453-a65d-40d3-8c74-30157baa9099.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/SSTs/000009-b27fc453-a65d-40d3-8c74-30157baa9099.sst
new file mode 100644
index 0000000000000..a80789c400dfd
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/1/SSTs/000009-b27fc453-a65d-40d3-8c74-30157baa9099.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.1_d5647a99-4b94-4683-ae80-67db2b5d40b8.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.1_d5647a99-4b94-4683-ae80-67db2b5d40b8.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.1_d5647a99-4b94-4683-ae80-67db2b5d40b8.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.2_35b5e88f-381b-4d77-bcae-77c70d54b4b9.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.2_35b5e88f-381b-4d77-bcae-77c70d54b4b9.changelog.crc
new file mode 100644
index 0000000000000..5e1a98fc9e2fc
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.2_35b5e88f-381b-4d77-bcae-77c70d54b4b9.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.2_35b5e88f-381b-4d77-bcae-77c70d54b4b9.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.2_35b5e88f-381b-4d77-bcae-77c70d54b4b9.zip.crc
new file mode 100644
index 0000000000000..6f983e11d1f32
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.2_35b5e88f-381b-4d77-bcae-77c70d54b4b9.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.3_ec14cef6-eadb-4493-962c-e108b5b8acae.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.3_ec14cef6-eadb-4493-962c-e108b5b8acae.changelog.crc
new file mode 100644
index 0000000000000..e0b86b1b50169
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.3_ec14cef6-eadb-4493-962c-e108b5b8acae.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.4_64a2a298-f3f7-4670-9629-c36cd3fac1ea.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.4_64a2a298-f3f7-4670-9629-c36cd3fac1ea.changelog.crc
new file mode 100644
index 0000000000000..dabf2f48f6d02
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.4_64a2a298-f3f7-4670-9629-c36cd3fac1ea.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.4_64a2a298-f3f7-4670-9629-c36cd3fac1ea.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.4_64a2a298-f3f7-4670-9629-c36cd3fac1ea.zip.crc
new file mode 100644
index 0000000000000..7ecfbf43f8b42
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/.4_64a2a298-f3f7-4670-9629-c36cd3fac1ea.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/1_d5647a99-4b94-4683-ae80-67db2b5d40b8.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/1_d5647a99-4b94-4683-ae80-67db2b5d40b8.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/1_d5647a99-4b94-4683-ae80-67db2b5d40b8.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/2_35b5e88f-381b-4d77-bcae-77c70d54b4b9.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/2_35b5e88f-381b-4d77-bcae-77c70d54b4b9.changelog
new file mode 100644
index 0000000000000..5900dd5e28c31
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/2_35b5e88f-381b-4d77-bcae-77c70d54b4b9.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/2_35b5e88f-381b-4d77-bcae-77c70d54b4b9.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/2_35b5e88f-381b-4d77-bcae-77c70d54b4b9.zip
new file mode 100644
index 0000000000000..7af036f382df4
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/2_35b5e88f-381b-4d77-bcae-77c70d54b4b9.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/3_ec14cef6-eadb-4493-962c-e108b5b8acae.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/3_ec14cef6-eadb-4493-962c-e108b5b8acae.changelog
new file mode 100644
index 0000000000000..1940add759b29
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/3_ec14cef6-eadb-4493-962c-e108b5b8acae.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/4_64a2a298-f3f7-4670-9629-c36cd3fac1ea.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/4_64a2a298-f3f7-4670-9629-c36cd3fac1ea.changelog
new file mode 100644
index 0000000000000..3538501fca865
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/4_64a2a298-f3f7-4670-9629-c36cd3fac1ea.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/4_64a2a298-f3f7-4670-9629-c36cd3fac1ea.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/4_64a2a298-f3f7-4670-9629-c36cd3fac1ea.zip
new file mode 100644
index 0000000000000..bb65dd7e40812
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/4_64a2a298-f3f7-4670-9629-c36cd3fac1ea.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/SSTs/.000008-b87b2cb5-3569-4055-a42e-138575d698ef.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/SSTs/.000008-b87b2cb5-3569-4055-a42e-138575d698ef.sst.crc
new file mode 100644
index 0000000000000..e0edfe27967e1
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/SSTs/.000008-b87b2cb5-3569-4055-a42e-138575d698ef.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/SSTs/000008-b87b2cb5-3569-4055-a42e-138575d698ef.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/SSTs/000008-b87b2cb5-3569-4055-a42e-138575d698ef.sst
new file mode 100644
index 0000000000000..5aafc84287e4c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/2/SSTs/000008-b87b2cb5-3569-4055-a42e-138575d698ef.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.1_385921b6-ce74-4827-9294-d7b7b5cd8374.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.1_385921b6-ce74-4827-9294-d7b7b5cd8374.changelog.crc
new file mode 100644
index 0000000000000..e8b64d824f817
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.1_385921b6-ce74-4827-9294-d7b7b5cd8374.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.2_67f09fbd-c2af-4bf6-a1d0-8bca968ac2e6.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.2_67f09fbd-c2af-4bf6-a1d0-8bca968ac2e6.changelog.crc
new file mode 100644
index 0000000000000..f9d76af81390d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.2_67f09fbd-c2af-4bf6-a1d0-8bca968ac2e6.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.2_67f09fbd-c2af-4bf6-a1d0-8bca968ac2e6.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.2_67f09fbd-c2af-4bf6-a1d0-8bca968ac2e6.zip.crc
new file mode 100644
index 0000000000000..256d7c5742441
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.2_67f09fbd-c2af-4bf6-a1d0-8bca968ac2e6.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.3_1cdac062-90db-4c25-986c-68eecec0c062.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.3_1cdac062-90db-4c25-986c-68eecec0c062.changelog.crc
new file mode 100644
index 0000000000000..c15537a0b0b65
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.3_1cdac062-90db-4c25-986c-68eecec0c062.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.4_bfdda7d9-f699-4e2b-acbd-8cf1687fd017.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.4_bfdda7d9-f699-4e2b-acbd-8cf1687fd017.changelog.crc
new file mode 100644
index 0000000000000..aafc88cf5d1a9
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.4_bfdda7d9-f699-4e2b-acbd-8cf1687fd017.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.4_bfdda7d9-f699-4e2b-acbd-8cf1687fd017.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.4_bfdda7d9-f699-4e2b-acbd-8cf1687fd017.zip.crc
new file mode 100644
index 0000000000000..c21c46f81032d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/.4_bfdda7d9-f699-4e2b-acbd-8cf1687fd017.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/1_385921b6-ce74-4827-9294-d7b7b5cd8374.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/1_385921b6-ce74-4827-9294-d7b7b5cd8374.changelog
new file mode 100644
index 0000000000000..8282e35d1e30a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/1_385921b6-ce74-4827-9294-d7b7b5cd8374.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/2_67f09fbd-c2af-4bf6-a1d0-8bca968ac2e6.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/2_67f09fbd-c2af-4bf6-a1d0-8bca968ac2e6.changelog
new file mode 100644
index 0000000000000..ab07e460fb05b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/2_67f09fbd-c2af-4bf6-a1d0-8bca968ac2e6.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/2_67f09fbd-c2af-4bf6-a1d0-8bca968ac2e6.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/2_67f09fbd-c2af-4bf6-a1d0-8bca968ac2e6.zip
new file mode 100644
index 0000000000000..b5fa766a01498
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/2_67f09fbd-c2af-4bf6-a1d0-8bca968ac2e6.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/3_1cdac062-90db-4c25-986c-68eecec0c062.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/3_1cdac062-90db-4c25-986c-68eecec0c062.changelog
new file mode 100644
index 0000000000000..fdb2f2a6b2ddd
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/3_1cdac062-90db-4c25-986c-68eecec0c062.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/4_bfdda7d9-f699-4e2b-acbd-8cf1687fd017.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/4_bfdda7d9-f699-4e2b-acbd-8cf1687fd017.changelog
new file mode 100644
index 0000000000000..58ec7e1429ac4
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/4_bfdda7d9-f699-4e2b-acbd-8cf1687fd017.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/4_bfdda7d9-f699-4e2b-acbd-8cf1687fd017.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/4_bfdda7d9-f699-4e2b-acbd-8cf1687fd017.zip
new file mode 100644
index 0000000000000..adfc6315b5abf
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/4_bfdda7d9-f699-4e2b-acbd-8cf1687fd017.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/SSTs/.000008-a5ac0523-cd27-4a25-b56e-9529c51ec4ea.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/SSTs/.000008-a5ac0523-cd27-4a25-b56e-9529c51ec4ea.sst.crc
new file mode 100644
index 0000000000000..8246adea11d4c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/SSTs/.000008-a5ac0523-cd27-4a25-b56e-9529c51ec4ea.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/SSTs/000008-a5ac0523-cd27-4a25-b56e-9529c51ec4ea.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/SSTs/000008-a5ac0523-cd27-4a25-b56e-9529c51ec4ea.sst
new file mode 100644
index 0000000000000..10e8cf37bac0a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/3/SSTs/000008-a5ac0523-cd27-4a25-b56e-9529c51ec4ea.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.1_c6a353ef-6d1b-4d80-8cc8-ed61f286ef96.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.1_c6a353ef-6d1b-4d80-8cc8-ed61f286ef96.changelog.crc
new file mode 100644
index 0000000000000..833da570b349e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.1_c6a353ef-6d1b-4d80-8cc8-ed61f286ef96.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.2_793e52db-29f8-4304-9863-fccc9fc95314.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.2_793e52db-29f8-4304-9863-fccc9fc95314.changelog.crc
new file mode 100644
index 0000000000000..a05d4d9639f62
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.2_793e52db-29f8-4304-9863-fccc9fc95314.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.2_793e52db-29f8-4304-9863-fccc9fc95314.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.2_793e52db-29f8-4304-9863-fccc9fc95314.zip.crc
new file mode 100644
index 0000000000000..8cac3827bfa09
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.2_793e52db-29f8-4304-9863-fccc9fc95314.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.3_ce2bc745-a873-47e1-8dab-a4a90e9e9b80.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.3_ce2bc745-a873-47e1-8dab-a4a90e9e9b80.changelog.crc
new file mode 100644
index 0000000000000..1a7650c876a3a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.3_ce2bc745-a873-47e1-8dab-a4a90e9e9b80.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.4_54731796-ed79-463f-a4ee-fbd027dc3374.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.4_54731796-ed79-463f-a4ee-fbd027dc3374.changelog.crc
new file mode 100644
index 0000000000000..7c5116adf3e24
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.4_54731796-ed79-463f-a4ee-fbd027dc3374.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.4_54731796-ed79-463f-a4ee-fbd027dc3374.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.4_54731796-ed79-463f-a4ee-fbd027dc3374.zip.crc
new file mode 100644
index 0000000000000..a46217dcd077b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/.4_54731796-ed79-463f-a4ee-fbd027dc3374.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/1_c6a353ef-6d1b-4d80-8cc8-ed61f286ef96.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/1_c6a353ef-6d1b-4d80-8cc8-ed61f286ef96.changelog
new file mode 100644
index 0000000000000..3c9844b07c176
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/1_c6a353ef-6d1b-4d80-8cc8-ed61f286ef96.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/2_793e52db-29f8-4304-9863-fccc9fc95314.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/2_793e52db-29f8-4304-9863-fccc9fc95314.changelog
new file mode 100644
index 0000000000000..a9b9e96019463
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/2_793e52db-29f8-4304-9863-fccc9fc95314.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/2_793e52db-29f8-4304-9863-fccc9fc95314.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/2_793e52db-29f8-4304-9863-fccc9fc95314.zip
new file mode 100644
index 0000000000000..1d6b921738c19
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/2_793e52db-29f8-4304-9863-fccc9fc95314.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/3_ce2bc745-a873-47e1-8dab-a4a90e9e9b80.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/3_ce2bc745-a873-47e1-8dab-a4a90e9e9b80.changelog
new file mode 100644
index 0000000000000..c4d040eff4c6c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/3_ce2bc745-a873-47e1-8dab-a4a90e9e9b80.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/4_54731796-ed79-463f-a4ee-fbd027dc3374.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/4_54731796-ed79-463f-a4ee-fbd027dc3374.changelog
new file mode 100644
index 0000000000000..3a066aa4de1b0
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/4_54731796-ed79-463f-a4ee-fbd027dc3374.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/4_54731796-ed79-463f-a4ee-fbd027dc3374.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/4_54731796-ed79-463f-a4ee-fbd027dc3374.zip
new file mode 100644
index 0000000000000..fb874d0f082b7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/4_54731796-ed79-463f-a4ee-fbd027dc3374.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/SSTs/.000008-22e14be0-182a-4d87-a1f8-bd348424678a.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/SSTs/.000008-22e14be0-182a-4d87-a1f8-bd348424678a.sst.crc
new file mode 100644
index 0000000000000..e6d600ddb108f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/SSTs/.000008-22e14be0-182a-4d87-a1f8-bd348424678a.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/SSTs/.000009-a10b6be2-7555-4b28-b9c3-c3760b3c3f1c.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/SSTs/.000009-a10b6be2-7555-4b28-b9c3-c3760b3c3f1c.sst.crc
new file mode 100644
index 0000000000000..58997acc4cf1a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/SSTs/.000009-a10b6be2-7555-4b28-b9c3-c3760b3c3f1c.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/SSTs/000008-22e14be0-182a-4d87-a1f8-bd348424678a.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/SSTs/000008-22e14be0-182a-4d87-a1f8-bd348424678a.sst
new file mode 100644
index 0000000000000..02d16697d6e7a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/SSTs/000008-22e14be0-182a-4d87-a1f8-bd348424678a.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/SSTs/000009-a10b6be2-7555-4b28-b9c3-c3760b3c3f1c.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/SSTs/000009-a10b6be2-7555-4b28-b9c3-c3760b3c3f1c.sst
new file mode 100644
index 0000000000000..983c3657912c3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/4/SSTs/000009-a10b6be2-7555-4b28-b9c3-c3760b3c3f1c.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/_metadata/.metadata.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/_metadata/.metadata.crc
new file mode 100644
index 0000000000000..b29ccc7fb0bcb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/_metadata/.metadata.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/_metadata/metadata b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/_metadata/metadata
new file mode 100644
index 0000000000000..39ce28c9b4aa5
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/dedup/state/0/_metadata/metadata
@@ -0,0 +1,2 @@
+v1
+{"operatorInfo":{"operatorId":0,"operatorName":"dedupe"},"stateStoreInfo":[{"storeName":"default","numColsPrefixKey":0,"numPartitions":5}]}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/.metadata.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/.metadata.crc
new file mode 100644
index 0000000000000..832ca31c1f204
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/.metadata.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/.0.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/.0.crc
new file mode 100644
index 0000000000000..93281c39bdd10
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/.0.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/.1.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/.1.crc
new file mode 100644
index 0000000000000..86f7be6eebe5b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/.1.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/.2.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/.2.crc
new file mode 100644
index 0000000000000..d818be6e7612f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/.2.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/.3.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/.3.crc
new file mode 100644
index 0000000000000..cee1601309a14
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/.3.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/.4.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/.4.crc
new file mode 100644
index 0000000000000..efc2ecc451d77
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/.4.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/0 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/0
new file mode 100644
index 0000000000000..fac0d2ae4762f
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/0
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":0,"stateUniqueIds":{"0":[["057f7174-b83c-4f06-a25f-93a4c06a9ef2","cbe493b0-7a15-4914-9277-87260cba4d45","ffe70db3-f62b-494c-bca0-bdfe4b03eb2d","098158a2-78b1-4c85-84b2-6cec7026b7f4"],["c2684cbe-1829-4cec-945d-8e07981680dc","a38d761c-9f5d-474f-b052-8f88bb31891d","a59ba75e-5cd2-45de-9178-bcfd6b8ff2c3","9178d3bc-b013-4b8b-9824-cd60cafb2151"],["1907b159-8e61-4610-bdd6-a82ca6f38da5","9f9d94cb-ed49-403a-a9cd-dfda232d9485","3f4088b2-07e9-40a4-ab7f-325f53aa522d","e35bf8e0-2df3-4d07-905c-294acf5c1972"],["11c4ae69-0043-4d0a-8435-43ed3917beea","eed857a8-176f-44fd-8756-6c7275cf3327","664bf358-72e1-47ff-b8e0-596947b064a6","c0055433-df0b-4456-ab34-2bf8efd2b687"],["9d2ab98c-6788-4891-9688-21e1711f1654","ba57ef25-7306-4569-a2f4-356b264b3f9e","7743ec6a-7958-497b-9c06-c54de516a1e9","20966a32-f99b-460b-bde1-6b8f7193384e"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/1 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/1
new file mode 100644
index 0000000000000..c746d5fd1cc7e
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/1
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":5000,"stateUniqueIds":{"0":[["798b1127-ef90-439b-bff1-00ed9e1afa88","d73ef231-9420-4e4e-b6bb-9bada25e8692","b9c6d162-2375-4be1-af05-86fae13a9a5d","c1a3baa8-f5f7-465d-90da-1632c1338025"],["58bb5df1-d456-42c0-9539-01a4bfaa58bc","765e6af2-eb8e-4969-a89d-8141dee4eb17","7685c7e7-fe78-4a76-b636-a05e76a9e8f2","7e07e11b-ba06-4f43-81ee-1f5105724d16"],["bb7de60e-7fc1-423f-86df-4027eadcbbba","6225c438-35c9-421d-8fa7-311f9bf89b5c","c919b4ed-56ed-4e9d-a84f-d10a583c3176","a6f41760-bb3a-4f66-8eac-b5b29989e4b5"],["ea813f1a-96a7-4326-a28c-906a78c61e06","1da87f15-0019-465f-82fb-b904b1db9033","a18db5f8-577a-4c7e-b893-b1c9121c461e","8a8c64d1-b579-4b5c-9ffa-312d7c42de3f"],["1f16fe91-b66d-4297-b2ab-8d4a3d7ee93a","6eb97e10-ef16-4d6d-a8b6-7eaf720b2e5a","97068b99-5d37-4226-94cc-4466312f6df1","7576c9f4-254f-46cc-a3d5-3c1b4997921d"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/2 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/2
new file mode 100644
index 0000000000000..98d6cb3c16aa4
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/2
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":5000,"stateUniqueIds":{"0":[["d188302f-ef9a-4e20-9371-13581cde3a3e","96919dfe-10ab-4424-a1fc-22b77b844c67","1455e423-44ab-4686-bef0-dad0b08c5d61","207be0af-e21b-460f-9438-133098ee72da"],["d96d5604-d1bd-43f2-a1ec-6c4fbfe48fce","93714ff3-d8af-4320-9649-a09d289e64e6","cdca122e-527e-4f94-bf9a-f610b6a5f947","c5a6d372-4ed8-42cc-a66b-f9c0c4efb522"],["49dedebf-166e-4f97-8a00-bd76ab11b41e","4400d93a-91df-4e1a-a210-0e94c07a8dbb","4cf8a931-fed7-4ec4-b007-3279c0fabd58","d3e3fd82-20dd-4ab3-b517-9a7cfb2a6d30"],["ea6cc9aa-d08b-459a-ba39-d9a3a8e00fc3","c7fad650-bcba-491e-87ab-946dc0462203","0e6f4a80-ba3d-40e2-82c4-bfbd226f8a41","d6a0dcd6-2657-4879-b528-9cb21208bdbe"],["d395f05b-3513-4b82-b8ae-508f84a0152f","4809b4df-4dc4-4173-af9c-c4585ce3d5cf","07c9f7e6-dceb-4bf1-a510-b806b37784e1","fe6e9401-af4c-4580-b3e2-c1940306fde9"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/3 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/3
new file mode 100644
index 0000000000000..4e5efeab1a9ed
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/3
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":9000,"stateUniqueIds":{"0":[["8801c6c5-16bf-4269-8828-a94e1d625f24","6e759769-1843-4d9e-8134-547bd52d2a0f","c5744ef8-4613-44ed-a839-f601421b2066","07e09eb7-d18c-446a-aa24-95f4dfbcc955"],["6d3cbb7b-6551-41b0-8985-dcd69ce7ef51","c984dd0c-9c5d-42d1-b258-25f54d0188b9","31564b0f-ca7d-4378-b27d-809b16a7e686","71cdd9b7-a8c2-489e-a128-32cc5e2b123a"],["4d986b34-1ea3-489e-ae16-1214a0dbbc7b","472f5f70-3384-4ddc-a7d6-2b182df8c729","4f8cea8d-08d1-4394-b161-40b73a4153f6","3833a5e0-b36c-43c2-827b-a72f1cf73049"],["68d23059-2ad1-4ed4-ad24-1b5b696b9ec7","eeb41fb7-2005-48d1-8ebe-fc4540c8e53b","f8d667d0-9fc7-48c8-9662-244db0e2a7b6","c5711e4e-9488-4944-9845-feda3b8aa10c"],["e23790f1-6d21-48b4-af3d-59eb348b81e0","e9342296-3ef5-46c8-99b1-f4f57a196c1b","1ccbfd5b-1c88-499e-a809-53413a7fcdc7","14b4f589-7af6-405c-a475-1bfad6ab6f66"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/4 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/4
new file mode 100644
index 0000000000000..6de773e65ed79
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/commits/4
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":9000,"stateUniqueIds":{"0":[["e47cbd81-687a-40b5-b04f-03baee0786eb","97b6b8d6-351a-4d9f-b7c3-54e1d6303f0d","2d33cccf-8c58-401d-9566-c7312863d0f9","b34b885b-40c3-4aab-a79f-27e9f99b9818"],["9dfb1bed-1696-4184-8a95-54a52f457134","85c1b24d-fd7c-42a1-b690-84aaf28673b3","a4df1a9a-b945-4728-9b28-b66f00c61baa","c190575f-976f-4d9e-9298-7f852778d0ce"],["d0ced361-ea40-4eaa-9647-f3d85228ba6c","a62bfa7f-e29e-42b5-a4f2-51593b2dc9bf","ded695aa-21b8-4628-a14d-1ca366cf1773","470e372e-3d2f-43f1-8e82-65f3bf2e0f66"],["4531ecd4-1b98-4793-ac78-da5ac0ec7e7c","8683c28d-8fcf-48d2-8b3f-6d1834c5968c","3a1ef380-8c5f-4e6a-9d8d-128db68849f9","e2553009-8003-4c43-9d2a-540f865f1e0d"],["9d1bda14-3036-434c-a59f-fe19c1cd06dd","5c11c009-30c0-474d-a236-9435dd740e3d","1b44bee1-d9c4-44ba-9932-2e5e40bb4012","3fa68cc1-d964-4f4e-bb9d-fd1ec2c73bbc"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/metadata b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/metadata
new file mode 100644
index 0000000000000..4c06cf8fe83c4
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/metadata
@@ -0,0 +1 @@
+{"id":"73d73fc9-8acd-4193-9871-b13d4cece4bc"}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/.0.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/.0.crc
new file mode 100644
index 0000000000000..e1a05489dd293
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/.0.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/.1.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/.1.crc
new file mode 100644
index 0000000000000..d7cc08f446d63
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/.1.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/.2.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/.2.crc
new file mode 100644
index 0000000000000..aa4ff9172b815
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/.2.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/.3.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/.3.crc
new file mode 100644
index 0000000000000..be230df7876c1
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/.3.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/.4.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/.4.crc
new file mode 100644
index 0000000000000..8b8f788bc123f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/.4.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/0 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/0
new file mode 100644
index 0000000000000..01ff845581b1b
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/0
@@ -0,0 +1,4 @@
+v1
+{"batchWatermarkMs":0,"batchTimestampMs":1757006261185,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"1","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+0
+0
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/1 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/1
new file mode 100644
index 0000000000000..35d42eb0dcb5c
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/1
@@ -0,0 +1,4 @@
+v1
+{"batchWatermarkMs":0,"batchTimestampMs":1757006267369,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"1","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+1
+1
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/2 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/2
new file mode 100644
index 0000000000000..08c294b771828
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/2
@@ -0,0 +1,4 @@
+v1
+{"batchWatermarkMs":5000,"batchTimestampMs":1757006268862,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"1","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+1
+1
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/3 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/3
new file mode 100644
index 0000000000000..2d8c54358b502
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/3
@@ -0,0 +1,4 @@
+v1
+{"batchWatermarkMs":5000,"batchTimestampMs":1757006271933,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"1","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+2
+2
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/4 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/4
new file mode 100644
index 0000000000000..d5893bddb98dd
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/offsets/4
@@ -0,0 +1,4 @@
+v1
+{"batchWatermarkMs":9000,"batchTimestampMs":1757006273242,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"1","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+2
+2
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.1_057f7174-b83c-4f06-a25f-93a4c06a9ef2.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.1_057f7174-b83c-4f06-a25f-93a4c06a9ef2.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.1_057f7174-b83c-4f06-a25f-93a4c06a9ef2.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.2_798b1127-ef90-439b-bff1-00ed9e1afa88.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.2_798b1127-ef90-439b-bff1-00ed9e1afa88.changelog.crc
new file mode 100644
index 0000000000000..b818a38d99c4f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.2_798b1127-ef90-439b-bff1-00ed9e1afa88.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.2_798b1127-ef90-439b-bff1-00ed9e1afa88.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.2_798b1127-ef90-439b-bff1-00ed9e1afa88.zip.crc
new file mode 100644
index 0000000000000..36b080be085ee
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.2_798b1127-ef90-439b-bff1-00ed9e1afa88.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.3_d188302f-ef9a-4e20-9371-13581cde3a3e.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.3_d188302f-ef9a-4e20-9371-13581cde3a3e.changelog.crc
new file mode 100644
index 0000000000000..25b72d7f9c351
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.3_d188302f-ef9a-4e20-9371-13581cde3a3e.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.4_8801c6c5-16bf-4269-8828-a94e1d625f24.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.4_8801c6c5-16bf-4269-8828-a94e1d625f24.changelog.crc
new file mode 100644
index 0000000000000..1818818e94171
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.4_8801c6c5-16bf-4269-8828-a94e1d625f24.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.4_8801c6c5-16bf-4269-8828-a94e1d625f24.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.4_8801c6c5-16bf-4269-8828-a94e1d625f24.zip.crc
new file mode 100644
index 0000000000000..f658fa8a7d26a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.4_8801c6c5-16bf-4269-8828-a94e1d625f24.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.5_e47cbd81-687a-40b5-b04f-03baee0786eb.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.5_e47cbd81-687a-40b5-b04f-03baee0786eb.changelog.crc
new file mode 100644
index 0000000000000..66000d9bca96c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/.5_e47cbd81-687a-40b5-b04f-03baee0786eb.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/1_057f7174-b83c-4f06-a25f-93a4c06a9ef2.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/1_057f7174-b83c-4f06-a25f-93a4c06a9ef2.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/1_057f7174-b83c-4f06-a25f-93a4c06a9ef2.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/2_798b1127-ef90-439b-bff1-00ed9e1afa88.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/2_798b1127-ef90-439b-bff1-00ed9e1afa88.changelog
new file mode 100644
index 0000000000000..8a382b3ba952f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/2_798b1127-ef90-439b-bff1-00ed9e1afa88.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/2_798b1127-ef90-439b-bff1-00ed9e1afa88.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/2_798b1127-ef90-439b-bff1-00ed9e1afa88.zip
new file mode 100644
index 0000000000000..1a0f6f96fe920
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/2_798b1127-ef90-439b-bff1-00ed9e1afa88.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/3_d188302f-ef9a-4e20-9371-13581cde3a3e.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/3_d188302f-ef9a-4e20-9371-13581cde3a3e.changelog
new file mode 100644
index 0000000000000..0f89aa97c140f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/3_d188302f-ef9a-4e20-9371-13581cde3a3e.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/4_8801c6c5-16bf-4269-8828-a94e1d625f24.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/4_8801c6c5-16bf-4269-8828-a94e1d625f24.changelog
new file mode 100644
index 0000000000000..7b4e86b66ee55
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/4_8801c6c5-16bf-4269-8828-a94e1d625f24.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/4_8801c6c5-16bf-4269-8828-a94e1d625f24.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/4_8801c6c5-16bf-4269-8828-a94e1d625f24.zip
new file mode 100644
index 0000000000000..e5ec5c1df6ae5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/4_8801c6c5-16bf-4269-8828-a94e1d625f24.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/5_e47cbd81-687a-40b5-b04f-03baee0786eb.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/5_e47cbd81-687a-40b5-b04f-03baee0786eb.changelog
new file mode 100644
index 0000000000000..d8298fd91790f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/5_e47cbd81-687a-40b5-b04f-03baee0786eb.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/_metadata/.schema.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/_metadata/.schema.crc
new file mode 100644
index 0000000000000..99ea330780589
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/_metadata/.schema.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/_metadata/schema b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/_metadata/schema
new file mode 100644
index 0000000000000..18e0a2a0f46a7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyToNumValues/_metadata/schema differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.1_cbe493b0-7a15-4914-9277-87260cba4d45.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.1_cbe493b0-7a15-4914-9277-87260cba4d45.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.1_cbe493b0-7a15-4914-9277-87260cba4d45.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.2_d73ef231-9420-4e4e-b6bb-9bada25e8692.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.2_d73ef231-9420-4e4e-b6bb-9bada25e8692.changelog.crc
new file mode 100644
index 0000000000000..0ffc43e5e9d82
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.2_d73ef231-9420-4e4e-b6bb-9bada25e8692.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.2_d73ef231-9420-4e4e-b6bb-9bada25e8692.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.2_d73ef231-9420-4e4e-b6bb-9bada25e8692.zip.crc
new file mode 100644
index 0000000000000..228135c23843f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.2_d73ef231-9420-4e4e-b6bb-9bada25e8692.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.3_96919dfe-10ab-4424-a1fc-22b77b844c67.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.3_96919dfe-10ab-4424-a1fc-22b77b844c67.changelog.crc
new file mode 100644
index 0000000000000..af7472abaecbd
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.3_96919dfe-10ab-4424-a1fc-22b77b844c67.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.4_6e759769-1843-4d9e-8134-547bd52d2a0f.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.4_6e759769-1843-4d9e-8134-547bd52d2a0f.changelog.crc
new file mode 100644
index 0000000000000..f45f95e64765f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.4_6e759769-1843-4d9e-8134-547bd52d2a0f.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.4_6e759769-1843-4d9e-8134-547bd52d2a0f.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.4_6e759769-1843-4d9e-8134-547bd52d2a0f.zip.crc
new file mode 100644
index 0000000000000..7355c558d4f57
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.4_6e759769-1843-4d9e-8134-547bd52d2a0f.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.5_97b6b8d6-351a-4d9f-b7c3-54e1d6303f0d.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.5_97b6b8d6-351a-4d9f-b7c3-54e1d6303f0d.changelog.crc
new file mode 100644
index 0000000000000..9f674b20be14e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/.5_97b6b8d6-351a-4d9f-b7c3-54e1d6303f0d.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/1_cbe493b0-7a15-4914-9277-87260cba4d45.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/1_cbe493b0-7a15-4914-9277-87260cba4d45.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/1_cbe493b0-7a15-4914-9277-87260cba4d45.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/2_d73ef231-9420-4e4e-b6bb-9bada25e8692.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/2_d73ef231-9420-4e4e-b6bb-9bada25e8692.changelog
new file mode 100644
index 0000000000000..56073df6d3b64
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/2_d73ef231-9420-4e4e-b6bb-9bada25e8692.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/2_d73ef231-9420-4e4e-b6bb-9bada25e8692.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/2_d73ef231-9420-4e4e-b6bb-9bada25e8692.zip
new file mode 100644
index 0000000000000..3dbdf79aabb07
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/2_d73ef231-9420-4e4e-b6bb-9bada25e8692.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/3_96919dfe-10ab-4424-a1fc-22b77b844c67.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/3_96919dfe-10ab-4424-a1fc-22b77b844c67.changelog
new file mode 100644
index 0000000000000..a980510e8a7ab
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/3_96919dfe-10ab-4424-a1fc-22b77b844c67.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/4_6e759769-1843-4d9e-8134-547bd52d2a0f.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/4_6e759769-1843-4d9e-8134-547bd52d2a0f.changelog
new file mode 100644
index 0000000000000..da8b90a468048
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/4_6e759769-1843-4d9e-8134-547bd52d2a0f.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/4_6e759769-1843-4d9e-8134-547bd52d2a0f.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/4_6e759769-1843-4d9e-8134-547bd52d2a0f.zip
new file mode 100644
index 0000000000000..2112e915cd6a4
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/4_6e759769-1843-4d9e-8134-547bd52d2a0f.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/5_97b6b8d6-351a-4d9f-b7c3-54e1d6303f0d.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/5_97b6b8d6-351a-4d9f-b7c3-54e1d6303f0d.changelog
new file mode 100644
index 0000000000000..166ff0621ffd1
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/5_97b6b8d6-351a-4d9f-b7c3-54e1d6303f0d.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/_metadata/.schema.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/_metadata/.schema.crc
new file mode 100644
index 0000000000000..0da4e1eee02eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/_metadata/.schema.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/_metadata/schema b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/_metadata/schema
new file mode 100644
index 0000000000000..d6c7a26905edf
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/left-keyWithIndexToValue/_metadata/schema differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.1_ffe70db3-f62b-494c-bca0-bdfe4b03eb2d.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.1_ffe70db3-f62b-494c-bca0-bdfe4b03eb2d.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.1_ffe70db3-f62b-494c-bca0-bdfe4b03eb2d.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.2_b9c6d162-2375-4be1-af05-86fae13a9a5d.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.2_b9c6d162-2375-4be1-af05-86fae13a9a5d.changelog.crc
new file mode 100644
index 0000000000000..8574dc2d013a8
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.2_b9c6d162-2375-4be1-af05-86fae13a9a5d.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.2_b9c6d162-2375-4be1-af05-86fae13a9a5d.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.2_b9c6d162-2375-4be1-af05-86fae13a9a5d.zip.crc
new file mode 100644
index 0000000000000..6bb57afca52f9
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.2_b9c6d162-2375-4be1-af05-86fae13a9a5d.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.3_1455e423-44ab-4686-bef0-dad0b08c5d61.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.3_1455e423-44ab-4686-bef0-dad0b08c5d61.changelog.crc
new file mode 100644
index 0000000000000..8a9aaa16f10e1
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.3_1455e423-44ab-4686-bef0-dad0b08c5d61.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.4_c5744ef8-4613-44ed-a839-f601421b2066.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.4_c5744ef8-4613-44ed-a839-f601421b2066.changelog.crc
new file mode 100644
index 0000000000000..851918e2d00d2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.4_c5744ef8-4613-44ed-a839-f601421b2066.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.4_c5744ef8-4613-44ed-a839-f601421b2066.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.4_c5744ef8-4613-44ed-a839-f601421b2066.zip.crc
new file mode 100644
index 0000000000000..e5ff654dbc52a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.4_c5744ef8-4613-44ed-a839-f601421b2066.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.5_2d33cccf-8c58-401d-9566-c7312863d0f9.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.5_2d33cccf-8c58-401d-9566-c7312863d0f9.changelog.crc
new file mode 100644
index 0000000000000..6269dd041e46a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/.5_2d33cccf-8c58-401d-9566-c7312863d0f9.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/1_ffe70db3-f62b-494c-bca0-bdfe4b03eb2d.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/1_ffe70db3-f62b-494c-bca0-bdfe4b03eb2d.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/1_ffe70db3-f62b-494c-bca0-bdfe4b03eb2d.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/2_b9c6d162-2375-4be1-af05-86fae13a9a5d.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/2_b9c6d162-2375-4be1-af05-86fae13a9a5d.changelog
new file mode 100644
index 0000000000000..c8663e270d6ea
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/2_b9c6d162-2375-4be1-af05-86fae13a9a5d.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/2_b9c6d162-2375-4be1-af05-86fae13a9a5d.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/2_b9c6d162-2375-4be1-af05-86fae13a9a5d.zip
new file mode 100644
index 0000000000000..fa1ce57aec915
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/2_b9c6d162-2375-4be1-af05-86fae13a9a5d.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/3_1455e423-44ab-4686-bef0-dad0b08c5d61.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/3_1455e423-44ab-4686-bef0-dad0b08c5d61.changelog
new file mode 100644
index 0000000000000..4ac6a6c4eb8e3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/3_1455e423-44ab-4686-bef0-dad0b08c5d61.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/4_c5744ef8-4613-44ed-a839-f601421b2066.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/4_c5744ef8-4613-44ed-a839-f601421b2066.changelog
new file mode 100644
index 0000000000000..9c5bf4bc48a4f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/4_c5744ef8-4613-44ed-a839-f601421b2066.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/4_c5744ef8-4613-44ed-a839-f601421b2066.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/4_c5744ef8-4613-44ed-a839-f601421b2066.zip
new file mode 100644
index 0000000000000..5785f17583541
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/4_c5744ef8-4613-44ed-a839-f601421b2066.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/5_2d33cccf-8c58-401d-9566-c7312863d0f9.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/5_2d33cccf-8c58-401d-9566-c7312863d0f9.changelog
new file mode 100644
index 0000000000000..f0dc5690aef1a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/5_2d33cccf-8c58-401d-9566-c7312863d0f9.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/_metadata/.schema.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/_metadata/.schema.crc
new file mode 100644
index 0000000000000..99ea330780589
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/_metadata/.schema.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/_metadata/schema b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/_metadata/schema
new file mode 100644
index 0000000000000..18e0a2a0f46a7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyToNumValues/_metadata/schema differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.1_098158a2-78b1-4c85-84b2-6cec7026b7f4.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.1_098158a2-78b1-4c85-84b2-6cec7026b7f4.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.1_098158a2-78b1-4c85-84b2-6cec7026b7f4.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.2_c1a3baa8-f5f7-465d-90da-1632c1338025.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.2_c1a3baa8-f5f7-465d-90da-1632c1338025.changelog.crc
new file mode 100644
index 0000000000000..3944f7f43f986
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.2_c1a3baa8-f5f7-465d-90da-1632c1338025.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.2_c1a3baa8-f5f7-465d-90da-1632c1338025.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.2_c1a3baa8-f5f7-465d-90da-1632c1338025.zip.crc
new file mode 100644
index 0000000000000..456da2873995f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.2_c1a3baa8-f5f7-465d-90da-1632c1338025.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.3_207be0af-e21b-460f-9438-133098ee72da.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.3_207be0af-e21b-460f-9438-133098ee72da.changelog.crc
new file mode 100644
index 0000000000000..792bb7788d88f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.3_207be0af-e21b-460f-9438-133098ee72da.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.4_07e09eb7-d18c-446a-aa24-95f4dfbcc955.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.4_07e09eb7-d18c-446a-aa24-95f4dfbcc955.changelog.crc
new file mode 100644
index 0000000000000..3935f00b5b4ea
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.4_07e09eb7-d18c-446a-aa24-95f4dfbcc955.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.4_07e09eb7-d18c-446a-aa24-95f4dfbcc955.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.4_07e09eb7-d18c-446a-aa24-95f4dfbcc955.zip.crc
new file mode 100644
index 0000000000000..07fe067cafbf5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.4_07e09eb7-d18c-446a-aa24-95f4dfbcc955.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.5_b34b885b-40c3-4aab-a79f-27e9f99b9818.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.5_b34b885b-40c3-4aab-a79f-27e9f99b9818.changelog.crc
new file mode 100644
index 0000000000000..6e640ca4ecf9b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/.5_b34b885b-40c3-4aab-a79f-27e9f99b9818.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/1_098158a2-78b1-4c85-84b2-6cec7026b7f4.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/1_098158a2-78b1-4c85-84b2-6cec7026b7f4.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/1_098158a2-78b1-4c85-84b2-6cec7026b7f4.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/2_c1a3baa8-f5f7-465d-90da-1632c1338025.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/2_c1a3baa8-f5f7-465d-90da-1632c1338025.changelog
new file mode 100644
index 0000000000000..552da5a9b1858
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/2_c1a3baa8-f5f7-465d-90da-1632c1338025.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/2_c1a3baa8-f5f7-465d-90da-1632c1338025.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/2_c1a3baa8-f5f7-465d-90da-1632c1338025.zip
new file mode 100644
index 0000000000000..2e46ea5762114
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/2_c1a3baa8-f5f7-465d-90da-1632c1338025.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/3_207be0af-e21b-460f-9438-133098ee72da.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/3_207be0af-e21b-460f-9438-133098ee72da.changelog
new file mode 100644
index 0000000000000..51b32bfc42de3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/3_207be0af-e21b-460f-9438-133098ee72da.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/4_07e09eb7-d18c-446a-aa24-95f4dfbcc955.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/4_07e09eb7-d18c-446a-aa24-95f4dfbcc955.changelog
new file mode 100644
index 0000000000000..82b705fabbe23
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/4_07e09eb7-d18c-446a-aa24-95f4dfbcc955.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/4_07e09eb7-d18c-446a-aa24-95f4dfbcc955.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/4_07e09eb7-d18c-446a-aa24-95f4dfbcc955.zip
new file mode 100644
index 0000000000000..0945dae84e5b6
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/4_07e09eb7-d18c-446a-aa24-95f4dfbcc955.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/5_b34b885b-40c3-4aab-a79f-27e9f99b9818.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/5_b34b885b-40c3-4aab-a79f-27e9f99b9818.changelog
new file mode 100644
index 0000000000000..b7abbed0cd6b6
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/5_b34b885b-40c3-4aab-a79f-27e9f99b9818.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/_metadata/.schema.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/_metadata/.schema.crc
new file mode 100644
index 0000000000000..106071d2a7238
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/_metadata/.schema.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/_metadata/schema b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/_metadata/schema
new file mode 100644
index 0000000000000..82a5762dcb105
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/0/right-keyWithIndexToValue/_metadata/schema differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.1_c2684cbe-1829-4cec-945d-8e07981680dc.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.1_c2684cbe-1829-4cec-945d-8e07981680dc.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.1_c2684cbe-1829-4cec-945d-8e07981680dc.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.2_58bb5df1-d456-42c0-9539-01a4bfaa58bc.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.2_58bb5df1-d456-42c0-9539-01a4bfaa58bc.changelog.crc
new file mode 100644
index 0000000000000..9b6b673ecf0fb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.2_58bb5df1-d456-42c0-9539-01a4bfaa58bc.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.2_58bb5df1-d456-42c0-9539-01a4bfaa58bc.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.2_58bb5df1-d456-42c0-9539-01a4bfaa58bc.zip.crc
new file mode 100644
index 0000000000000..6136292a1e42c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.2_58bb5df1-d456-42c0-9539-01a4bfaa58bc.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.3_d96d5604-d1bd-43f2-a1ec-6c4fbfe48fce.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.3_d96d5604-d1bd-43f2-a1ec-6c4fbfe48fce.changelog.crc
new file mode 100644
index 0000000000000..1591da6804959
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.3_d96d5604-d1bd-43f2-a1ec-6c4fbfe48fce.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.4_6d3cbb7b-6551-41b0-8985-dcd69ce7ef51.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.4_6d3cbb7b-6551-41b0-8985-dcd69ce7ef51.changelog.crc
new file mode 100644
index 0000000000000..93f50f4ffb4b4
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.4_6d3cbb7b-6551-41b0-8985-dcd69ce7ef51.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.4_6d3cbb7b-6551-41b0-8985-dcd69ce7ef51.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.4_6d3cbb7b-6551-41b0-8985-dcd69ce7ef51.zip.crc
new file mode 100644
index 0000000000000..7b99fc8d5e26e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.4_6d3cbb7b-6551-41b0-8985-dcd69ce7ef51.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.5_9dfb1bed-1696-4184-8a95-54a52f457134.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.5_9dfb1bed-1696-4184-8a95-54a52f457134.changelog.crc
new file mode 100644
index 0000000000000..2c24f081fcdd2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/.5_9dfb1bed-1696-4184-8a95-54a52f457134.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/1_c2684cbe-1829-4cec-945d-8e07981680dc.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/1_c2684cbe-1829-4cec-945d-8e07981680dc.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/1_c2684cbe-1829-4cec-945d-8e07981680dc.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/2_58bb5df1-d456-42c0-9539-01a4bfaa58bc.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/2_58bb5df1-d456-42c0-9539-01a4bfaa58bc.changelog
new file mode 100644
index 0000000000000..0671158b68242
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/2_58bb5df1-d456-42c0-9539-01a4bfaa58bc.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/2_58bb5df1-d456-42c0-9539-01a4bfaa58bc.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/2_58bb5df1-d456-42c0-9539-01a4bfaa58bc.zip
new file mode 100644
index 0000000000000..d178211d6c979
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/2_58bb5df1-d456-42c0-9539-01a4bfaa58bc.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/3_d96d5604-d1bd-43f2-a1ec-6c4fbfe48fce.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/3_d96d5604-d1bd-43f2-a1ec-6c4fbfe48fce.changelog
new file mode 100644
index 0000000000000..9b360a89f1c1b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/3_d96d5604-d1bd-43f2-a1ec-6c4fbfe48fce.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/4_6d3cbb7b-6551-41b0-8985-dcd69ce7ef51.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/4_6d3cbb7b-6551-41b0-8985-dcd69ce7ef51.changelog
new file mode 100644
index 0000000000000..7e86a790666e6
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/4_6d3cbb7b-6551-41b0-8985-dcd69ce7ef51.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/4_6d3cbb7b-6551-41b0-8985-dcd69ce7ef51.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/4_6d3cbb7b-6551-41b0-8985-dcd69ce7ef51.zip
new file mode 100644
index 0000000000000..cd178bd528aab
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/4_6d3cbb7b-6551-41b0-8985-dcd69ce7ef51.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/5_9dfb1bed-1696-4184-8a95-54a52f457134.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/5_9dfb1bed-1696-4184-8a95-54a52f457134.changelog
new file mode 100644
index 0000000000000..6b4db7175d03d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyToNumValues/5_9dfb1bed-1696-4184-8a95-54a52f457134.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.1_a38d761c-9f5d-474f-b052-8f88bb31891d.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.1_a38d761c-9f5d-474f-b052-8f88bb31891d.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.1_a38d761c-9f5d-474f-b052-8f88bb31891d.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.2_765e6af2-eb8e-4969-a89d-8141dee4eb17.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.2_765e6af2-eb8e-4969-a89d-8141dee4eb17.changelog.crc
new file mode 100644
index 0000000000000..4f3474dc7a625
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.2_765e6af2-eb8e-4969-a89d-8141dee4eb17.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.2_765e6af2-eb8e-4969-a89d-8141dee4eb17.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.2_765e6af2-eb8e-4969-a89d-8141dee4eb17.zip.crc
new file mode 100644
index 0000000000000..b35ce991728ce
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.2_765e6af2-eb8e-4969-a89d-8141dee4eb17.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.3_93714ff3-d8af-4320-9649-a09d289e64e6.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.3_93714ff3-d8af-4320-9649-a09d289e64e6.changelog.crc
new file mode 100644
index 0000000000000..fcd843ab5b085
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.3_93714ff3-d8af-4320-9649-a09d289e64e6.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.4_c984dd0c-9c5d-42d1-b258-25f54d0188b9.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.4_c984dd0c-9c5d-42d1-b258-25f54d0188b9.changelog.crc
new file mode 100644
index 0000000000000..99f1cfe2d4bf8
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.4_c984dd0c-9c5d-42d1-b258-25f54d0188b9.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.4_c984dd0c-9c5d-42d1-b258-25f54d0188b9.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.4_c984dd0c-9c5d-42d1-b258-25f54d0188b9.zip.crc
new file mode 100644
index 0000000000000..b0d21d2d6a1b6
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.4_c984dd0c-9c5d-42d1-b258-25f54d0188b9.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.5_85c1b24d-fd7c-42a1-b690-84aaf28673b3.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.5_85c1b24d-fd7c-42a1-b690-84aaf28673b3.changelog.crc
new file mode 100644
index 0000000000000..f4ea5c1f67f29
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/.5_85c1b24d-fd7c-42a1-b690-84aaf28673b3.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/1_a38d761c-9f5d-474f-b052-8f88bb31891d.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/1_a38d761c-9f5d-474f-b052-8f88bb31891d.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/1_a38d761c-9f5d-474f-b052-8f88bb31891d.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/2_765e6af2-eb8e-4969-a89d-8141dee4eb17.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/2_765e6af2-eb8e-4969-a89d-8141dee4eb17.changelog
new file mode 100644
index 0000000000000..f62655a03a3da
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/2_765e6af2-eb8e-4969-a89d-8141dee4eb17.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/2_765e6af2-eb8e-4969-a89d-8141dee4eb17.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/2_765e6af2-eb8e-4969-a89d-8141dee4eb17.zip
new file mode 100644
index 0000000000000..fe8dace0be516
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/2_765e6af2-eb8e-4969-a89d-8141dee4eb17.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/3_93714ff3-d8af-4320-9649-a09d289e64e6.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/3_93714ff3-d8af-4320-9649-a09d289e64e6.changelog
new file mode 100644
index 0000000000000..b50abd95b8d42
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/3_93714ff3-d8af-4320-9649-a09d289e64e6.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/4_c984dd0c-9c5d-42d1-b258-25f54d0188b9.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/4_c984dd0c-9c5d-42d1-b258-25f54d0188b9.changelog
new file mode 100644
index 0000000000000..c56e942984c12
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/4_c984dd0c-9c5d-42d1-b258-25f54d0188b9.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/4_c984dd0c-9c5d-42d1-b258-25f54d0188b9.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/4_c984dd0c-9c5d-42d1-b258-25f54d0188b9.zip
new file mode 100644
index 0000000000000..b8832bb732f2e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/4_c984dd0c-9c5d-42d1-b258-25f54d0188b9.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/5_85c1b24d-fd7c-42a1-b690-84aaf28673b3.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/5_85c1b24d-fd7c-42a1-b690-84aaf28673b3.changelog
new file mode 100644
index 0000000000000..05301a1356472
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/left-keyWithIndexToValue/5_85c1b24d-fd7c-42a1-b690-84aaf28673b3.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.1_a59ba75e-5cd2-45de-9178-bcfd6b8ff2c3.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.1_a59ba75e-5cd2-45de-9178-bcfd6b8ff2c3.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.1_a59ba75e-5cd2-45de-9178-bcfd6b8ff2c3.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.2_7685c7e7-fe78-4a76-b636-a05e76a9e8f2.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.2_7685c7e7-fe78-4a76-b636-a05e76a9e8f2.changelog.crc
new file mode 100644
index 0000000000000..ed65cf78f2515
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.2_7685c7e7-fe78-4a76-b636-a05e76a9e8f2.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.2_7685c7e7-fe78-4a76-b636-a05e76a9e8f2.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.2_7685c7e7-fe78-4a76-b636-a05e76a9e8f2.zip.crc
new file mode 100644
index 0000000000000..7dd353f7f39ee
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.2_7685c7e7-fe78-4a76-b636-a05e76a9e8f2.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.3_cdca122e-527e-4f94-bf9a-f610b6a5f947.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.3_cdca122e-527e-4f94-bf9a-f610b6a5f947.changelog.crc
new file mode 100644
index 0000000000000..a4b272e49f5e7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.3_cdca122e-527e-4f94-bf9a-f610b6a5f947.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.4_31564b0f-ca7d-4378-b27d-809b16a7e686.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.4_31564b0f-ca7d-4378-b27d-809b16a7e686.changelog.crc
new file mode 100644
index 0000000000000..96526945c35c7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.4_31564b0f-ca7d-4378-b27d-809b16a7e686.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.4_31564b0f-ca7d-4378-b27d-809b16a7e686.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.4_31564b0f-ca7d-4378-b27d-809b16a7e686.zip.crc
new file mode 100644
index 0000000000000..5358112b76382
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.4_31564b0f-ca7d-4378-b27d-809b16a7e686.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.5_a4df1a9a-b945-4728-9b28-b66f00c61baa.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.5_a4df1a9a-b945-4728-9b28-b66f00c61baa.changelog.crc
new file mode 100644
index 0000000000000..fe84b80a2aed8
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/.5_a4df1a9a-b945-4728-9b28-b66f00c61baa.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/1_a59ba75e-5cd2-45de-9178-bcfd6b8ff2c3.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/1_a59ba75e-5cd2-45de-9178-bcfd6b8ff2c3.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/1_a59ba75e-5cd2-45de-9178-bcfd6b8ff2c3.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/2_7685c7e7-fe78-4a76-b636-a05e76a9e8f2.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/2_7685c7e7-fe78-4a76-b636-a05e76a9e8f2.changelog
new file mode 100644
index 0000000000000..6a3b4628eaa82
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/2_7685c7e7-fe78-4a76-b636-a05e76a9e8f2.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/2_7685c7e7-fe78-4a76-b636-a05e76a9e8f2.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/2_7685c7e7-fe78-4a76-b636-a05e76a9e8f2.zip
new file mode 100644
index 0000000000000..0d74f9bef6aec
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/2_7685c7e7-fe78-4a76-b636-a05e76a9e8f2.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/3_cdca122e-527e-4f94-bf9a-f610b6a5f947.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/3_cdca122e-527e-4f94-bf9a-f610b6a5f947.changelog
new file mode 100644
index 0000000000000..a2c29c43d570c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/3_cdca122e-527e-4f94-bf9a-f610b6a5f947.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/4_31564b0f-ca7d-4378-b27d-809b16a7e686.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/4_31564b0f-ca7d-4378-b27d-809b16a7e686.changelog
new file mode 100644
index 0000000000000..9762299945841
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/4_31564b0f-ca7d-4378-b27d-809b16a7e686.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/4_31564b0f-ca7d-4378-b27d-809b16a7e686.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/4_31564b0f-ca7d-4378-b27d-809b16a7e686.zip
new file mode 100644
index 0000000000000..87f8e45f05851
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/4_31564b0f-ca7d-4378-b27d-809b16a7e686.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/5_a4df1a9a-b945-4728-9b28-b66f00c61baa.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/5_a4df1a9a-b945-4728-9b28-b66f00c61baa.changelog
new file mode 100644
index 0000000000000..e75705ad4dad7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyToNumValues/5_a4df1a9a-b945-4728-9b28-b66f00c61baa.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.1_9178d3bc-b013-4b8b-9824-cd60cafb2151.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.1_9178d3bc-b013-4b8b-9824-cd60cafb2151.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.1_9178d3bc-b013-4b8b-9824-cd60cafb2151.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.2_7e07e11b-ba06-4f43-81ee-1f5105724d16.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.2_7e07e11b-ba06-4f43-81ee-1f5105724d16.changelog.crc
new file mode 100644
index 0000000000000..8045e29824fe9
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.2_7e07e11b-ba06-4f43-81ee-1f5105724d16.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.2_7e07e11b-ba06-4f43-81ee-1f5105724d16.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.2_7e07e11b-ba06-4f43-81ee-1f5105724d16.zip.crc
new file mode 100644
index 0000000000000..6df2146552b0d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.2_7e07e11b-ba06-4f43-81ee-1f5105724d16.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.3_c5a6d372-4ed8-42cc-a66b-f9c0c4efb522.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.3_c5a6d372-4ed8-42cc-a66b-f9c0c4efb522.changelog.crc
new file mode 100644
index 0000000000000..1ce88eee91992
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.3_c5a6d372-4ed8-42cc-a66b-f9c0c4efb522.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.4_71cdd9b7-a8c2-489e-a128-32cc5e2b123a.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.4_71cdd9b7-a8c2-489e-a128-32cc5e2b123a.changelog.crc
new file mode 100644
index 0000000000000..a37bf48a10f97
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.4_71cdd9b7-a8c2-489e-a128-32cc5e2b123a.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.4_71cdd9b7-a8c2-489e-a128-32cc5e2b123a.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.4_71cdd9b7-a8c2-489e-a128-32cc5e2b123a.zip.crc
new file mode 100644
index 0000000000000..a98fb6cf9dea7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.4_71cdd9b7-a8c2-489e-a128-32cc5e2b123a.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.5_c190575f-976f-4d9e-9298-7f852778d0ce.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.5_c190575f-976f-4d9e-9298-7f852778d0ce.changelog.crc
new file mode 100644
index 0000000000000..ae94546cdaebd
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/.5_c190575f-976f-4d9e-9298-7f852778d0ce.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/1_9178d3bc-b013-4b8b-9824-cd60cafb2151.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/1_9178d3bc-b013-4b8b-9824-cd60cafb2151.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/1_9178d3bc-b013-4b8b-9824-cd60cafb2151.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/2_7e07e11b-ba06-4f43-81ee-1f5105724d16.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/2_7e07e11b-ba06-4f43-81ee-1f5105724d16.changelog
new file mode 100644
index 0000000000000..9ce81cbe2b45f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/2_7e07e11b-ba06-4f43-81ee-1f5105724d16.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/2_7e07e11b-ba06-4f43-81ee-1f5105724d16.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/2_7e07e11b-ba06-4f43-81ee-1f5105724d16.zip
new file mode 100644
index 0000000000000..fa8e6bfa10589
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/2_7e07e11b-ba06-4f43-81ee-1f5105724d16.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/3_c5a6d372-4ed8-42cc-a66b-f9c0c4efb522.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/3_c5a6d372-4ed8-42cc-a66b-f9c0c4efb522.changelog
new file mode 100644
index 0000000000000..f496a84b74b0e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/3_c5a6d372-4ed8-42cc-a66b-f9c0c4efb522.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/4_71cdd9b7-a8c2-489e-a128-32cc5e2b123a.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/4_71cdd9b7-a8c2-489e-a128-32cc5e2b123a.changelog
new file mode 100644
index 0000000000000..b34fcf13cfc6a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/4_71cdd9b7-a8c2-489e-a128-32cc5e2b123a.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/4_71cdd9b7-a8c2-489e-a128-32cc5e2b123a.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/4_71cdd9b7-a8c2-489e-a128-32cc5e2b123a.zip
new file mode 100644
index 0000000000000..80dc54409be39
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/4_71cdd9b7-a8c2-489e-a128-32cc5e2b123a.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/5_c190575f-976f-4d9e-9298-7f852778d0ce.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/5_c190575f-976f-4d9e-9298-7f852778d0ce.changelog
new file mode 100644
index 0000000000000..14fd1a507c958
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/1/right-keyWithIndexToValue/5_c190575f-976f-4d9e-9298-7f852778d0ce.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.1_1907b159-8e61-4610-bdd6-a82ca6f38da5.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.1_1907b159-8e61-4610-bdd6-a82ca6f38da5.changelog.crc
new file mode 100644
index 0000000000000..14ce93d6939eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.1_1907b159-8e61-4610-bdd6-a82ca6f38da5.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.2_bb7de60e-7fc1-423f-86df-4027eadcbbba.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.2_bb7de60e-7fc1-423f-86df-4027eadcbbba.changelog.crc
new file mode 100644
index 0000000000000..53f95d393ed6b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.2_bb7de60e-7fc1-423f-86df-4027eadcbbba.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.2_bb7de60e-7fc1-423f-86df-4027eadcbbba.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.2_bb7de60e-7fc1-423f-86df-4027eadcbbba.zip.crc
new file mode 100644
index 0000000000000..38bae9fbaa98c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.2_bb7de60e-7fc1-423f-86df-4027eadcbbba.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.3_49dedebf-166e-4f97-8a00-bd76ab11b41e.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.3_49dedebf-166e-4f97-8a00-bd76ab11b41e.changelog.crc
new file mode 100644
index 0000000000000..83a1170020d15
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.3_49dedebf-166e-4f97-8a00-bd76ab11b41e.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.4_4d986b34-1ea3-489e-ae16-1214a0dbbc7b.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.4_4d986b34-1ea3-489e-ae16-1214a0dbbc7b.changelog.crc
new file mode 100644
index 0000000000000..0da1d2918337c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.4_4d986b34-1ea3-489e-ae16-1214a0dbbc7b.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.4_4d986b34-1ea3-489e-ae16-1214a0dbbc7b.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.4_4d986b34-1ea3-489e-ae16-1214a0dbbc7b.zip.crc
new file mode 100644
index 0000000000000..0855044f7d32e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.4_4d986b34-1ea3-489e-ae16-1214a0dbbc7b.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.5_d0ced361-ea40-4eaa-9647-f3d85228ba6c.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.5_d0ced361-ea40-4eaa-9647-f3d85228ba6c.changelog.crc
new file mode 100644
index 0000000000000..72c268467e4b4
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/.5_d0ced361-ea40-4eaa-9647-f3d85228ba6c.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/1_1907b159-8e61-4610-bdd6-a82ca6f38da5.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/1_1907b159-8e61-4610-bdd6-a82ca6f38da5.changelog
new file mode 100644
index 0000000000000..b842ca7e8a4c1
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/1_1907b159-8e61-4610-bdd6-a82ca6f38da5.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/2_bb7de60e-7fc1-423f-86df-4027eadcbbba.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/2_bb7de60e-7fc1-423f-86df-4027eadcbbba.changelog
new file mode 100644
index 0000000000000..eec29a96b21b1
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/2_bb7de60e-7fc1-423f-86df-4027eadcbbba.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/2_bb7de60e-7fc1-423f-86df-4027eadcbbba.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/2_bb7de60e-7fc1-423f-86df-4027eadcbbba.zip
new file mode 100644
index 0000000000000..0819cee4ebf54
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/2_bb7de60e-7fc1-423f-86df-4027eadcbbba.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/3_49dedebf-166e-4f97-8a00-bd76ab11b41e.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/3_49dedebf-166e-4f97-8a00-bd76ab11b41e.changelog
new file mode 100644
index 0000000000000..a4df412a50009
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/3_49dedebf-166e-4f97-8a00-bd76ab11b41e.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/4_4d986b34-1ea3-489e-ae16-1214a0dbbc7b.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/4_4d986b34-1ea3-489e-ae16-1214a0dbbc7b.changelog
new file mode 100644
index 0000000000000..2d31326b1976b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/4_4d986b34-1ea3-489e-ae16-1214a0dbbc7b.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/4_4d986b34-1ea3-489e-ae16-1214a0dbbc7b.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/4_4d986b34-1ea3-489e-ae16-1214a0dbbc7b.zip
new file mode 100644
index 0000000000000..24fa37156bfa8
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/4_4d986b34-1ea3-489e-ae16-1214a0dbbc7b.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/5_d0ced361-ea40-4eaa-9647-f3d85228ba6c.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/5_d0ced361-ea40-4eaa-9647-f3d85228ba6c.changelog
new file mode 100644
index 0000000000000..31905e222830f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/5_d0ced361-ea40-4eaa-9647-f3d85228ba6c.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/SSTs/.000008-1eec3806-9939-4b13-b1dd-d723956b6dea.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/SSTs/.000008-1eec3806-9939-4b13-b1dd-d723956b6dea.sst.crc
new file mode 100644
index 0000000000000..e86002c6f62da
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/SSTs/.000008-1eec3806-9939-4b13-b1dd-d723956b6dea.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/SSTs/000008-1eec3806-9939-4b13-b1dd-d723956b6dea.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/SSTs/000008-1eec3806-9939-4b13-b1dd-d723956b6dea.sst
new file mode 100644
index 0000000000000..024d7bd54cee7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyToNumValues/SSTs/000008-1eec3806-9939-4b13-b1dd-d723956b6dea.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.1_9f9d94cb-ed49-403a-a9cd-dfda232d9485.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.1_9f9d94cb-ed49-403a-a9cd-dfda232d9485.changelog.crc
new file mode 100644
index 0000000000000..e8cd65354182a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.1_9f9d94cb-ed49-403a-a9cd-dfda232d9485.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.2_6225c438-35c9-421d-8fa7-311f9bf89b5c.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.2_6225c438-35c9-421d-8fa7-311f9bf89b5c.changelog.crc
new file mode 100644
index 0000000000000..2ddbf15d7d361
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.2_6225c438-35c9-421d-8fa7-311f9bf89b5c.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.2_6225c438-35c9-421d-8fa7-311f9bf89b5c.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.2_6225c438-35c9-421d-8fa7-311f9bf89b5c.zip.crc
new file mode 100644
index 0000000000000..1049a2a2ce9e7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.2_6225c438-35c9-421d-8fa7-311f9bf89b5c.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.3_4400d93a-91df-4e1a-a210-0e94c07a8dbb.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.3_4400d93a-91df-4e1a-a210-0e94c07a8dbb.changelog.crc
new file mode 100644
index 0000000000000..f9ca9963a5639
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.3_4400d93a-91df-4e1a-a210-0e94c07a8dbb.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.4_472f5f70-3384-4ddc-a7d6-2b182df8c729.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.4_472f5f70-3384-4ddc-a7d6-2b182df8c729.changelog.crc
new file mode 100644
index 0000000000000..54b5c58f77a53
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.4_472f5f70-3384-4ddc-a7d6-2b182df8c729.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.4_472f5f70-3384-4ddc-a7d6-2b182df8c729.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.4_472f5f70-3384-4ddc-a7d6-2b182df8c729.zip.crc
new file mode 100644
index 0000000000000..2bb1fdaf7fb32
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.4_472f5f70-3384-4ddc-a7d6-2b182df8c729.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.5_a62bfa7f-e29e-42b5-a4f2-51593b2dc9bf.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.5_a62bfa7f-e29e-42b5-a4f2-51593b2dc9bf.changelog.crc
new file mode 100644
index 0000000000000..fa353a292fb90
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/.5_a62bfa7f-e29e-42b5-a4f2-51593b2dc9bf.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/1_9f9d94cb-ed49-403a-a9cd-dfda232d9485.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/1_9f9d94cb-ed49-403a-a9cd-dfda232d9485.changelog
new file mode 100644
index 0000000000000..f67928b785d5f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/1_9f9d94cb-ed49-403a-a9cd-dfda232d9485.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/2_6225c438-35c9-421d-8fa7-311f9bf89b5c.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/2_6225c438-35c9-421d-8fa7-311f9bf89b5c.changelog
new file mode 100644
index 0000000000000..df9e1c903c8a8
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/2_6225c438-35c9-421d-8fa7-311f9bf89b5c.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/2_6225c438-35c9-421d-8fa7-311f9bf89b5c.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/2_6225c438-35c9-421d-8fa7-311f9bf89b5c.zip
new file mode 100644
index 0000000000000..acb07fea9ef63
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/2_6225c438-35c9-421d-8fa7-311f9bf89b5c.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/3_4400d93a-91df-4e1a-a210-0e94c07a8dbb.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/3_4400d93a-91df-4e1a-a210-0e94c07a8dbb.changelog
new file mode 100644
index 0000000000000..efb7f0e3cf2fc
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/3_4400d93a-91df-4e1a-a210-0e94c07a8dbb.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/4_472f5f70-3384-4ddc-a7d6-2b182df8c729.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/4_472f5f70-3384-4ddc-a7d6-2b182df8c729.changelog
new file mode 100644
index 0000000000000..b32ad9b734488
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/4_472f5f70-3384-4ddc-a7d6-2b182df8c729.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/4_472f5f70-3384-4ddc-a7d6-2b182df8c729.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/4_472f5f70-3384-4ddc-a7d6-2b182df8c729.zip
new file mode 100644
index 0000000000000..20b149264a7c2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/4_472f5f70-3384-4ddc-a7d6-2b182df8c729.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/5_a62bfa7f-e29e-42b5-a4f2-51593b2dc9bf.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/5_a62bfa7f-e29e-42b5-a4f2-51593b2dc9bf.changelog
new file mode 100644
index 0000000000000..80626e2cf2532
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/5_a62bfa7f-e29e-42b5-a4f2-51593b2dc9bf.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/SSTs/.000008-554c9da1-e4f8-4029-befd-b7d746125b7b.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/SSTs/.000008-554c9da1-e4f8-4029-befd-b7d746125b7b.sst.crc
new file mode 100644
index 0000000000000..fc316e39bf9d1
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/SSTs/.000008-554c9da1-e4f8-4029-befd-b7d746125b7b.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/SSTs/000008-554c9da1-e4f8-4029-befd-b7d746125b7b.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/SSTs/000008-554c9da1-e4f8-4029-befd-b7d746125b7b.sst
new file mode 100644
index 0000000000000..e2d77b4de1079
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/left-keyWithIndexToValue/SSTs/000008-554c9da1-e4f8-4029-befd-b7d746125b7b.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.1_3f4088b2-07e9-40a4-ab7f-325f53aa522d.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.1_3f4088b2-07e9-40a4-ab7f-325f53aa522d.changelog.crc
new file mode 100644
index 0000000000000..14ce93d6939eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.1_3f4088b2-07e9-40a4-ab7f-325f53aa522d.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.2_c919b4ed-56ed-4e9d-a84f-d10a583c3176.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.2_c919b4ed-56ed-4e9d-a84f-d10a583c3176.changelog.crc
new file mode 100644
index 0000000000000..24bec8ae66e98
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.2_c919b4ed-56ed-4e9d-a84f-d10a583c3176.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.2_c919b4ed-56ed-4e9d-a84f-d10a583c3176.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.2_c919b4ed-56ed-4e9d-a84f-d10a583c3176.zip.crc
new file mode 100644
index 0000000000000..18344a767de1d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.2_c919b4ed-56ed-4e9d-a84f-d10a583c3176.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.3_4cf8a931-fed7-4ec4-b007-3279c0fabd58.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.3_4cf8a931-fed7-4ec4-b007-3279c0fabd58.changelog.crc
new file mode 100644
index 0000000000000..e5e63bdf7c9c8
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.3_4cf8a931-fed7-4ec4-b007-3279c0fabd58.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.4_4f8cea8d-08d1-4394-b161-40b73a4153f6.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.4_4f8cea8d-08d1-4394-b161-40b73a4153f6.changelog.crc
new file mode 100644
index 0000000000000..a3d370b91b3ca
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.4_4f8cea8d-08d1-4394-b161-40b73a4153f6.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.4_4f8cea8d-08d1-4394-b161-40b73a4153f6.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.4_4f8cea8d-08d1-4394-b161-40b73a4153f6.zip.crc
new file mode 100644
index 0000000000000..3fd123ae58688
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.4_4f8cea8d-08d1-4394-b161-40b73a4153f6.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.5_ded695aa-21b8-4628-a14d-1ca366cf1773.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.5_ded695aa-21b8-4628-a14d-1ca366cf1773.changelog.crc
new file mode 100644
index 0000000000000..90eabb88c513f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/.5_ded695aa-21b8-4628-a14d-1ca366cf1773.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/1_3f4088b2-07e9-40a4-ab7f-325f53aa522d.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/1_3f4088b2-07e9-40a4-ab7f-325f53aa522d.changelog
new file mode 100644
index 0000000000000..b842ca7e8a4c1
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/1_3f4088b2-07e9-40a4-ab7f-325f53aa522d.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/2_c919b4ed-56ed-4e9d-a84f-d10a583c3176.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/2_c919b4ed-56ed-4e9d-a84f-d10a583c3176.changelog
new file mode 100644
index 0000000000000..acd6f03602f30
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/2_c919b4ed-56ed-4e9d-a84f-d10a583c3176.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/2_c919b4ed-56ed-4e9d-a84f-d10a583c3176.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/2_c919b4ed-56ed-4e9d-a84f-d10a583c3176.zip
new file mode 100644
index 0000000000000..3b353d69a1011
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/2_c919b4ed-56ed-4e9d-a84f-d10a583c3176.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/3_4cf8a931-fed7-4ec4-b007-3279c0fabd58.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/3_4cf8a931-fed7-4ec4-b007-3279c0fabd58.changelog
new file mode 100644
index 0000000000000..86e843a649494
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/3_4cf8a931-fed7-4ec4-b007-3279c0fabd58.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/4_4f8cea8d-08d1-4394-b161-40b73a4153f6.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/4_4f8cea8d-08d1-4394-b161-40b73a4153f6.changelog
new file mode 100644
index 0000000000000..c71fda4b5c55e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/4_4f8cea8d-08d1-4394-b161-40b73a4153f6.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/4_4f8cea8d-08d1-4394-b161-40b73a4153f6.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/4_4f8cea8d-08d1-4394-b161-40b73a4153f6.zip
new file mode 100644
index 0000000000000..de2fa5f3257ee
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/4_4f8cea8d-08d1-4394-b161-40b73a4153f6.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/5_ded695aa-21b8-4628-a14d-1ca366cf1773.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/5_ded695aa-21b8-4628-a14d-1ca366cf1773.changelog
new file mode 100644
index 0000000000000..e0e6dfd868dd0
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/5_ded695aa-21b8-4628-a14d-1ca366cf1773.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/SSTs/.000008-adce55b9-ad43-4c80-b36e-c5607c6a5496.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/SSTs/.000008-adce55b9-ad43-4c80-b36e-c5607c6a5496.sst.crc
new file mode 100644
index 0000000000000..26ef63820abbf
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/SSTs/.000008-adce55b9-ad43-4c80-b36e-c5607c6a5496.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/SSTs/.000009-78ccbc50-5b9a-46da-b748-81ebe5ef3da5.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/SSTs/.000009-78ccbc50-5b9a-46da-b748-81ebe5ef3da5.sst.crc
new file mode 100644
index 0000000000000..c7d8ec6b083e2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/SSTs/.000009-78ccbc50-5b9a-46da-b748-81ebe5ef3da5.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/SSTs/000008-adce55b9-ad43-4c80-b36e-c5607c6a5496.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/SSTs/000008-adce55b9-ad43-4c80-b36e-c5607c6a5496.sst
new file mode 100644
index 0000000000000..cd9a0f532e90d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/SSTs/000008-adce55b9-ad43-4c80-b36e-c5607c6a5496.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/SSTs/000009-78ccbc50-5b9a-46da-b748-81ebe5ef3da5.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/SSTs/000009-78ccbc50-5b9a-46da-b748-81ebe5ef3da5.sst
new file mode 100644
index 0000000000000..903a4c80e602c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyToNumValues/SSTs/000009-78ccbc50-5b9a-46da-b748-81ebe5ef3da5.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.1_e35bf8e0-2df3-4d07-905c-294acf5c1972.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.1_e35bf8e0-2df3-4d07-905c-294acf5c1972.changelog.crc
new file mode 100644
index 0000000000000..90455f222b12d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.1_e35bf8e0-2df3-4d07-905c-294acf5c1972.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.2_a6f41760-bb3a-4f66-8eac-b5b29989e4b5.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.2_a6f41760-bb3a-4f66-8eac-b5b29989e4b5.changelog.crc
new file mode 100644
index 0000000000000..eabda8a951e93
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.2_a6f41760-bb3a-4f66-8eac-b5b29989e4b5.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.2_a6f41760-bb3a-4f66-8eac-b5b29989e4b5.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.2_a6f41760-bb3a-4f66-8eac-b5b29989e4b5.zip.crc
new file mode 100644
index 0000000000000..3e91bac259c15
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.2_a6f41760-bb3a-4f66-8eac-b5b29989e4b5.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.3_d3e3fd82-20dd-4ab3-b517-9a7cfb2a6d30.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.3_d3e3fd82-20dd-4ab3-b517-9a7cfb2a6d30.changelog.crc
new file mode 100644
index 0000000000000..f775ba5145c9e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.3_d3e3fd82-20dd-4ab3-b517-9a7cfb2a6d30.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.4_3833a5e0-b36c-43c2-827b-a72f1cf73049.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.4_3833a5e0-b36c-43c2-827b-a72f1cf73049.changelog.crc
new file mode 100644
index 0000000000000..f86cf67849f36
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.4_3833a5e0-b36c-43c2-827b-a72f1cf73049.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.4_3833a5e0-b36c-43c2-827b-a72f1cf73049.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.4_3833a5e0-b36c-43c2-827b-a72f1cf73049.zip.crc
new file mode 100644
index 0000000000000..060debb0d97e2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.4_3833a5e0-b36c-43c2-827b-a72f1cf73049.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.5_470e372e-3d2f-43f1-8e82-65f3bf2e0f66.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.5_470e372e-3d2f-43f1-8e82-65f3bf2e0f66.changelog.crc
new file mode 100644
index 0000000000000..66ccde0308023
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/.5_470e372e-3d2f-43f1-8e82-65f3bf2e0f66.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/1_e35bf8e0-2df3-4d07-905c-294acf5c1972.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/1_e35bf8e0-2df3-4d07-905c-294acf5c1972.changelog
new file mode 100644
index 0000000000000..215bbe88872e4
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/1_e35bf8e0-2df3-4d07-905c-294acf5c1972.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/2_a6f41760-bb3a-4f66-8eac-b5b29989e4b5.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/2_a6f41760-bb3a-4f66-8eac-b5b29989e4b5.changelog
new file mode 100644
index 0000000000000..688e3727152d9
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/2_a6f41760-bb3a-4f66-8eac-b5b29989e4b5.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/2_a6f41760-bb3a-4f66-8eac-b5b29989e4b5.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/2_a6f41760-bb3a-4f66-8eac-b5b29989e4b5.zip
new file mode 100644
index 0000000000000..ef125f9ff747f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/2_a6f41760-bb3a-4f66-8eac-b5b29989e4b5.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/3_d3e3fd82-20dd-4ab3-b517-9a7cfb2a6d30.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/3_d3e3fd82-20dd-4ab3-b517-9a7cfb2a6d30.changelog
new file mode 100644
index 0000000000000..aa482b5d91fd5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/3_d3e3fd82-20dd-4ab3-b517-9a7cfb2a6d30.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/4_3833a5e0-b36c-43c2-827b-a72f1cf73049.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/4_3833a5e0-b36c-43c2-827b-a72f1cf73049.changelog
new file mode 100644
index 0000000000000..0246b4acecc55
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/4_3833a5e0-b36c-43c2-827b-a72f1cf73049.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/4_3833a5e0-b36c-43c2-827b-a72f1cf73049.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/4_3833a5e0-b36c-43c2-827b-a72f1cf73049.zip
new file mode 100644
index 0000000000000..c1c1d5064ef0a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/4_3833a5e0-b36c-43c2-827b-a72f1cf73049.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/5_470e372e-3d2f-43f1-8e82-65f3bf2e0f66.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/5_470e372e-3d2f-43f1-8e82-65f3bf2e0f66.changelog
new file mode 100644
index 0000000000000..1545acc4bf3f3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/5_470e372e-3d2f-43f1-8e82-65f3bf2e0f66.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/SSTs/.000008-d6f61c55-baee-4e82-8e1c-8413214bb7f6.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/SSTs/.000008-d6f61c55-baee-4e82-8e1c-8413214bb7f6.sst.crc
new file mode 100644
index 0000000000000..199d43c2ade02
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/SSTs/.000008-d6f61c55-baee-4e82-8e1c-8413214bb7f6.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/SSTs/.000009-df702d5a-2471-40ba-9bd2-01863321f4f4.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/SSTs/.000009-df702d5a-2471-40ba-9bd2-01863321f4f4.sst.crc
new file mode 100644
index 0000000000000..c3a4ecb36fa55
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/SSTs/.000009-df702d5a-2471-40ba-9bd2-01863321f4f4.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/SSTs/000008-d6f61c55-baee-4e82-8e1c-8413214bb7f6.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/SSTs/000008-d6f61c55-baee-4e82-8e1c-8413214bb7f6.sst
new file mode 100644
index 0000000000000..f9cfb98494149
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/SSTs/000008-d6f61c55-baee-4e82-8e1c-8413214bb7f6.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/SSTs/000009-df702d5a-2471-40ba-9bd2-01863321f4f4.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/SSTs/000009-df702d5a-2471-40ba-9bd2-01863321f4f4.sst
new file mode 100644
index 0000000000000..b434894a2fcaf
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/2/right-keyWithIndexToValue/SSTs/000009-df702d5a-2471-40ba-9bd2-01863321f4f4.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.1_11c4ae69-0043-4d0a-8435-43ed3917beea.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.1_11c4ae69-0043-4d0a-8435-43ed3917beea.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.1_11c4ae69-0043-4d0a-8435-43ed3917beea.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.2_ea813f1a-96a7-4326-a28c-906a78c61e06.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.2_ea813f1a-96a7-4326-a28c-906a78c61e06.changelog.crc
new file mode 100644
index 0000000000000..3f3d0f624c11b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.2_ea813f1a-96a7-4326-a28c-906a78c61e06.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.2_ea813f1a-96a7-4326-a28c-906a78c61e06.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.2_ea813f1a-96a7-4326-a28c-906a78c61e06.zip.crc
new file mode 100644
index 0000000000000..6205af4b137e2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.2_ea813f1a-96a7-4326-a28c-906a78c61e06.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.3_ea6cc9aa-d08b-459a-ba39-d9a3a8e00fc3.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.3_ea6cc9aa-d08b-459a-ba39-d9a3a8e00fc3.changelog.crc
new file mode 100644
index 0000000000000..72651bf8bc458
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.3_ea6cc9aa-d08b-459a-ba39-d9a3a8e00fc3.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.4_68d23059-2ad1-4ed4-ad24-1b5b696b9ec7.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.4_68d23059-2ad1-4ed4-ad24-1b5b696b9ec7.changelog.crc
new file mode 100644
index 0000000000000..d67a5776eae29
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.4_68d23059-2ad1-4ed4-ad24-1b5b696b9ec7.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.4_68d23059-2ad1-4ed4-ad24-1b5b696b9ec7.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.4_68d23059-2ad1-4ed4-ad24-1b5b696b9ec7.zip.crc
new file mode 100644
index 0000000000000..54a3f5a96df49
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.4_68d23059-2ad1-4ed4-ad24-1b5b696b9ec7.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.5_4531ecd4-1b98-4793-ac78-da5ac0ec7e7c.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.5_4531ecd4-1b98-4793-ac78-da5ac0ec7e7c.changelog.crc
new file mode 100644
index 0000000000000..8af8665d45080
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/.5_4531ecd4-1b98-4793-ac78-da5ac0ec7e7c.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/1_11c4ae69-0043-4d0a-8435-43ed3917beea.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/1_11c4ae69-0043-4d0a-8435-43ed3917beea.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/1_11c4ae69-0043-4d0a-8435-43ed3917beea.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/2_ea813f1a-96a7-4326-a28c-906a78c61e06.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/2_ea813f1a-96a7-4326-a28c-906a78c61e06.changelog
new file mode 100644
index 0000000000000..406135aed6d6d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/2_ea813f1a-96a7-4326-a28c-906a78c61e06.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/2_ea813f1a-96a7-4326-a28c-906a78c61e06.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/2_ea813f1a-96a7-4326-a28c-906a78c61e06.zip
new file mode 100644
index 0000000000000..7d7e6600e471f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/2_ea813f1a-96a7-4326-a28c-906a78c61e06.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/3_ea6cc9aa-d08b-459a-ba39-d9a3a8e00fc3.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/3_ea6cc9aa-d08b-459a-ba39-d9a3a8e00fc3.changelog
new file mode 100644
index 0000000000000..8b20dd494e69b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/3_ea6cc9aa-d08b-459a-ba39-d9a3a8e00fc3.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/4_68d23059-2ad1-4ed4-ad24-1b5b696b9ec7.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/4_68d23059-2ad1-4ed4-ad24-1b5b696b9ec7.changelog
new file mode 100644
index 0000000000000..7c223d7473522
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/4_68d23059-2ad1-4ed4-ad24-1b5b696b9ec7.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/4_68d23059-2ad1-4ed4-ad24-1b5b696b9ec7.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/4_68d23059-2ad1-4ed4-ad24-1b5b696b9ec7.zip
new file mode 100644
index 0000000000000..a7346133b4e82
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/4_68d23059-2ad1-4ed4-ad24-1b5b696b9ec7.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/5_4531ecd4-1b98-4793-ac78-da5ac0ec7e7c.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/5_4531ecd4-1b98-4793-ac78-da5ac0ec7e7c.changelog
new file mode 100644
index 0000000000000..91311e42e408c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/5_4531ecd4-1b98-4793-ac78-da5ac0ec7e7c.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/SSTs/.000008-db4557c2-0ff3-47dd-9693-d74cb46fa966.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/SSTs/.000008-db4557c2-0ff3-47dd-9693-d74cb46fa966.sst.crc
new file mode 100644
index 0000000000000..b559f2db2b33f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/SSTs/.000008-db4557c2-0ff3-47dd-9693-d74cb46fa966.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/SSTs/.000009-291f6422-3c94-4ae3-8b72-e7496c667b9f.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/SSTs/.000009-291f6422-3c94-4ae3-8b72-e7496c667b9f.sst.crc
new file mode 100644
index 0000000000000..dad0077cbd8ee
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/SSTs/.000009-291f6422-3c94-4ae3-8b72-e7496c667b9f.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/SSTs/000008-db4557c2-0ff3-47dd-9693-d74cb46fa966.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/SSTs/000008-db4557c2-0ff3-47dd-9693-d74cb46fa966.sst
new file mode 100644
index 0000000000000..8c5e8e8849a2d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/SSTs/000008-db4557c2-0ff3-47dd-9693-d74cb46fa966.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/SSTs/000009-291f6422-3c94-4ae3-8b72-e7496c667b9f.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/SSTs/000009-291f6422-3c94-4ae3-8b72-e7496c667b9f.sst
new file mode 100644
index 0000000000000..21112193a0fd5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyToNumValues/SSTs/000009-291f6422-3c94-4ae3-8b72-e7496c667b9f.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.1_eed857a8-176f-44fd-8756-6c7275cf3327.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.1_eed857a8-176f-44fd-8756-6c7275cf3327.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.1_eed857a8-176f-44fd-8756-6c7275cf3327.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.2_1da87f15-0019-465f-82fb-b904b1db9033.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.2_1da87f15-0019-465f-82fb-b904b1db9033.changelog.crc
new file mode 100644
index 0000000000000..f04e1b49301ce
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.2_1da87f15-0019-465f-82fb-b904b1db9033.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.2_1da87f15-0019-465f-82fb-b904b1db9033.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.2_1da87f15-0019-465f-82fb-b904b1db9033.zip.crc
new file mode 100644
index 0000000000000..288b44b0c09cb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.2_1da87f15-0019-465f-82fb-b904b1db9033.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.3_c7fad650-bcba-491e-87ab-946dc0462203.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.3_c7fad650-bcba-491e-87ab-946dc0462203.changelog.crc
new file mode 100644
index 0000000000000..5d33e2c0ee78e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.3_c7fad650-bcba-491e-87ab-946dc0462203.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.4_eeb41fb7-2005-48d1-8ebe-fc4540c8e53b.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.4_eeb41fb7-2005-48d1-8ebe-fc4540c8e53b.changelog.crc
new file mode 100644
index 0000000000000..0883fce3198ae
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.4_eeb41fb7-2005-48d1-8ebe-fc4540c8e53b.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.4_eeb41fb7-2005-48d1-8ebe-fc4540c8e53b.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.4_eeb41fb7-2005-48d1-8ebe-fc4540c8e53b.zip.crc
new file mode 100644
index 0000000000000..b4b40f1486b6e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.4_eeb41fb7-2005-48d1-8ebe-fc4540c8e53b.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.5_8683c28d-8fcf-48d2-8b3f-6d1834c5968c.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.5_8683c28d-8fcf-48d2-8b3f-6d1834c5968c.changelog.crc
new file mode 100644
index 0000000000000..97320c3c46a46
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/.5_8683c28d-8fcf-48d2-8b3f-6d1834c5968c.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/1_eed857a8-176f-44fd-8756-6c7275cf3327.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/1_eed857a8-176f-44fd-8756-6c7275cf3327.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/1_eed857a8-176f-44fd-8756-6c7275cf3327.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/2_1da87f15-0019-465f-82fb-b904b1db9033.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/2_1da87f15-0019-465f-82fb-b904b1db9033.changelog
new file mode 100644
index 0000000000000..5609f1eb057b2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/2_1da87f15-0019-465f-82fb-b904b1db9033.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/2_1da87f15-0019-465f-82fb-b904b1db9033.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/2_1da87f15-0019-465f-82fb-b904b1db9033.zip
new file mode 100644
index 0000000000000..c346d31c19a38
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/2_1da87f15-0019-465f-82fb-b904b1db9033.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/3_c7fad650-bcba-491e-87ab-946dc0462203.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/3_c7fad650-bcba-491e-87ab-946dc0462203.changelog
new file mode 100644
index 0000000000000..55ae6b2b6b3d4
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/3_c7fad650-bcba-491e-87ab-946dc0462203.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/4_eeb41fb7-2005-48d1-8ebe-fc4540c8e53b.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/4_eeb41fb7-2005-48d1-8ebe-fc4540c8e53b.changelog
new file mode 100644
index 0000000000000..5b14dfdfa9b7c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/4_eeb41fb7-2005-48d1-8ebe-fc4540c8e53b.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/4_eeb41fb7-2005-48d1-8ebe-fc4540c8e53b.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/4_eeb41fb7-2005-48d1-8ebe-fc4540c8e53b.zip
new file mode 100644
index 0000000000000..7c2fdb5f53172
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/4_eeb41fb7-2005-48d1-8ebe-fc4540c8e53b.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/5_8683c28d-8fcf-48d2-8b3f-6d1834c5968c.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/5_8683c28d-8fcf-48d2-8b3f-6d1834c5968c.changelog
new file mode 100644
index 0000000000000..08c83ea3de4e9
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/5_8683c28d-8fcf-48d2-8b3f-6d1834c5968c.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/SSTs/.000008-2fb6d645-9618-43db-9d98-feb1f2dc1b53.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/SSTs/.000008-2fb6d645-9618-43db-9d98-feb1f2dc1b53.sst.crc
new file mode 100644
index 0000000000000..5fe5942af6eec
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/SSTs/.000008-2fb6d645-9618-43db-9d98-feb1f2dc1b53.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/SSTs/.000009-84827ac9-d4c5-4ac4-a210-a1996e7ee85b.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/SSTs/.000009-84827ac9-d4c5-4ac4-a210-a1996e7ee85b.sst.crc
new file mode 100644
index 0000000000000..16de668fc938f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/SSTs/.000009-84827ac9-d4c5-4ac4-a210-a1996e7ee85b.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/SSTs/000008-2fb6d645-9618-43db-9d98-feb1f2dc1b53.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/SSTs/000008-2fb6d645-9618-43db-9d98-feb1f2dc1b53.sst
new file mode 100644
index 0000000000000..027b4fdba4e71
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/SSTs/000008-2fb6d645-9618-43db-9d98-feb1f2dc1b53.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/SSTs/000009-84827ac9-d4c5-4ac4-a210-a1996e7ee85b.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/SSTs/000009-84827ac9-d4c5-4ac4-a210-a1996e7ee85b.sst
new file mode 100644
index 0000000000000..b23f395fa31fa
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/left-keyWithIndexToValue/SSTs/000009-84827ac9-d4c5-4ac4-a210-a1996e7ee85b.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.1_664bf358-72e1-47ff-b8e0-596947b064a6.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.1_664bf358-72e1-47ff-b8e0-596947b064a6.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.1_664bf358-72e1-47ff-b8e0-596947b064a6.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.2_a18db5f8-577a-4c7e-b893-b1c9121c461e.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.2_a18db5f8-577a-4c7e-b893-b1c9121c461e.changelog.crc
new file mode 100644
index 0000000000000..bb923e2fd2006
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.2_a18db5f8-577a-4c7e-b893-b1c9121c461e.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.2_a18db5f8-577a-4c7e-b893-b1c9121c461e.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.2_a18db5f8-577a-4c7e-b893-b1c9121c461e.zip.crc
new file mode 100644
index 0000000000000..964cf768e2aae
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.2_a18db5f8-577a-4c7e-b893-b1c9121c461e.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.3_0e6f4a80-ba3d-40e2-82c4-bfbd226f8a41.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.3_0e6f4a80-ba3d-40e2-82c4-bfbd226f8a41.changelog.crc
new file mode 100644
index 0000000000000..c84bc6edbf78d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.3_0e6f4a80-ba3d-40e2-82c4-bfbd226f8a41.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.4_f8d667d0-9fc7-48c8-9662-244db0e2a7b6.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.4_f8d667d0-9fc7-48c8-9662-244db0e2a7b6.changelog.crc
new file mode 100644
index 0000000000000..1fefc0da5e754
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.4_f8d667d0-9fc7-48c8-9662-244db0e2a7b6.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.4_f8d667d0-9fc7-48c8-9662-244db0e2a7b6.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.4_f8d667d0-9fc7-48c8-9662-244db0e2a7b6.zip.crc
new file mode 100644
index 0000000000000..a7cb32120f2be
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.4_f8d667d0-9fc7-48c8-9662-244db0e2a7b6.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.5_3a1ef380-8c5f-4e6a-9d8d-128db68849f9.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.5_3a1ef380-8c5f-4e6a-9d8d-128db68849f9.changelog.crc
new file mode 100644
index 0000000000000..43bf5735c6211
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/.5_3a1ef380-8c5f-4e6a-9d8d-128db68849f9.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/1_664bf358-72e1-47ff-b8e0-596947b064a6.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/1_664bf358-72e1-47ff-b8e0-596947b064a6.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/1_664bf358-72e1-47ff-b8e0-596947b064a6.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/2_a18db5f8-577a-4c7e-b893-b1c9121c461e.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/2_a18db5f8-577a-4c7e-b893-b1c9121c461e.changelog
new file mode 100644
index 0000000000000..e459fcaab3985
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/2_a18db5f8-577a-4c7e-b893-b1c9121c461e.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/2_a18db5f8-577a-4c7e-b893-b1c9121c461e.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/2_a18db5f8-577a-4c7e-b893-b1c9121c461e.zip
new file mode 100644
index 0000000000000..f3d0d789a2bcf
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/2_a18db5f8-577a-4c7e-b893-b1c9121c461e.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/3_0e6f4a80-ba3d-40e2-82c4-bfbd226f8a41.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/3_0e6f4a80-ba3d-40e2-82c4-bfbd226f8a41.changelog
new file mode 100644
index 0000000000000..7ed3d66a7caba
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/3_0e6f4a80-ba3d-40e2-82c4-bfbd226f8a41.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/4_f8d667d0-9fc7-48c8-9662-244db0e2a7b6.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/4_f8d667d0-9fc7-48c8-9662-244db0e2a7b6.changelog
new file mode 100644
index 0000000000000..c1f1b1c3b1a6c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/4_f8d667d0-9fc7-48c8-9662-244db0e2a7b6.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/4_f8d667d0-9fc7-48c8-9662-244db0e2a7b6.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/4_f8d667d0-9fc7-48c8-9662-244db0e2a7b6.zip
new file mode 100644
index 0000000000000..f73e5309b1e68
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/4_f8d667d0-9fc7-48c8-9662-244db0e2a7b6.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/5_3a1ef380-8c5f-4e6a-9d8d-128db68849f9.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/5_3a1ef380-8c5f-4e6a-9d8d-128db68849f9.changelog
new file mode 100644
index 0000000000000..1038a28e4c48b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/5_3a1ef380-8c5f-4e6a-9d8d-128db68849f9.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/SSTs/.000008-c7bd2c00-b411-4413-8a97-7bc2c5aca28f.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/SSTs/.000008-c7bd2c00-b411-4413-8a97-7bc2c5aca28f.sst.crc
new file mode 100644
index 0000000000000..0bc4dc9db88c2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/SSTs/.000008-c7bd2c00-b411-4413-8a97-7bc2c5aca28f.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/SSTs/.000009-f4e35243-d651-435e-8a42-91f15b4a241e.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/SSTs/.000009-f4e35243-d651-435e-8a42-91f15b4a241e.sst.crc
new file mode 100644
index 0000000000000..ff36b10d73d74
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/SSTs/.000009-f4e35243-d651-435e-8a42-91f15b4a241e.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/SSTs/000008-c7bd2c00-b411-4413-8a97-7bc2c5aca28f.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/SSTs/000008-c7bd2c00-b411-4413-8a97-7bc2c5aca28f.sst
new file mode 100644
index 0000000000000..fad0a61056f52
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/SSTs/000008-c7bd2c00-b411-4413-8a97-7bc2c5aca28f.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/SSTs/000009-f4e35243-d651-435e-8a42-91f15b4a241e.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/SSTs/000009-f4e35243-d651-435e-8a42-91f15b4a241e.sst
new file mode 100644
index 0000000000000..8f5454e713007
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyToNumValues/SSTs/000009-f4e35243-d651-435e-8a42-91f15b4a241e.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.1_c0055433-df0b-4456-ab34-2bf8efd2b687.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.1_c0055433-df0b-4456-ab34-2bf8efd2b687.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.1_c0055433-df0b-4456-ab34-2bf8efd2b687.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.2_8a8c64d1-b579-4b5c-9ffa-312d7c42de3f.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.2_8a8c64d1-b579-4b5c-9ffa-312d7c42de3f.changelog.crc
new file mode 100644
index 0000000000000..a90a585277ea2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.2_8a8c64d1-b579-4b5c-9ffa-312d7c42de3f.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.2_8a8c64d1-b579-4b5c-9ffa-312d7c42de3f.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.2_8a8c64d1-b579-4b5c-9ffa-312d7c42de3f.zip.crc
new file mode 100644
index 0000000000000..875968dc55d83
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.2_8a8c64d1-b579-4b5c-9ffa-312d7c42de3f.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.3_d6a0dcd6-2657-4879-b528-9cb21208bdbe.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.3_d6a0dcd6-2657-4879-b528-9cb21208bdbe.changelog.crc
new file mode 100644
index 0000000000000..5c081a1ec64d4
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.3_d6a0dcd6-2657-4879-b528-9cb21208bdbe.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.4_c5711e4e-9488-4944-9845-feda3b8aa10c.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.4_c5711e4e-9488-4944-9845-feda3b8aa10c.changelog.crc
new file mode 100644
index 0000000000000..f62366439d306
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.4_c5711e4e-9488-4944-9845-feda3b8aa10c.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.4_c5711e4e-9488-4944-9845-feda3b8aa10c.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.4_c5711e4e-9488-4944-9845-feda3b8aa10c.zip.crc
new file mode 100644
index 0000000000000..d3f7609e57a53
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.4_c5711e4e-9488-4944-9845-feda3b8aa10c.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.5_e2553009-8003-4c43-9d2a-540f865f1e0d.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.5_e2553009-8003-4c43-9d2a-540f865f1e0d.changelog.crc
new file mode 100644
index 0000000000000..52bede6690fad
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/.5_e2553009-8003-4c43-9d2a-540f865f1e0d.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/1_c0055433-df0b-4456-ab34-2bf8efd2b687.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/1_c0055433-df0b-4456-ab34-2bf8efd2b687.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/1_c0055433-df0b-4456-ab34-2bf8efd2b687.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/2_8a8c64d1-b579-4b5c-9ffa-312d7c42de3f.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/2_8a8c64d1-b579-4b5c-9ffa-312d7c42de3f.changelog
new file mode 100644
index 0000000000000..28d1381e8ba82
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/2_8a8c64d1-b579-4b5c-9ffa-312d7c42de3f.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/2_8a8c64d1-b579-4b5c-9ffa-312d7c42de3f.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/2_8a8c64d1-b579-4b5c-9ffa-312d7c42de3f.zip
new file mode 100644
index 0000000000000..23b68f8fe0162
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/2_8a8c64d1-b579-4b5c-9ffa-312d7c42de3f.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/3_d6a0dcd6-2657-4879-b528-9cb21208bdbe.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/3_d6a0dcd6-2657-4879-b528-9cb21208bdbe.changelog
new file mode 100644
index 0000000000000..657780b3de838
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/3_d6a0dcd6-2657-4879-b528-9cb21208bdbe.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/4_c5711e4e-9488-4944-9845-feda3b8aa10c.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/4_c5711e4e-9488-4944-9845-feda3b8aa10c.changelog
new file mode 100644
index 0000000000000..3ca37d58e2638
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/4_c5711e4e-9488-4944-9845-feda3b8aa10c.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/4_c5711e4e-9488-4944-9845-feda3b8aa10c.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/4_c5711e4e-9488-4944-9845-feda3b8aa10c.zip
new file mode 100644
index 0000000000000..e27bff7683e5f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/4_c5711e4e-9488-4944-9845-feda3b8aa10c.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/5_e2553009-8003-4c43-9d2a-540f865f1e0d.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/5_e2553009-8003-4c43-9d2a-540f865f1e0d.changelog
new file mode 100644
index 0000000000000..0f5d7cd6be5ce
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/5_e2553009-8003-4c43-9d2a-540f865f1e0d.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/SSTs/.000008-d41a4c93-56ea-4814-8e7a-f92bd6c9da7e.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/SSTs/.000008-d41a4c93-56ea-4814-8e7a-f92bd6c9da7e.sst.crc
new file mode 100644
index 0000000000000..ecc78b897ff5a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/SSTs/.000008-d41a4c93-56ea-4814-8e7a-f92bd6c9da7e.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/SSTs/.000009-cd157803-2739-45a3-8b5f-25ac0b8e9ae5.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/SSTs/.000009-cd157803-2739-45a3-8b5f-25ac0b8e9ae5.sst.crc
new file mode 100644
index 0000000000000..94687d423a2b3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/SSTs/.000009-cd157803-2739-45a3-8b5f-25ac0b8e9ae5.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/SSTs/000008-d41a4c93-56ea-4814-8e7a-f92bd6c9da7e.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/SSTs/000008-d41a4c93-56ea-4814-8e7a-f92bd6c9da7e.sst
new file mode 100644
index 0000000000000..0330e20ed78b7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/SSTs/000008-d41a4c93-56ea-4814-8e7a-f92bd6c9da7e.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/SSTs/000009-cd157803-2739-45a3-8b5f-25ac0b8e9ae5.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/SSTs/000009-cd157803-2739-45a3-8b5f-25ac0b8e9ae5.sst
new file mode 100644
index 0000000000000..51deb2f9acb36
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/3/right-keyWithIndexToValue/SSTs/000009-cd157803-2739-45a3-8b5f-25ac0b8e9ae5.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.1_9d2ab98c-6788-4891-9688-21e1711f1654.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.1_9d2ab98c-6788-4891-9688-21e1711f1654.changelog.crc
new file mode 100644
index 0000000000000..1b44d43130d13
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.1_9d2ab98c-6788-4891-9688-21e1711f1654.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.2_1f16fe91-b66d-4297-b2ab-8d4a3d7ee93a.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.2_1f16fe91-b66d-4297-b2ab-8d4a3d7ee93a.changelog.crc
new file mode 100644
index 0000000000000..092fd9a7722d7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.2_1f16fe91-b66d-4297-b2ab-8d4a3d7ee93a.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.2_1f16fe91-b66d-4297-b2ab-8d4a3d7ee93a.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.2_1f16fe91-b66d-4297-b2ab-8d4a3d7ee93a.zip.crc
new file mode 100644
index 0000000000000..80bb06e585c16
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.2_1f16fe91-b66d-4297-b2ab-8d4a3d7ee93a.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.3_d395f05b-3513-4b82-b8ae-508f84a0152f.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.3_d395f05b-3513-4b82-b8ae-508f84a0152f.changelog.crc
new file mode 100644
index 0000000000000..0091cc70f37fd
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.3_d395f05b-3513-4b82-b8ae-508f84a0152f.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.4_e23790f1-6d21-48b4-af3d-59eb348b81e0.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.4_e23790f1-6d21-48b4-af3d-59eb348b81e0.changelog.crc
new file mode 100644
index 0000000000000..24b7f030a7837
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.4_e23790f1-6d21-48b4-af3d-59eb348b81e0.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.4_e23790f1-6d21-48b4-af3d-59eb348b81e0.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.4_e23790f1-6d21-48b4-af3d-59eb348b81e0.zip.crc
new file mode 100644
index 0000000000000..6906d348c1c7a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.4_e23790f1-6d21-48b4-af3d-59eb348b81e0.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.5_9d1bda14-3036-434c-a59f-fe19c1cd06dd.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.5_9d1bda14-3036-434c-a59f-fe19c1cd06dd.changelog.crc
new file mode 100644
index 0000000000000..a104b595c32f2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/.5_9d1bda14-3036-434c-a59f-fe19c1cd06dd.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/1_9d2ab98c-6788-4891-9688-21e1711f1654.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/1_9d2ab98c-6788-4891-9688-21e1711f1654.changelog
new file mode 100644
index 0000000000000..f1403c9e68632
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/1_9d2ab98c-6788-4891-9688-21e1711f1654.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/2_1f16fe91-b66d-4297-b2ab-8d4a3d7ee93a.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/2_1f16fe91-b66d-4297-b2ab-8d4a3d7ee93a.changelog
new file mode 100644
index 0000000000000..24fcd80d94b87
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/2_1f16fe91-b66d-4297-b2ab-8d4a3d7ee93a.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/2_1f16fe91-b66d-4297-b2ab-8d4a3d7ee93a.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/2_1f16fe91-b66d-4297-b2ab-8d4a3d7ee93a.zip
new file mode 100644
index 0000000000000..a288d32c6c4ee
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/2_1f16fe91-b66d-4297-b2ab-8d4a3d7ee93a.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/3_d395f05b-3513-4b82-b8ae-508f84a0152f.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/3_d395f05b-3513-4b82-b8ae-508f84a0152f.changelog
new file mode 100644
index 0000000000000..4dbe0d0e8aeec
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/3_d395f05b-3513-4b82-b8ae-508f84a0152f.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/4_e23790f1-6d21-48b4-af3d-59eb348b81e0.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/4_e23790f1-6d21-48b4-af3d-59eb348b81e0.changelog
new file mode 100644
index 0000000000000..f5cd380019e36
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/4_e23790f1-6d21-48b4-af3d-59eb348b81e0.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/4_e23790f1-6d21-48b4-af3d-59eb348b81e0.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/4_e23790f1-6d21-48b4-af3d-59eb348b81e0.zip
new file mode 100644
index 0000000000000..eb5b8b4318ca3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/4_e23790f1-6d21-48b4-af3d-59eb348b81e0.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/5_9d1bda14-3036-434c-a59f-fe19c1cd06dd.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/5_9d1bda14-3036-434c-a59f-fe19c1cd06dd.changelog
new file mode 100644
index 0000000000000..f2f48607cee9a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/5_9d1bda14-3036-434c-a59f-fe19c1cd06dd.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/SSTs/.000008-aaa7a37c-7534-4abc-b568-992091dba204.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/SSTs/.000008-aaa7a37c-7534-4abc-b568-992091dba204.sst.crc
new file mode 100644
index 0000000000000..8a6dfc185d39c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/SSTs/.000008-aaa7a37c-7534-4abc-b568-992091dba204.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/SSTs/.000009-31df202d-bd1b-44cc-a0c2-765d538ce070.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/SSTs/.000009-31df202d-bd1b-44cc-a0c2-765d538ce070.sst.crc
new file mode 100644
index 0000000000000..83a50d9492b16
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/SSTs/.000009-31df202d-bd1b-44cc-a0c2-765d538ce070.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/SSTs/000008-aaa7a37c-7534-4abc-b568-992091dba204.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/SSTs/000008-aaa7a37c-7534-4abc-b568-992091dba204.sst
new file mode 100644
index 0000000000000..6d83dcef656f3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/SSTs/000008-aaa7a37c-7534-4abc-b568-992091dba204.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/SSTs/000009-31df202d-bd1b-44cc-a0c2-765d538ce070.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/SSTs/000009-31df202d-bd1b-44cc-a0c2-765d538ce070.sst
new file mode 100644
index 0000000000000..2148d0d2f4c93
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyToNumValues/SSTs/000009-31df202d-bd1b-44cc-a0c2-765d538ce070.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.1_ba57ef25-7306-4569-a2f4-356b264b3f9e.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.1_ba57ef25-7306-4569-a2f4-356b264b3f9e.changelog.crc
new file mode 100644
index 0000000000000..8dd7a646692fe
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.1_ba57ef25-7306-4569-a2f4-356b264b3f9e.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.2_6eb97e10-ef16-4d6d-a8b6-7eaf720b2e5a.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.2_6eb97e10-ef16-4d6d-a8b6-7eaf720b2e5a.changelog.crc
new file mode 100644
index 0000000000000..f1b25fcf312c7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.2_6eb97e10-ef16-4d6d-a8b6-7eaf720b2e5a.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.2_6eb97e10-ef16-4d6d-a8b6-7eaf720b2e5a.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.2_6eb97e10-ef16-4d6d-a8b6-7eaf720b2e5a.zip.crc
new file mode 100644
index 0000000000000..de80ea0c1d9a6
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.2_6eb97e10-ef16-4d6d-a8b6-7eaf720b2e5a.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.3_4809b4df-4dc4-4173-af9c-c4585ce3d5cf.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.3_4809b4df-4dc4-4173-af9c-c4585ce3d5cf.changelog.crc
new file mode 100644
index 0000000000000..dbbfd06180e8a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.3_4809b4df-4dc4-4173-af9c-c4585ce3d5cf.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.4_e9342296-3ef5-46c8-99b1-f4f57a196c1b.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.4_e9342296-3ef5-46c8-99b1-f4f57a196c1b.changelog.crc
new file mode 100644
index 0000000000000..68a3f66a8cc29
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.4_e9342296-3ef5-46c8-99b1-f4f57a196c1b.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.4_e9342296-3ef5-46c8-99b1-f4f57a196c1b.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.4_e9342296-3ef5-46c8-99b1-f4f57a196c1b.zip.crc
new file mode 100644
index 0000000000000..7a7fd4c0e6711
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.4_e9342296-3ef5-46c8-99b1-f4f57a196c1b.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.5_5c11c009-30c0-474d-a236-9435dd740e3d.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.5_5c11c009-30c0-474d-a236-9435dd740e3d.changelog.crc
new file mode 100644
index 0000000000000..8b49a60d6f885
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/.5_5c11c009-30c0-474d-a236-9435dd740e3d.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/1_ba57ef25-7306-4569-a2f4-356b264b3f9e.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/1_ba57ef25-7306-4569-a2f4-356b264b3f9e.changelog
new file mode 100644
index 0000000000000..7581d18da4b46
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/1_ba57ef25-7306-4569-a2f4-356b264b3f9e.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/2_6eb97e10-ef16-4d6d-a8b6-7eaf720b2e5a.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/2_6eb97e10-ef16-4d6d-a8b6-7eaf720b2e5a.changelog
new file mode 100644
index 0000000000000..4c684be8f3170
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/2_6eb97e10-ef16-4d6d-a8b6-7eaf720b2e5a.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/2_6eb97e10-ef16-4d6d-a8b6-7eaf720b2e5a.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/2_6eb97e10-ef16-4d6d-a8b6-7eaf720b2e5a.zip
new file mode 100644
index 0000000000000..d58fdbdd8c0aa
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/2_6eb97e10-ef16-4d6d-a8b6-7eaf720b2e5a.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/3_4809b4df-4dc4-4173-af9c-c4585ce3d5cf.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/3_4809b4df-4dc4-4173-af9c-c4585ce3d5cf.changelog
new file mode 100644
index 0000000000000..0b9ac2a5b6831
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/3_4809b4df-4dc4-4173-af9c-c4585ce3d5cf.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/4_e9342296-3ef5-46c8-99b1-f4f57a196c1b.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/4_e9342296-3ef5-46c8-99b1-f4f57a196c1b.changelog
new file mode 100644
index 0000000000000..c206c88dd2348
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/4_e9342296-3ef5-46c8-99b1-f4f57a196c1b.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/4_e9342296-3ef5-46c8-99b1-f4f57a196c1b.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/4_e9342296-3ef5-46c8-99b1-f4f57a196c1b.zip
new file mode 100644
index 0000000000000..cb364439f24db
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/4_e9342296-3ef5-46c8-99b1-f4f57a196c1b.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/5_5c11c009-30c0-474d-a236-9435dd740e3d.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/5_5c11c009-30c0-474d-a236-9435dd740e3d.changelog
new file mode 100644
index 0000000000000..040500ee54ff8
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/5_5c11c009-30c0-474d-a236-9435dd740e3d.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/SSTs/.000008-1027a1ac-be30-467a-8547-7e5cb9b676f2.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/SSTs/.000008-1027a1ac-be30-467a-8547-7e5cb9b676f2.sst.crc
new file mode 100644
index 0000000000000..241a77a5a9e95
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/SSTs/.000008-1027a1ac-be30-467a-8547-7e5cb9b676f2.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/SSTs/.000009-42c20e05-b298-44c9-b37b-45fb50d9f4bc.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/SSTs/.000009-42c20e05-b298-44c9-b37b-45fb50d9f4bc.sst.crc
new file mode 100644
index 0000000000000..2fa1aeec465c5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/SSTs/.000009-42c20e05-b298-44c9-b37b-45fb50d9f4bc.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/SSTs/000008-1027a1ac-be30-467a-8547-7e5cb9b676f2.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/SSTs/000008-1027a1ac-be30-467a-8547-7e5cb9b676f2.sst
new file mode 100644
index 0000000000000..8f0fef7a0d5cb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/SSTs/000008-1027a1ac-be30-467a-8547-7e5cb9b676f2.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/SSTs/000009-42c20e05-b298-44c9-b37b-45fb50d9f4bc.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/SSTs/000009-42c20e05-b298-44c9-b37b-45fb50d9f4bc.sst
new file mode 100644
index 0000000000000..b53bec308ee58
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/left-keyWithIndexToValue/SSTs/000009-42c20e05-b298-44c9-b37b-45fb50d9f4bc.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.1_7743ec6a-7958-497b-9c06-c54de516a1e9.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.1_7743ec6a-7958-497b-9c06-c54de516a1e9.changelog.crc
new file mode 100644
index 0000000000000..1b44d43130d13
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.1_7743ec6a-7958-497b-9c06-c54de516a1e9.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.2_97068b99-5d37-4226-94cc-4466312f6df1.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.2_97068b99-5d37-4226-94cc-4466312f6df1.changelog.crc
new file mode 100644
index 0000000000000..2d3048fbc6fbb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.2_97068b99-5d37-4226-94cc-4466312f6df1.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.2_97068b99-5d37-4226-94cc-4466312f6df1.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.2_97068b99-5d37-4226-94cc-4466312f6df1.zip.crc
new file mode 100644
index 0000000000000..8969076660971
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.2_97068b99-5d37-4226-94cc-4466312f6df1.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.3_07c9f7e6-dceb-4bf1-a510-b806b37784e1.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.3_07c9f7e6-dceb-4bf1-a510-b806b37784e1.changelog.crc
new file mode 100644
index 0000000000000..89f5a4ae9b472
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.3_07c9f7e6-dceb-4bf1-a510-b806b37784e1.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.4_1ccbfd5b-1c88-499e-a809-53413a7fcdc7.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.4_1ccbfd5b-1c88-499e-a809-53413a7fcdc7.changelog.crc
new file mode 100644
index 0000000000000..ee0c2b21ba4cb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.4_1ccbfd5b-1c88-499e-a809-53413a7fcdc7.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.4_1ccbfd5b-1c88-499e-a809-53413a7fcdc7.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.4_1ccbfd5b-1c88-499e-a809-53413a7fcdc7.zip.crc
new file mode 100644
index 0000000000000..32293396987d6
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.4_1ccbfd5b-1c88-499e-a809-53413a7fcdc7.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.5_1b44bee1-d9c4-44ba-9932-2e5e40bb4012.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.5_1b44bee1-d9c4-44ba-9932-2e5e40bb4012.changelog.crc
new file mode 100644
index 0000000000000..26c25f7b2220c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/.5_1b44bee1-d9c4-44ba-9932-2e5e40bb4012.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/1_7743ec6a-7958-497b-9c06-c54de516a1e9.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/1_7743ec6a-7958-497b-9c06-c54de516a1e9.changelog
new file mode 100644
index 0000000000000..f1403c9e68632
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/1_7743ec6a-7958-497b-9c06-c54de516a1e9.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/2_97068b99-5d37-4226-94cc-4466312f6df1.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/2_97068b99-5d37-4226-94cc-4466312f6df1.changelog
new file mode 100644
index 0000000000000..65f7d1e7d4846
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/2_97068b99-5d37-4226-94cc-4466312f6df1.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/2_97068b99-5d37-4226-94cc-4466312f6df1.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/2_97068b99-5d37-4226-94cc-4466312f6df1.zip
new file mode 100644
index 0000000000000..2adab37b375fb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/2_97068b99-5d37-4226-94cc-4466312f6df1.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/3_07c9f7e6-dceb-4bf1-a510-b806b37784e1.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/3_07c9f7e6-dceb-4bf1-a510-b806b37784e1.changelog
new file mode 100644
index 0000000000000..9b4834ed54338
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/3_07c9f7e6-dceb-4bf1-a510-b806b37784e1.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/4_1ccbfd5b-1c88-499e-a809-53413a7fcdc7.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/4_1ccbfd5b-1c88-499e-a809-53413a7fcdc7.changelog
new file mode 100644
index 0000000000000..36cd97d39bb06
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/4_1ccbfd5b-1c88-499e-a809-53413a7fcdc7.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/4_1ccbfd5b-1c88-499e-a809-53413a7fcdc7.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/4_1ccbfd5b-1c88-499e-a809-53413a7fcdc7.zip
new file mode 100644
index 0000000000000..5416debc457cb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/4_1ccbfd5b-1c88-499e-a809-53413a7fcdc7.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/5_1b44bee1-d9c4-44ba-9932-2e5e40bb4012.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/5_1b44bee1-d9c4-44ba-9932-2e5e40bb4012.changelog
new file mode 100644
index 0000000000000..9633317bb0780
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/5_1b44bee1-d9c4-44ba-9932-2e5e40bb4012.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/SSTs/.000008-11ebed3c-8b32-450e-8e7e-857a89ed9016.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/SSTs/.000008-11ebed3c-8b32-450e-8e7e-857a89ed9016.sst.crc
new file mode 100644
index 0000000000000..c5ab0dbcc04a5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/SSTs/.000008-11ebed3c-8b32-450e-8e7e-857a89ed9016.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/SSTs/.000009-13f62a6e-72cd-4180-b730-ff7a9ffb8fb3.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/SSTs/.000009-13f62a6e-72cd-4180-b730-ff7a9ffb8fb3.sst.crc
new file mode 100644
index 0000000000000..3b6b7f54f320c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/SSTs/.000009-13f62a6e-72cd-4180-b730-ff7a9ffb8fb3.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/SSTs/000008-11ebed3c-8b32-450e-8e7e-857a89ed9016.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/SSTs/000008-11ebed3c-8b32-450e-8e7e-857a89ed9016.sst
new file mode 100644
index 0000000000000..1ad1bdcc64cbd
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/SSTs/000008-11ebed3c-8b32-450e-8e7e-857a89ed9016.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/SSTs/000009-13f62a6e-72cd-4180-b730-ff7a9ffb8fb3.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/SSTs/000009-13f62a6e-72cd-4180-b730-ff7a9ffb8fb3.sst
new file mode 100644
index 0000000000000..2c9436f3700f7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyToNumValues/SSTs/000009-13f62a6e-72cd-4180-b730-ff7a9ffb8fb3.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.1_20966a32-f99b-460b-bde1-6b8f7193384e.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.1_20966a32-f99b-460b-bde1-6b8f7193384e.changelog.crc
new file mode 100644
index 0000000000000..963431ff76a44
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.1_20966a32-f99b-460b-bde1-6b8f7193384e.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.2_7576c9f4-254f-46cc-a3d5-3c1b4997921d.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.2_7576c9f4-254f-46cc-a3d5-3c1b4997921d.changelog.crc
new file mode 100644
index 0000000000000..b680e83597b65
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.2_7576c9f4-254f-46cc-a3d5-3c1b4997921d.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.2_7576c9f4-254f-46cc-a3d5-3c1b4997921d.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.2_7576c9f4-254f-46cc-a3d5-3c1b4997921d.zip.crc
new file mode 100644
index 0000000000000..550f6522e209e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.2_7576c9f4-254f-46cc-a3d5-3c1b4997921d.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.3_fe6e9401-af4c-4580-b3e2-c1940306fde9.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.3_fe6e9401-af4c-4580-b3e2-c1940306fde9.changelog.crc
new file mode 100644
index 0000000000000..24391877ee2c1
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.3_fe6e9401-af4c-4580-b3e2-c1940306fde9.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.4_14b4f589-7af6-405c-a475-1bfad6ab6f66.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.4_14b4f589-7af6-405c-a475-1bfad6ab6f66.changelog.crc
new file mode 100644
index 0000000000000..29118a7a1d1aa
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.4_14b4f589-7af6-405c-a475-1bfad6ab6f66.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.4_14b4f589-7af6-405c-a475-1bfad6ab6f66.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.4_14b4f589-7af6-405c-a475-1bfad6ab6f66.zip.crc
new file mode 100644
index 0000000000000..d627c182d57c5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.4_14b4f589-7af6-405c-a475-1bfad6ab6f66.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.5_3fa68cc1-d964-4f4e-bb9d-fd1ec2c73bbc.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.5_3fa68cc1-d964-4f4e-bb9d-fd1ec2c73bbc.changelog.crc
new file mode 100644
index 0000000000000..a88efa049c946
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/.5_3fa68cc1-d964-4f4e-bb9d-fd1ec2c73bbc.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/1_20966a32-f99b-460b-bde1-6b8f7193384e.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/1_20966a32-f99b-460b-bde1-6b8f7193384e.changelog
new file mode 100644
index 0000000000000..d13efc4ba7c75
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/1_20966a32-f99b-460b-bde1-6b8f7193384e.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/2_7576c9f4-254f-46cc-a3d5-3c1b4997921d.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/2_7576c9f4-254f-46cc-a3d5-3c1b4997921d.changelog
new file mode 100644
index 0000000000000..6d46b430c0a63
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/2_7576c9f4-254f-46cc-a3d5-3c1b4997921d.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/2_7576c9f4-254f-46cc-a3d5-3c1b4997921d.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/2_7576c9f4-254f-46cc-a3d5-3c1b4997921d.zip
new file mode 100644
index 0000000000000..282eabd4ab1af
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/2_7576c9f4-254f-46cc-a3d5-3c1b4997921d.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/3_fe6e9401-af4c-4580-b3e2-c1940306fde9.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/3_fe6e9401-af4c-4580-b3e2-c1940306fde9.changelog
new file mode 100644
index 0000000000000..54fdd4f2242ea
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/3_fe6e9401-af4c-4580-b3e2-c1940306fde9.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/4_14b4f589-7af6-405c-a475-1bfad6ab6f66.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/4_14b4f589-7af6-405c-a475-1bfad6ab6f66.changelog
new file mode 100644
index 0000000000000..625318a10fb15
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/4_14b4f589-7af6-405c-a475-1bfad6ab6f66.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/4_14b4f589-7af6-405c-a475-1bfad6ab6f66.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/4_14b4f589-7af6-405c-a475-1bfad6ab6f66.zip
new file mode 100644
index 0000000000000..485f2923999d3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/4_14b4f589-7af6-405c-a475-1bfad6ab6f66.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/5_3fa68cc1-d964-4f4e-bb9d-fd1ec2c73bbc.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/5_3fa68cc1-d964-4f4e-bb9d-fd1ec2c73bbc.changelog
new file mode 100644
index 0000000000000..327de1ec02b5b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/5_3fa68cc1-d964-4f4e-bb9d-fd1ec2c73bbc.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/SSTs/.000008-39d85a72-b066-4941-a2cb-24e2736d4c72.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/SSTs/.000008-39d85a72-b066-4941-a2cb-24e2736d4c72.sst.crc
new file mode 100644
index 0000000000000..971bf05b53065
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/SSTs/.000008-39d85a72-b066-4941-a2cb-24e2736d4c72.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/SSTs/.000009-059f01f1-53a6-46bb-b063-79f7b19be31a.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/SSTs/.000009-059f01f1-53a6-46bb-b063-79f7b19be31a.sst.crc
new file mode 100644
index 0000000000000..6134d06e3ca95
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/SSTs/.000009-059f01f1-53a6-46bb-b063-79f7b19be31a.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/SSTs/000008-39d85a72-b066-4941-a2cb-24e2736d4c72.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/SSTs/000008-39d85a72-b066-4941-a2cb-24e2736d4c72.sst
new file mode 100644
index 0000000000000..8a9c5ea3deb49
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/SSTs/000008-39d85a72-b066-4941-a2cb-24e2736d4c72.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/SSTs/000009-059f01f1-53a6-46bb-b063-79f7b19be31a.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/SSTs/000009-059f01f1-53a6-46bb-b063-79f7b19be31a.sst
new file mode 100644
index 0000000000000..0cf90a273453e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/4/right-keyWithIndexToValue/SSTs/000009-059f01f1-53a6-46bb-b063-79f7b19be31a.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/_metadata/.metadata.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/_metadata/.metadata.crc
new file mode 100644
index 0000000000000..708273c1fed03
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/_metadata/.metadata.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/_metadata/metadata b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/_metadata/metadata
new file mode 100644
index 0000000000000..b73f1e3e66ac5
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join1/state/0/_metadata/metadata
@@ -0,0 +1,2 @@
+v1
+{"operatorInfo":{"operatorId":0,"operatorName":"symmetricHashJoin"},"stateStoreInfo":[{"storeName":"left-keyToNumValues","numColsPrefixKey":0,"numPartitions":5},{"storeName":"left-keyWithIndexToValue","numColsPrefixKey":0,"numPartitions":5},{"storeName":"right-keyToNumValues","numColsPrefixKey":0,"numPartitions":5},{"storeName":"right-keyWithIndexToValue","numColsPrefixKey":0,"numPartitions":5}]}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/.metadata.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/.metadata.crc
new file mode 100644
index 0000000000000..45d46aa2d3ca5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/.metadata.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/.0.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/.0.crc
new file mode 100644
index 0000000000000..e5e643bf3f769
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/.0.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/.1.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/.1.crc
new file mode 100644
index 0000000000000..d13fbc2628702
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/.1.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/.2.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/.2.crc
new file mode 100644
index 0000000000000..21b9980666e93
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/.2.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/.3.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/.3.crc
new file mode 100644
index 0000000000000..7f896ebe1bdfc
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/.3.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/.4.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/.4.crc
new file mode 100644
index 0000000000000..d74c4582074b9
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/.4.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/0 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/0
new file mode 100644
index 0000000000000..4fb916e3e0874
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/0
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":0,"stateUniqueIds":{"0":[["b1340e4c-9ae6-4996-90e5-8722346b2479","7585d20a-d6f0-41cf-9e71-68e3b8c5644f","bd638423-f644-4c1a-8c47-1e847eedb8cb","7418fa4f-8b65-4621-840c-8ccd10827a66"],["1d3a4687-0dc5-4aaf-b651-4fbec512caa3","d41a0fa2-2a4e-4a05-b2af-c3c4689ff02b","09b0a2bf-cda2-444c-8b27-00853a92b171","c5f094d3-a3b5-4280-8070-0255280ce028"],["8c9208b9-00d8-4ca1-b7d1-bb68654fb445","3ef859af-c89a-404f-89ec-e1c0a05fc999","4cb064c2-cf82-48d0-ab28-59a823ec1d0b","660629fa-ccb7-4c2e-8bd9-c0917e51d1af"],["321b1232-a719-446c-b197-4627893768cb","49d64c9d-21df-4dbf-ab0f-947a47b91d53","196dfd41-d84c-407a-b5c8-374ad31aee0e","78ced041-0750-48e5-b2fa-36b8b6f8fa26"],["0040b5e8-b186-4d97-b69a-e1d48d768d8f","469dcb5c-d2a0-4d96-805e-4460a4d4b5aa","6f4596d1-cd7b-4881-8c8d-862d6db13b4e","bea10842-b3de-4eed-8cbb-483ce10864f7"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/1 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/1
new file mode 100644
index 0000000000000..0eca9aa63a6ad
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/1
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":5000,"stateUniqueIds":{"0":[["ca3d3f6b-86d2-4019-9661-e3c28f44bcec","81442b9a-cc25-49cf-8381-8fbaf4c39eef","dda8a7f2-f740-46c1-ac0b-e7529db2c4b4","33825fa0-b170-46f9-978b-71201deb0366"],["36da6470-13be-4a0f-98ea-56af45092d66","7cca0fbe-5249-4274-8628-e559914657e4","cc928156-e550-4f9d-b6eb-9761c113985a","91ed4781-6e06-4759-b54a-ac61dd952d64"],["4c0013ff-b606-4343-904d-5a298ae215bf","43552f38-571c-46ac-a5a1-29ec9c7ccd08","4709e034-e7a7-4c7c-b4a5-15a54c4cb533","5cb49350-1260-48c3-b546-1eb53817decd"],["8b68d3d4-01ca-478a-9968-85481070d793","0229f413-f8bf-4f9c-8ea2-1148a23305a8","c0169e38-57f3-4e1e-8568-24a4481bafd4","3af3c8f3-7549-4981-8084-253c807897f6"],["dfea3958-bb40-48bc-bfa9-572dd76eedfd","b1e0c8aa-88b8-49b7-a734-bc9966161850","09a46dfc-b60b-4888-b0d5-403df472a9bd","17d9f074-f585-4dc6-9496-601853ae6537"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/2 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/2
new file mode 100644
index 0000000000000..f47178bab563a
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/2
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":5000,"stateUniqueIds":{"0":[["64d24e92-ec7b-4c3a-b18c-587c52e7fc8b","a342a12c-87fb-4971-b2c3-ae8836be65dc","2a6610ba-b227-4787-9738-d48f0d744d2f","7579774b-9f68-4ce9-87ce-c27a854a828d"],["70124def-d463-49ea-ae84-43da9ebb1e25","873fe17b-adcf-4226-af51-177f389e533b","f37c3da2-8834-414a-aad9-0880c82e6c9f","a7966766-83a8-4547-a286-ec8d32155f24"],["932ea797-a834-4b15-9b47-d64b53f29b03","d91227ce-1a7f-4872-967e-d817bf3096c0","387cc6fd-6aea-4f31-aee6-0e4c29e094bc","a62dab53-b8d5-4329-b21c-0ee623b350d5"],["fef54f55-9d1b-4733-862b-c0b42a3795ae","f7a82f8a-6c01-44d7-a984-aeb298b0a5fc","91a401ae-a73c-45da-a3c9-7ad53af90c6e","36d60395-522a-4129-a324-dd41beebad34"],["a01d7c5d-d373-4dc7-8a8f-25bf03849360","bceb4cde-7197-4db6-842d-04b3c5463505","978ed7db-3984-4e58-9042-5bdd7f0ede44","041cb4db-b9ab-4a99-b7b1-a114cd7544ad"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/3 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/3
new file mode 100644
index 0000000000000..0c56abf47500b
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/3
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":9000,"stateUniqueIds":{"0":[["2b9fa65a-4b6e-4b7c-b3a8-b5f6c92674ce","5a42f5bb-8bf1-4b0f-880c-e1dc216bc60d","d5a926d1-9e63-4fee-a425-384e09540459","35fc23cb-2af4-4b9e-a679-c8b6e74d5f9a"],["a36e9ee3-bc8b-40e1-bfcf-603e77fbbcd9","77d8d0ac-8fa8-4418-8aab-2428bf045a52","f8f5c613-413a-4e94-9ccb-76d20320031d","d523781f-7c4b-4d5d-bb5b-d782959aec5f"],["00e47a7e-0836-4528-a51d-f561a0c4fd85","bd867bd4-76c9-44ce-ab59-6bc78e1e3941","e019a70c-e45f-4280-b140-cf32ec57225e","582e56d1-6a1d-434d-9afc-c1a812b37a06"],["3c10e0cf-023f-4dfa-bbc7-329a4c0597e8","25ef5b0c-fbc4-4568-ae87-a53235efa728","64486e03-757d-444d-80a5-81f4d10f7279","61ab3c53-bbc9-44ee-b397-5622fc3e19be"],["aeb92d41-0961-4b4c-bb6f-49b636ee728e","5e37c9ad-9142-47cb-943c-4c2c231483c1","de24c722-fc71-4201-83da-6b55390fe898","ad8df34d-c475-47d6-ad60-3c22b00bcbb2"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/4 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/4
new file mode 100644
index 0000000000000..58bd6d718f53b
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/commits/4
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":9000,"stateUniqueIds":{"0":[["4a86866c-66fc-4f34-be50-8c4a5b4d0dbd","cb8a3678-3010-44ea-bdaa-964654ecf177","2b88860b-c125-48ac-87d3-425ddf6e471c","72b5a9b3-773a-42dc-922d-157d68115737"],["66bca6fb-2fc2-4720-93c1-ef40858eab1c","c2205bd9-7413-4078-843c-6a007964b6bd","2ea177e1-e3f9-416b-bd83-6ffadb5acc02","516aa116-7a32-4f45-9d14-3da5f77362b6"],["653ce64a-9f67-47b4-bd9b-4435f232010d","856bea06-199c-4bf9-95b4-e0b5fd2cf736","abd45128-2b27-4cee-8466-17cd543cdeff","db88e60d-780c-42d1-bd36-50e6666b322c"],["4b6f18f7-2fb6-470d-b1dc-447089b72b38","ffdb4256-b0da-476c-9028-7ed3233befb3","14f32827-c3d9-4d85-bb6b-a61c317d06b7","570cf616-6ae9-4f6d-932e-053fa820166c"],["9bd7274b-5353-4fc1-8a6b-a4a7bd1afe93","2fef25a0-611c-4bde-be77-84e6b7261698","c4e584d8-814e-48ea-a413-13542733d8b7","24c41882-0aef-4e18-a83c-dfaac502c893"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/metadata b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/metadata
new file mode 100644
index 0000000000000..5a62c0328e0f8
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/metadata
@@ -0,0 +1 @@
+{"id":"c91297b4-ac33-4c7e-a876-58758f5f611c"}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/.0.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/.0.crc
new file mode 100644
index 0000000000000..eed2f580d5d88
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/.0.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/.1.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/.1.crc
new file mode 100644
index 0000000000000..413b46be0951e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/.1.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/.2.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/.2.crc
new file mode 100644
index 0000000000000..bffdb3479eaf8
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/.2.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/.3.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/.3.crc
new file mode 100644
index 0000000000000..bb9cacbcee997
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/.3.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/.4.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/.4.crc
new file mode 100644
index 0000000000000..f5c86c6430650
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/.4.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/0 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/0
new file mode 100644
index 0000000000000..8268cecc7cfe6
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/0
@@ -0,0 +1,4 @@
+v1
+{"batchWatermarkMs":0,"batchTimestampMs":1757006379746,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"2","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+0
+0
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/1 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/1
new file mode 100644
index 0000000000000..056a645f5163c
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/1
@@ -0,0 +1,4 @@
+v1
+{"batchWatermarkMs":0,"batchTimestampMs":1757006385850,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"2","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+1
+1
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/2 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/2
new file mode 100644
index 0000000000000..a40bc4d188483
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/2
@@ -0,0 +1,4 @@
+v1
+{"batchWatermarkMs":5000,"batchTimestampMs":1757006387368,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"2","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+1
+1
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/3 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/3
new file mode 100644
index 0000000000000..effadf90654db
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/3
@@ -0,0 +1,4 @@
+v1
+{"batchWatermarkMs":5000,"batchTimestampMs":1757006390416,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"2","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+2
+2
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/4 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/4
new file mode 100644
index 0000000000000..0670faf90f7fc
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/offsets/4
@@ -0,0 +1,4 @@
+v1
+{"batchWatermarkMs":9000,"batchTimestampMs":1757006391760,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"2","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+2
+2
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.1_b1340e4c-9ae6-4996-90e5-8722346b2479.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.1_b1340e4c-9ae6-4996-90e5-8722346b2479.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.1_b1340e4c-9ae6-4996-90e5-8722346b2479.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.2_ca3d3f6b-86d2-4019-9661-e3c28f44bcec.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.2_ca3d3f6b-86d2-4019-9661-e3c28f44bcec.changelog.crc
new file mode 100644
index 0000000000000..e219507b5536e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.2_ca3d3f6b-86d2-4019-9661-e3c28f44bcec.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.2_ca3d3f6b-86d2-4019-9661-e3c28f44bcec.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.2_ca3d3f6b-86d2-4019-9661-e3c28f44bcec.zip.crc
new file mode 100644
index 0000000000000..33b8fda42f84a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.2_ca3d3f6b-86d2-4019-9661-e3c28f44bcec.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.3_64d24e92-ec7b-4c3a-b18c-587c52e7fc8b.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.3_64d24e92-ec7b-4c3a-b18c-587c52e7fc8b.changelog.crc
new file mode 100644
index 0000000000000..c61991a746601
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.3_64d24e92-ec7b-4c3a-b18c-587c52e7fc8b.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.4_2b9fa65a-4b6e-4b7c-b3a8-b5f6c92674ce.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.4_2b9fa65a-4b6e-4b7c-b3a8-b5f6c92674ce.changelog.crc
new file mode 100644
index 0000000000000..441901d1e9637
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.4_2b9fa65a-4b6e-4b7c-b3a8-b5f6c92674ce.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.4_2b9fa65a-4b6e-4b7c-b3a8-b5f6c92674ce.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.4_2b9fa65a-4b6e-4b7c-b3a8-b5f6c92674ce.zip.crc
new file mode 100644
index 0000000000000..e354acb415f2c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.4_2b9fa65a-4b6e-4b7c-b3a8-b5f6c92674ce.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.5_4a86866c-66fc-4f34-be50-8c4a5b4d0dbd.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.5_4a86866c-66fc-4f34-be50-8c4a5b4d0dbd.changelog.crc
new file mode 100644
index 0000000000000..8bece446d0ec0
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/.5_4a86866c-66fc-4f34-be50-8c4a5b4d0dbd.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/1_b1340e4c-9ae6-4996-90e5-8722346b2479.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/1_b1340e4c-9ae6-4996-90e5-8722346b2479.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/1_b1340e4c-9ae6-4996-90e5-8722346b2479.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/2_ca3d3f6b-86d2-4019-9661-e3c28f44bcec.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/2_ca3d3f6b-86d2-4019-9661-e3c28f44bcec.changelog
new file mode 100644
index 0000000000000..f5ad911ca896c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/2_ca3d3f6b-86d2-4019-9661-e3c28f44bcec.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/2_ca3d3f6b-86d2-4019-9661-e3c28f44bcec.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/2_ca3d3f6b-86d2-4019-9661-e3c28f44bcec.zip
new file mode 100644
index 0000000000000..406900eb70a76
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/2_ca3d3f6b-86d2-4019-9661-e3c28f44bcec.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/3_64d24e92-ec7b-4c3a-b18c-587c52e7fc8b.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/3_64d24e92-ec7b-4c3a-b18c-587c52e7fc8b.changelog
new file mode 100644
index 0000000000000..b5e768aca6524
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/3_64d24e92-ec7b-4c3a-b18c-587c52e7fc8b.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/4_2b9fa65a-4b6e-4b7c-b3a8-b5f6c92674ce.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/4_2b9fa65a-4b6e-4b7c-b3a8-b5f6c92674ce.changelog
new file mode 100644
index 0000000000000..5de75b484b670
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/4_2b9fa65a-4b6e-4b7c-b3a8-b5f6c92674ce.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/4_2b9fa65a-4b6e-4b7c-b3a8-b5f6c92674ce.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/4_2b9fa65a-4b6e-4b7c-b3a8-b5f6c92674ce.zip
new file mode 100644
index 0000000000000..d987856fc3705
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/4_2b9fa65a-4b6e-4b7c-b3a8-b5f6c92674ce.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/5_4a86866c-66fc-4f34-be50-8c4a5b4d0dbd.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/5_4a86866c-66fc-4f34-be50-8c4a5b4d0dbd.changelog
new file mode 100644
index 0000000000000..1e275754a857b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/5_4a86866c-66fc-4f34-be50-8c4a5b4d0dbd.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/_metadata/.schema.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/_metadata/.schema.crc
new file mode 100644
index 0000000000000..0b5ede7660246
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/_metadata/.schema.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/_metadata/schema b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/_metadata/schema
new file mode 100644
index 0000000000000..4da637d143496
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyToNumValues/_metadata/schema differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.1_7585d20a-d6f0-41cf-9e71-68e3b8c5644f.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.1_7585d20a-d6f0-41cf-9e71-68e3b8c5644f.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.1_7585d20a-d6f0-41cf-9e71-68e3b8c5644f.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.2_81442b9a-cc25-49cf-8381-8fbaf4c39eef.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.2_81442b9a-cc25-49cf-8381-8fbaf4c39eef.changelog.crc
new file mode 100644
index 0000000000000..4caafce7d7a9e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.2_81442b9a-cc25-49cf-8381-8fbaf4c39eef.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.2_81442b9a-cc25-49cf-8381-8fbaf4c39eef.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.2_81442b9a-cc25-49cf-8381-8fbaf4c39eef.zip.crc
new file mode 100644
index 0000000000000..ac5ff6b071ebd
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.2_81442b9a-cc25-49cf-8381-8fbaf4c39eef.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.3_a342a12c-87fb-4971-b2c3-ae8836be65dc.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.3_a342a12c-87fb-4971-b2c3-ae8836be65dc.changelog.crc
new file mode 100644
index 0000000000000..cbd134d134e58
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.3_a342a12c-87fb-4971-b2c3-ae8836be65dc.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.4_5a42f5bb-8bf1-4b0f-880c-e1dc216bc60d.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.4_5a42f5bb-8bf1-4b0f-880c-e1dc216bc60d.changelog.crc
new file mode 100644
index 0000000000000..742230379f0e5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.4_5a42f5bb-8bf1-4b0f-880c-e1dc216bc60d.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.4_5a42f5bb-8bf1-4b0f-880c-e1dc216bc60d.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.4_5a42f5bb-8bf1-4b0f-880c-e1dc216bc60d.zip.crc
new file mode 100644
index 0000000000000..fc829f35850ea
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.4_5a42f5bb-8bf1-4b0f-880c-e1dc216bc60d.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.5_cb8a3678-3010-44ea-bdaa-964654ecf177.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.5_cb8a3678-3010-44ea-bdaa-964654ecf177.changelog.crc
new file mode 100644
index 0000000000000..42d585996a7a8
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/.5_cb8a3678-3010-44ea-bdaa-964654ecf177.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/1_7585d20a-d6f0-41cf-9e71-68e3b8c5644f.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/1_7585d20a-d6f0-41cf-9e71-68e3b8c5644f.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/1_7585d20a-d6f0-41cf-9e71-68e3b8c5644f.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/2_81442b9a-cc25-49cf-8381-8fbaf4c39eef.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/2_81442b9a-cc25-49cf-8381-8fbaf4c39eef.changelog
new file mode 100644
index 0000000000000..d0212f4d6556d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/2_81442b9a-cc25-49cf-8381-8fbaf4c39eef.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/2_81442b9a-cc25-49cf-8381-8fbaf4c39eef.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/2_81442b9a-cc25-49cf-8381-8fbaf4c39eef.zip
new file mode 100644
index 0000000000000..d8b9f5d3903ce
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/2_81442b9a-cc25-49cf-8381-8fbaf4c39eef.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/3_a342a12c-87fb-4971-b2c3-ae8836be65dc.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/3_a342a12c-87fb-4971-b2c3-ae8836be65dc.changelog
new file mode 100644
index 0000000000000..fb317456fd0ae
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/3_a342a12c-87fb-4971-b2c3-ae8836be65dc.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/4_5a42f5bb-8bf1-4b0f-880c-e1dc216bc60d.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/4_5a42f5bb-8bf1-4b0f-880c-e1dc216bc60d.changelog
new file mode 100644
index 0000000000000..7fe335c7e4997
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/4_5a42f5bb-8bf1-4b0f-880c-e1dc216bc60d.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/4_5a42f5bb-8bf1-4b0f-880c-e1dc216bc60d.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/4_5a42f5bb-8bf1-4b0f-880c-e1dc216bc60d.zip
new file mode 100644
index 0000000000000..6c2f04fb63675
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/4_5a42f5bb-8bf1-4b0f-880c-e1dc216bc60d.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/5_cb8a3678-3010-44ea-bdaa-964654ecf177.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/5_cb8a3678-3010-44ea-bdaa-964654ecf177.changelog
new file mode 100644
index 0000000000000..3e49464618ef7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/5_cb8a3678-3010-44ea-bdaa-964654ecf177.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/_metadata/.schema.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/_metadata/.schema.crc
new file mode 100644
index 0000000000000..3f303a9e7b035
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/_metadata/.schema.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/_metadata/schema b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/_metadata/schema
new file mode 100644
index 0000000000000..42448b3b584ce
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/left-keyWithIndexToValue/_metadata/schema differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.1_bd638423-f644-4c1a-8c47-1e847eedb8cb.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.1_bd638423-f644-4c1a-8c47-1e847eedb8cb.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.1_bd638423-f644-4c1a-8c47-1e847eedb8cb.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.2_dda8a7f2-f740-46c1-ac0b-e7529db2c4b4.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.2_dda8a7f2-f740-46c1-ac0b-e7529db2c4b4.changelog.crc
new file mode 100644
index 0000000000000..4283cb28575d1
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.2_dda8a7f2-f740-46c1-ac0b-e7529db2c4b4.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.2_dda8a7f2-f740-46c1-ac0b-e7529db2c4b4.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.2_dda8a7f2-f740-46c1-ac0b-e7529db2c4b4.zip.crc
new file mode 100644
index 0000000000000..4b2254a025381
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.2_dda8a7f2-f740-46c1-ac0b-e7529db2c4b4.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.3_2a6610ba-b227-4787-9738-d48f0d744d2f.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.3_2a6610ba-b227-4787-9738-d48f0d744d2f.changelog.crc
new file mode 100644
index 0000000000000..a9e0317249bd5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.3_2a6610ba-b227-4787-9738-d48f0d744d2f.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.4_d5a926d1-9e63-4fee-a425-384e09540459.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.4_d5a926d1-9e63-4fee-a425-384e09540459.changelog.crc
new file mode 100644
index 0000000000000..465a05567853f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.4_d5a926d1-9e63-4fee-a425-384e09540459.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.4_d5a926d1-9e63-4fee-a425-384e09540459.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.4_d5a926d1-9e63-4fee-a425-384e09540459.zip.crc
new file mode 100644
index 0000000000000..7ee9d9cae280f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.4_d5a926d1-9e63-4fee-a425-384e09540459.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.5_2b88860b-c125-48ac-87d3-425ddf6e471c.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.5_2b88860b-c125-48ac-87d3-425ddf6e471c.changelog.crc
new file mode 100644
index 0000000000000..9f852baf34bff
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/.5_2b88860b-c125-48ac-87d3-425ddf6e471c.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/1_bd638423-f644-4c1a-8c47-1e847eedb8cb.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/1_bd638423-f644-4c1a-8c47-1e847eedb8cb.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/1_bd638423-f644-4c1a-8c47-1e847eedb8cb.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/2_dda8a7f2-f740-46c1-ac0b-e7529db2c4b4.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/2_dda8a7f2-f740-46c1-ac0b-e7529db2c4b4.changelog
new file mode 100644
index 0000000000000..f35fb650fccc4
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/2_dda8a7f2-f740-46c1-ac0b-e7529db2c4b4.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/2_dda8a7f2-f740-46c1-ac0b-e7529db2c4b4.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/2_dda8a7f2-f740-46c1-ac0b-e7529db2c4b4.zip
new file mode 100644
index 0000000000000..b7aecce5f6aca
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/2_dda8a7f2-f740-46c1-ac0b-e7529db2c4b4.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/3_2a6610ba-b227-4787-9738-d48f0d744d2f.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/3_2a6610ba-b227-4787-9738-d48f0d744d2f.changelog
new file mode 100644
index 0000000000000..ae6b7c7230e1c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/3_2a6610ba-b227-4787-9738-d48f0d744d2f.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/4_d5a926d1-9e63-4fee-a425-384e09540459.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/4_d5a926d1-9e63-4fee-a425-384e09540459.changelog
new file mode 100644
index 0000000000000..e3896a930ef2b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/4_d5a926d1-9e63-4fee-a425-384e09540459.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/4_d5a926d1-9e63-4fee-a425-384e09540459.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/4_d5a926d1-9e63-4fee-a425-384e09540459.zip
new file mode 100644
index 0000000000000..be8ec0e1669c9
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/4_d5a926d1-9e63-4fee-a425-384e09540459.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/5_2b88860b-c125-48ac-87d3-425ddf6e471c.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/5_2b88860b-c125-48ac-87d3-425ddf6e471c.changelog
new file mode 100644
index 0000000000000..10a172747168d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/5_2b88860b-c125-48ac-87d3-425ddf6e471c.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/_metadata/.schema.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/_metadata/.schema.crc
new file mode 100644
index 0000000000000..0b5ede7660246
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/_metadata/.schema.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/_metadata/schema b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/_metadata/schema
new file mode 100644
index 0000000000000..4da637d143496
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyToNumValues/_metadata/schema differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.1_7418fa4f-8b65-4621-840c-8ccd10827a66.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.1_7418fa4f-8b65-4621-840c-8ccd10827a66.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.1_7418fa4f-8b65-4621-840c-8ccd10827a66.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.2_33825fa0-b170-46f9-978b-71201deb0366.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.2_33825fa0-b170-46f9-978b-71201deb0366.changelog.crc
new file mode 100644
index 0000000000000..2a01002c11b38
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.2_33825fa0-b170-46f9-978b-71201deb0366.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.2_33825fa0-b170-46f9-978b-71201deb0366.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.2_33825fa0-b170-46f9-978b-71201deb0366.zip.crc
new file mode 100644
index 0000000000000..3135f9b2e7ad5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.2_33825fa0-b170-46f9-978b-71201deb0366.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.3_7579774b-9f68-4ce9-87ce-c27a854a828d.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.3_7579774b-9f68-4ce9-87ce-c27a854a828d.changelog.crc
new file mode 100644
index 0000000000000..b2f3c286b4e51
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.3_7579774b-9f68-4ce9-87ce-c27a854a828d.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.4_35fc23cb-2af4-4b9e-a679-c8b6e74d5f9a.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.4_35fc23cb-2af4-4b9e-a679-c8b6e74d5f9a.changelog.crc
new file mode 100644
index 0000000000000..d24e1faf1d5f8
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.4_35fc23cb-2af4-4b9e-a679-c8b6e74d5f9a.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.4_35fc23cb-2af4-4b9e-a679-c8b6e74d5f9a.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.4_35fc23cb-2af4-4b9e-a679-c8b6e74d5f9a.zip.crc
new file mode 100644
index 0000000000000..3a9cd46665148
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.4_35fc23cb-2af4-4b9e-a679-c8b6e74d5f9a.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.5_72b5a9b3-773a-42dc-922d-157d68115737.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.5_72b5a9b3-773a-42dc-922d-157d68115737.changelog.crc
new file mode 100644
index 0000000000000..ae7fa1b7591ba
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/.5_72b5a9b3-773a-42dc-922d-157d68115737.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/1_7418fa4f-8b65-4621-840c-8ccd10827a66.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/1_7418fa4f-8b65-4621-840c-8ccd10827a66.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/1_7418fa4f-8b65-4621-840c-8ccd10827a66.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/2_33825fa0-b170-46f9-978b-71201deb0366.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/2_33825fa0-b170-46f9-978b-71201deb0366.changelog
new file mode 100644
index 0000000000000..5abd03c221e21
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/2_33825fa0-b170-46f9-978b-71201deb0366.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/2_33825fa0-b170-46f9-978b-71201deb0366.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/2_33825fa0-b170-46f9-978b-71201deb0366.zip
new file mode 100644
index 0000000000000..281d44289637d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/2_33825fa0-b170-46f9-978b-71201deb0366.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/3_7579774b-9f68-4ce9-87ce-c27a854a828d.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/3_7579774b-9f68-4ce9-87ce-c27a854a828d.changelog
new file mode 100644
index 0000000000000..6404b4aa40411
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/3_7579774b-9f68-4ce9-87ce-c27a854a828d.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/4_35fc23cb-2af4-4b9e-a679-c8b6e74d5f9a.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/4_35fc23cb-2af4-4b9e-a679-c8b6e74d5f9a.changelog
new file mode 100644
index 0000000000000..337fe20b84f53
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/4_35fc23cb-2af4-4b9e-a679-c8b6e74d5f9a.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/4_35fc23cb-2af4-4b9e-a679-c8b6e74d5f9a.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/4_35fc23cb-2af4-4b9e-a679-c8b6e74d5f9a.zip
new file mode 100644
index 0000000000000..f302563bef4fd
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/4_35fc23cb-2af4-4b9e-a679-c8b6e74d5f9a.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/5_72b5a9b3-773a-42dc-922d-157d68115737.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/5_72b5a9b3-773a-42dc-922d-157d68115737.changelog
new file mode 100644
index 0000000000000..592c5d6a96dea
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/5_72b5a9b3-773a-42dc-922d-157d68115737.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/_metadata/.schema.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/_metadata/.schema.crc
new file mode 100644
index 0000000000000..bcc7311689f0a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/_metadata/.schema.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/_metadata/schema b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/_metadata/schema
new file mode 100644
index 0000000000000..8fa8f1675bc82
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/0/right-keyWithIndexToValue/_metadata/schema differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.1_1d3a4687-0dc5-4aaf-b651-4fbec512caa3.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.1_1d3a4687-0dc5-4aaf-b651-4fbec512caa3.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.1_1d3a4687-0dc5-4aaf-b651-4fbec512caa3.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.2_36da6470-13be-4a0f-98ea-56af45092d66.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.2_36da6470-13be-4a0f-98ea-56af45092d66.changelog.crc
new file mode 100644
index 0000000000000..2616a80838201
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.2_36da6470-13be-4a0f-98ea-56af45092d66.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.2_36da6470-13be-4a0f-98ea-56af45092d66.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.2_36da6470-13be-4a0f-98ea-56af45092d66.zip.crc
new file mode 100644
index 0000000000000..182e8c49e09ed
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.2_36da6470-13be-4a0f-98ea-56af45092d66.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.3_70124def-d463-49ea-ae84-43da9ebb1e25.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.3_70124def-d463-49ea-ae84-43da9ebb1e25.changelog.crc
new file mode 100644
index 0000000000000..e46ad2f9b8342
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.3_70124def-d463-49ea-ae84-43da9ebb1e25.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.4_a36e9ee3-bc8b-40e1-bfcf-603e77fbbcd9.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.4_a36e9ee3-bc8b-40e1-bfcf-603e77fbbcd9.changelog.crc
new file mode 100644
index 0000000000000..0a89a17d464ae
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.4_a36e9ee3-bc8b-40e1-bfcf-603e77fbbcd9.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.4_a36e9ee3-bc8b-40e1-bfcf-603e77fbbcd9.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.4_a36e9ee3-bc8b-40e1-bfcf-603e77fbbcd9.zip.crc
new file mode 100644
index 0000000000000..96e57bdf4eacd
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.4_a36e9ee3-bc8b-40e1-bfcf-603e77fbbcd9.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.5_66bca6fb-2fc2-4720-93c1-ef40858eab1c.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.5_66bca6fb-2fc2-4720-93c1-ef40858eab1c.changelog.crc
new file mode 100644
index 0000000000000..884e5b8c14c3a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/.5_66bca6fb-2fc2-4720-93c1-ef40858eab1c.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/1_1d3a4687-0dc5-4aaf-b651-4fbec512caa3.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/1_1d3a4687-0dc5-4aaf-b651-4fbec512caa3.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/1_1d3a4687-0dc5-4aaf-b651-4fbec512caa3.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/2_36da6470-13be-4a0f-98ea-56af45092d66.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/2_36da6470-13be-4a0f-98ea-56af45092d66.changelog
new file mode 100644
index 0000000000000..f5026c401e23a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/2_36da6470-13be-4a0f-98ea-56af45092d66.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/2_36da6470-13be-4a0f-98ea-56af45092d66.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/2_36da6470-13be-4a0f-98ea-56af45092d66.zip
new file mode 100644
index 0000000000000..fb728ccd6abd9
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/2_36da6470-13be-4a0f-98ea-56af45092d66.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/3_70124def-d463-49ea-ae84-43da9ebb1e25.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/3_70124def-d463-49ea-ae84-43da9ebb1e25.changelog
new file mode 100644
index 0000000000000..75dfdfc894cd5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/3_70124def-d463-49ea-ae84-43da9ebb1e25.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/4_a36e9ee3-bc8b-40e1-bfcf-603e77fbbcd9.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/4_a36e9ee3-bc8b-40e1-bfcf-603e77fbbcd9.changelog
new file mode 100644
index 0000000000000..97df57773a606
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/4_a36e9ee3-bc8b-40e1-bfcf-603e77fbbcd9.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/4_a36e9ee3-bc8b-40e1-bfcf-603e77fbbcd9.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/4_a36e9ee3-bc8b-40e1-bfcf-603e77fbbcd9.zip
new file mode 100644
index 0000000000000..22aab37bee294
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/4_a36e9ee3-bc8b-40e1-bfcf-603e77fbbcd9.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/5_66bca6fb-2fc2-4720-93c1-ef40858eab1c.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/5_66bca6fb-2fc2-4720-93c1-ef40858eab1c.changelog
new file mode 100644
index 0000000000000..ea9dc22e261fe
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyToNumValues/5_66bca6fb-2fc2-4720-93c1-ef40858eab1c.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.1_d41a0fa2-2a4e-4a05-b2af-c3c4689ff02b.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.1_d41a0fa2-2a4e-4a05-b2af-c3c4689ff02b.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.1_d41a0fa2-2a4e-4a05-b2af-c3c4689ff02b.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.2_7cca0fbe-5249-4274-8628-e559914657e4.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.2_7cca0fbe-5249-4274-8628-e559914657e4.changelog.crc
new file mode 100644
index 0000000000000..27ffe37bc7696
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.2_7cca0fbe-5249-4274-8628-e559914657e4.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.2_7cca0fbe-5249-4274-8628-e559914657e4.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.2_7cca0fbe-5249-4274-8628-e559914657e4.zip.crc
new file mode 100644
index 0000000000000..c58d8315baa01
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.2_7cca0fbe-5249-4274-8628-e559914657e4.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.3_873fe17b-adcf-4226-af51-177f389e533b.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.3_873fe17b-adcf-4226-af51-177f389e533b.changelog.crc
new file mode 100644
index 0000000000000..b41afb5a24a24
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.3_873fe17b-adcf-4226-af51-177f389e533b.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.4_77d8d0ac-8fa8-4418-8aab-2428bf045a52.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.4_77d8d0ac-8fa8-4418-8aab-2428bf045a52.changelog.crc
new file mode 100644
index 0000000000000..5921de61e8266
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.4_77d8d0ac-8fa8-4418-8aab-2428bf045a52.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.4_77d8d0ac-8fa8-4418-8aab-2428bf045a52.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.4_77d8d0ac-8fa8-4418-8aab-2428bf045a52.zip.crc
new file mode 100644
index 0000000000000..fb8120b82c297
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.4_77d8d0ac-8fa8-4418-8aab-2428bf045a52.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.5_c2205bd9-7413-4078-843c-6a007964b6bd.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.5_c2205bd9-7413-4078-843c-6a007964b6bd.changelog.crc
new file mode 100644
index 0000000000000..d7e7a3192e510
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/.5_c2205bd9-7413-4078-843c-6a007964b6bd.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/1_d41a0fa2-2a4e-4a05-b2af-c3c4689ff02b.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/1_d41a0fa2-2a4e-4a05-b2af-c3c4689ff02b.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/1_d41a0fa2-2a4e-4a05-b2af-c3c4689ff02b.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/2_7cca0fbe-5249-4274-8628-e559914657e4.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/2_7cca0fbe-5249-4274-8628-e559914657e4.changelog
new file mode 100644
index 0000000000000..4a47944c78a80
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/2_7cca0fbe-5249-4274-8628-e559914657e4.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/2_7cca0fbe-5249-4274-8628-e559914657e4.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/2_7cca0fbe-5249-4274-8628-e559914657e4.zip
new file mode 100644
index 0000000000000..ab0b1966a2410
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/2_7cca0fbe-5249-4274-8628-e559914657e4.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/3_873fe17b-adcf-4226-af51-177f389e533b.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/3_873fe17b-adcf-4226-af51-177f389e533b.changelog
new file mode 100644
index 0000000000000..046998b631b11
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/3_873fe17b-adcf-4226-af51-177f389e533b.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/4_77d8d0ac-8fa8-4418-8aab-2428bf045a52.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/4_77d8d0ac-8fa8-4418-8aab-2428bf045a52.changelog
new file mode 100644
index 0000000000000..deb76ee6e86eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/4_77d8d0ac-8fa8-4418-8aab-2428bf045a52.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/4_77d8d0ac-8fa8-4418-8aab-2428bf045a52.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/4_77d8d0ac-8fa8-4418-8aab-2428bf045a52.zip
new file mode 100644
index 0000000000000..e278ff6465988
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/4_77d8d0ac-8fa8-4418-8aab-2428bf045a52.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/5_c2205bd9-7413-4078-843c-6a007964b6bd.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/5_c2205bd9-7413-4078-843c-6a007964b6bd.changelog
new file mode 100644
index 0000000000000..910d2fd68cfa7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/left-keyWithIndexToValue/5_c2205bd9-7413-4078-843c-6a007964b6bd.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.1_09b0a2bf-cda2-444c-8b27-00853a92b171.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.1_09b0a2bf-cda2-444c-8b27-00853a92b171.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.1_09b0a2bf-cda2-444c-8b27-00853a92b171.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.2_cc928156-e550-4f9d-b6eb-9761c113985a.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.2_cc928156-e550-4f9d-b6eb-9761c113985a.changelog.crc
new file mode 100644
index 0000000000000..b576e0db4e53f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.2_cc928156-e550-4f9d-b6eb-9761c113985a.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.2_cc928156-e550-4f9d-b6eb-9761c113985a.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.2_cc928156-e550-4f9d-b6eb-9761c113985a.zip.crc
new file mode 100644
index 0000000000000..5b41e764c8235
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.2_cc928156-e550-4f9d-b6eb-9761c113985a.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.3_f37c3da2-8834-414a-aad9-0880c82e6c9f.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.3_f37c3da2-8834-414a-aad9-0880c82e6c9f.changelog.crc
new file mode 100644
index 0000000000000..8ecbc7a371872
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.3_f37c3da2-8834-414a-aad9-0880c82e6c9f.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.4_f8f5c613-413a-4e94-9ccb-76d20320031d.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.4_f8f5c613-413a-4e94-9ccb-76d20320031d.changelog.crc
new file mode 100644
index 0000000000000..6ab636c8e3128
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.4_f8f5c613-413a-4e94-9ccb-76d20320031d.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.4_f8f5c613-413a-4e94-9ccb-76d20320031d.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.4_f8f5c613-413a-4e94-9ccb-76d20320031d.zip.crc
new file mode 100644
index 0000000000000..0346a900f7c5c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.4_f8f5c613-413a-4e94-9ccb-76d20320031d.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.5_2ea177e1-e3f9-416b-bd83-6ffadb5acc02.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.5_2ea177e1-e3f9-416b-bd83-6ffadb5acc02.changelog.crc
new file mode 100644
index 0000000000000..cd0d4ba48d6da
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/.5_2ea177e1-e3f9-416b-bd83-6ffadb5acc02.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/1_09b0a2bf-cda2-444c-8b27-00853a92b171.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/1_09b0a2bf-cda2-444c-8b27-00853a92b171.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/1_09b0a2bf-cda2-444c-8b27-00853a92b171.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/2_cc928156-e550-4f9d-b6eb-9761c113985a.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/2_cc928156-e550-4f9d-b6eb-9761c113985a.changelog
new file mode 100644
index 0000000000000..efdbf9468a18e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/2_cc928156-e550-4f9d-b6eb-9761c113985a.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/2_cc928156-e550-4f9d-b6eb-9761c113985a.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/2_cc928156-e550-4f9d-b6eb-9761c113985a.zip
new file mode 100644
index 0000000000000..0df2bf66ce229
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/2_cc928156-e550-4f9d-b6eb-9761c113985a.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/3_f37c3da2-8834-414a-aad9-0880c82e6c9f.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/3_f37c3da2-8834-414a-aad9-0880c82e6c9f.changelog
new file mode 100644
index 0000000000000..5efe5bcdb70e2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/3_f37c3da2-8834-414a-aad9-0880c82e6c9f.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/4_f8f5c613-413a-4e94-9ccb-76d20320031d.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/4_f8f5c613-413a-4e94-9ccb-76d20320031d.changelog
new file mode 100644
index 0000000000000..6e09d2a80b91b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/4_f8f5c613-413a-4e94-9ccb-76d20320031d.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/4_f8f5c613-413a-4e94-9ccb-76d20320031d.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/4_f8f5c613-413a-4e94-9ccb-76d20320031d.zip
new file mode 100644
index 0000000000000..2e650f7e57275
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/4_f8f5c613-413a-4e94-9ccb-76d20320031d.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/5_2ea177e1-e3f9-416b-bd83-6ffadb5acc02.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/5_2ea177e1-e3f9-416b-bd83-6ffadb5acc02.changelog
new file mode 100644
index 0000000000000..943ccb900e46e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyToNumValues/5_2ea177e1-e3f9-416b-bd83-6ffadb5acc02.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.1_c5f094d3-a3b5-4280-8070-0255280ce028.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.1_c5f094d3-a3b5-4280-8070-0255280ce028.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.1_c5f094d3-a3b5-4280-8070-0255280ce028.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.2_91ed4781-6e06-4759-b54a-ac61dd952d64.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.2_91ed4781-6e06-4759-b54a-ac61dd952d64.changelog.crc
new file mode 100644
index 0000000000000..31664275948ad
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.2_91ed4781-6e06-4759-b54a-ac61dd952d64.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.2_91ed4781-6e06-4759-b54a-ac61dd952d64.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.2_91ed4781-6e06-4759-b54a-ac61dd952d64.zip.crc
new file mode 100644
index 0000000000000..9cc0576819f65
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.2_91ed4781-6e06-4759-b54a-ac61dd952d64.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.3_a7966766-83a8-4547-a286-ec8d32155f24.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.3_a7966766-83a8-4547-a286-ec8d32155f24.changelog.crc
new file mode 100644
index 0000000000000..744e2d3e701f3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.3_a7966766-83a8-4547-a286-ec8d32155f24.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.4_d523781f-7c4b-4d5d-bb5b-d782959aec5f.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.4_d523781f-7c4b-4d5d-bb5b-d782959aec5f.changelog.crc
new file mode 100644
index 0000000000000..8a94a451a5ba9
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.4_d523781f-7c4b-4d5d-bb5b-d782959aec5f.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.4_d523781f-7c4b-4d5d-bb5b-d782959aec5f.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.4_d523781f-7c4b-4d5d-bb5b-d782959aec5f.zip.crc
new file mode 100644
index 0000000000000..5ac366953e3cf
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.4_d523781f-7c4b-4d5d-bb5b-d782959aec5f.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.5_516aa116-7a32-4f45-9d14-3da5f77362b6.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.5_516aa116-7a32-4f45-9d14-3da5f77362b6.changelog.crc
new file mode 100644
index 0000000000000..a85562d891f53
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/.5_516aa116-7a32-4f45-9d14-3da5f77362b6.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/1_c5f094d3-a3b5-4280-8070-0255280ce028.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/1_c5f094d3-a3b5-4280-8070-0255280ce028.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/1_c5f094d3-a3b5-4280-8070-0255280ce028.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/2_91ed4781-6e06-4759-b54a-ac61dd952d64.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/2_91ed4781-6e06-4759-b54a-ac61dd952d64.changelog
new file mode 100644
index 0000000000000..05accb78454ca
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/2_91ed4781-6e06-4759-b54a-ac61dd952d64.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/2_91ed4781-6e06-4759-b54a-ac61dd952d64.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/2_91ed4781-6e06-4759-b54a-ac61dd952d64.zip
new file mode 100644
index 0000000000000..a4af2476bb6f9
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/2_91ed4781-6e06-4759-b54a-ac61dd952d64.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/3_a7966766-83a8-4547-a286-ec8d32155f24.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/3_a7966766-83a8-4547-a286-ec8d32155f24.changelog
new file mode 100644
index 0000000000000..5c4bd367220eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/3_a7966766-83a8-4547-a286-ec8d32155f24.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/4_d523781f-7c4b-4d5d-bb5b-d782959aec5f.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/4_d523781f-7c4b-4d5d-bb5b-d782959aec5f.changelog
new file mode 100644
index 0000000000000..6ecb68518c233
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/4_d523781f-7c4b-4d5d-bb5b-d782959aec5f.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/4_d523781f-7c4b-4d5d-bb5b-d782959aec5f.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/4_d523781f-7c4b-4d5d-bb5b-d782959aec5f.zip
new file mode 100644
index 0000000000000..03a6a47b428d2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/4_d523781f-7c4b-4d5d-bb5b-d782959aec5f.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/5_516aa116-7a32-4f45-9d14-3da5f77362b6.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/5_516aa116-7a32-4f45-9d14-3da5f77362b6.changelog
new file mode 100644
index 0000000000000..c5d3b5df5bc2b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/1/right-keyWithIndexToValue/5_516aa116-7a32-4f45-9d14-3da5f77362b6.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.1_8c9208b9-00d8-4ca1-b7d1-bb68654fb445.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.1_8c9208b9-00d8-4ca1-b7d1-bb68654fb445.changelog.crc
new file mode 100644
index 0000000000000..14ce93d6939eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.1_8c9208b9-00d8-4ca1-b7d1-bb68654fb445.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.2_4c0013ff-b606-4343-904d-5a298ae215bf.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.2_4c0013ff-b606-4343-904d-5a298ae215bf.changelog.crc
new file mode 100644
index 0000000000000..6ce5704cf9028
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.2_4c0013ff-b606-4343-904d-5a298ae215bf.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.2_4c0013ff-b606-4343-904d-5a298ae215bf.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.2_4c0013ff-b606-4343-904d-5a298ae215bf.zip.crc
new file mode 100644
index 0000000000000..fcc5cceea176b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.2_4c0013ff-b606-4343-904d-5a298ae215bf.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.3_932ea797-a834-4b15-9b47-d64b53f29b03.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.3_932ea797-a834-4b15-9b47-d64b53f29b03.changelog.crc
new file mode 100644
index 0000000000000..d233d6e16395c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.3_932ea797-a834-4b15-9b47-d64b53f29b03.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.4_00e47a7e-0836-4528-a51d-f561a0c4fd85.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.4_00e47a7e-0836-4528-a51d-f561a0c4fd85.changelog.crc
new file mode 100644
index 0000000000000..252fa6ad2bf51
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.4_00e47a7e-0836-4528-a51d-f561a0c4fd85.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.4_00e47a7e-0836-4528-a51d-f561a0c4fd85.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.4_00e47a7e-0836-4528-a51d-f561a0c4fd85.zip.crc
new file mode 100644
index 0000000000000..bdd208b3f3415
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.4_00e47a7e-0836-4528-a51d-f561a0c4fd85.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.5_653ce64a-9f67-47b4-bd9b-4435f232010d.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.5_653ce64a-9f67-47b4-bd9b-4435f232010d.changelog.crc
new file mode 100644
index 0000000000000..a9e209b74a3e9
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/.5_653ce64a-9f67-47b4-bd9b-4435f232010d.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/1_8c9208b9-00d8-4ca1-b7d1-bb68654fb445.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/1_8c9208b9-00d8-4ca1-b7d1-bb68654fb445.changelog
new file mode 100644
index 0000000000000..b842ca7e8a4c1
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/1_8c9208b9-00d8-4ca1-b7d1-bb68654fb445.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/2_4c0013ff-b606-4343-904d-5a298ae215bf.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/2_4c0013ff-b606-4343-904d-5a298ae215bf.changelog
new file mode 100644
index 0000000000000..ab08ebddeacd5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/2_4c0013ff-b606-4343-904d-5a298ae215bf.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/2_4c0013ff-b606-4343-904d-5a298ae215bf.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/2_4c0013ff-b606-4343-904d-5a298ae215bf.zip
new file mode 100644
index 0000000000000..81fc7ef165d2d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/2_4c0013ff-b606-4343-904d-5a298ae215bf.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/3_932ea797-a834-4b15-9b47-d64b53f29b03.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/3_932ea797-a834-4b15-9b47-d64b53f29b03.changelog
new file mode 100644
index 0000000000000..e5a56c8663597
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/3_932ea797-a834-4b15-9b47-d64b53f29b03.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/4_00e47a7e-0836-4528-a51d-f561a0c4fd85.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/4_00e47a7e-0836-4528-a51d-f561a0c4fd85.changelog
new file mode 100644
index 0000000000000..7e98f5b2da225
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/4_00e47a7e-0836-4528-a51d-f561a0c4fd85.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/4_00e47a7e-0836-4528-a51d-f561a0c4fd85.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/4_00e47a7e-0836-4528-a51d-f561a0c4fd85.zip
new file mode 100644
index 0000000000000..da2e1a2224af2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/4_00e47a7e-0836-4528-a51d-f561a0c4fd85.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/5_653ce64a-9f67-47b4-bd9b-4435f232010d.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/5_653ce64a-9f67-47b4-bd9b-4435f232010d.changelog
new file mode 100644
index 0000000000000..b9ac8456653d6
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/5_653ce64a-9f67-47b4-bd9b-4435f232010d.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/SSTs/.000008-d6e0358c-52d6-4415-9396-67aeea9e6292.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/SSTs/.000008-d6e0358c-52d6-4415-9396-67aeea9e6292.sst.crc
new file mode 100644
index 0000000000000..b005aff56a419
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/SSTs/.000008-d6e0358c-52d6-4415-9396-67aeea9e6292.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/SSTs/000008-d6e0358c-52d6-4415-9396-67aeea9e6292.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/SSTs/000008-d6e0358c-52d6-4415-9396-67aeea9e6292.sst
new file mode 100644
index 0000000000000..366edaf5fd2d4
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyToNumValues/SSTs/000008-d6e0358c-52d6-4415-9396-67aeea9e6292.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.1_3ef859af-c89a-404f-89ec-e1c0a05fc999.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.1_3ef859af-c89a-404f-89ec-e1c0a05fc999.changelog.crc
new file mode 100644
index 0000000000000..010e14c9c849a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.1_3ef859af-c89a-404f-89ec-e1c0a05fc999.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.2_43552f38-571c-46ac-a5a1-29ec9c7ccd08.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.2_43552f38-571c-46ac-a5a1-29ec9c7ccd08.changelog.crc
new file mode 100644
index 0000000000000..74cd1b07f6144
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.2_43552f38-571c-46ac-a5a1-29ec9c7ccd08.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.2_43552f38-571c-46ac-a5a1-29ec9c7ccd08.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.2_43552f38-571c-46ac-a5a1-29ec9c7ccd08.zip.crc
new file mode 100644
index 0000000000000..b06af1a21ea1d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.2_43552f38-571c-46ac-a5a1-29ec9c7ccd08.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.3_d91227ce-1a7f-4872-967e-d817bf3096c0.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.3_d91227ce-1a7f-4872-967e-d817bf3096c0.changelog.crc
new file mode 100644
index 0000000000000..1e88591d629e0
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.3_d91227ce-1a7f-4872-967e-d817bf3096c0.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.4_bd867bd4-76c9-44ce-ab59-6bc78e1e3941.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.4_bd867bd4-76c9-44ce-ab59-6bc78e1e3941.changelog.crc
new file mode 100644
index 0000000000000..ecf07008f5e43
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.4_bd867bd4-76c9-44ce-ab59-6bc78e1e3941.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.4_bd867bd4-76c9-44ce-ab59-6bc78e1e3941.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.4_bd867bd4-76c9-44ce-ab59-6bc78e1e3941.zip.crc
new file mode 100644
index 0000000000000..6d692065dd07d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.4_bd867bd4-76c9-44ce-ab59-6bc78e1e3941.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.5_856bea06-199c-4bf9-95b4-e0b5fd2cf736.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.5_856bea06-199c-4bf9-95b4-e0b5fd2cf736.changelog.crc
new file mode 100644
index 0000000000000..a39cc42d09da7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/.5_856bea06-199c-4bf9-95b4-e0b5fd2cf736.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/1_3ef859af-c89a-404f-89ec-e1c0a05fc999.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/1_3ef859af-c89a-404f-89ec-e1c0a05fc999.changelog
new file mode 100644
index 0000000000000..3e06b2f66f9cc
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/1_3ef859af-c89a-404f-89ec-e1c0a05fc999.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/2_43552f38-571c-46ac-a5a1-29ec9c7ccd08.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/2_43552f38-571c-46ac-a5a1-29ec9c7ccd08.changelog
new file mode 100644
index 0000000000000..1cc19199c8969
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/2_43552f38-571c-46ac-a5a1-29ec9c7ccd08.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/2_43552f38-571c-46ac-a5a1-29ec9c7ccd08.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/2_43552f38-571c-46ac-a5a1-29ec9c7ccd08.zip
new file mode 100644
index 0000000000000..23227ebe8ddb6
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/2_43552f38-571c-46ac-a5a1-29ec9c7ccd08.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/3_d91227ce-1a7f-4872-967e-d817bf3096c0.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/3_d91227ce-1a7f-4872-967e-d817bf3096c0.changelog
new file mode 100644
index 0000000000000..c1b66ee43335f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/3_d91227ce-1a7f-4872-967e-d817bf3096c0.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/4_bd867bd4-76c9-44ce-ab59-6bc78e1e3941.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/4_bd867bd4-76c9-44ce-ab59-6bc78e1e3941.changelog
new file mode 100644
index 0000000000000..60be35b6b426e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/4_bd867bd4-76c9-44ce-ab59-6bc78e1e3941.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/4_bd867bd4-76c9-44ce-ab59-6bc78e1e3941.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/4_bd867bd4-76c9-44ce-ab59-6bc78e1e3941.zip
new file mode 100644
index 0000000000000..1ff71107aa0bf
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/4_bd867bd4-76c9-44ce-ab59-6bc78e1e3941.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/5_856bea06-199c-4bf9-95b4-e0b5fd2cf736.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/5_856bea06-199c-4bf9-95b4-e0b5fd2cf736.changelog
new file mode 100644
index 0000000000000..e9b05b08faf52
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/5_856bea06-199c-4bf9-95b4-e0b5fd2cf736.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/SSTs/.000008-1540ac1a-36ba-427d-b071-3b0bf47d2bec.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/SSTs/.000008-1540ac1a-36ba-427d-b071-3b0bf47d2bec.sst.crc
new file mode 100644
index 0000000000000..2b8a0d3a6e8d9
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/SSTs/.000008-1540ac1a-36ba-427d-b071-3b0bf47d2bec.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/SSTs/000008-1540ac1a-36ba-427d-b071-3b0bf47d2bec.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/SSTs/000008-1540ac1a-36ba-427d-b071-3b0bf47d2bec.sst
new file mode 100644
index 0000000000000..870508d07d56f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/left-keyWithIndexToValue/SSTs/000008-1540ac1a-36ba-427d-b071-3b0bf47d2bec.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.1_4cb064c2-cf82-48d0-ab28-59a823ec1d0b.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.1_4cb064c2-cf82-48d0-ab28-59a823ec1d0b.changelog.crc
new file mode 100644
index 0000000000000..14ce93d6939eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.1_4cb064c2-cf82-48d0-ab28-59a823ec1d0b.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.2_4709e034-e7a7-4c7c-b4a5-15a54c4cb533.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.2_4709e034-e7a7-4c7c-b4a5-15a54c4cb533.changelog.crc
new file mode 100644
index 0000000000000..b7afc65c1e310
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.2_4709e034-e7a7-4c7c-b4a5-15a54c4cb533.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.2_4709e034-e7a7-4c7c-b4a5-15a54c4cb533.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.2_4709e034-e7a7-4c7c-b4a5-15a54c4cb533.zip.crc
new file mode 100644
index 0000000000000..2a1a9e424b873
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.2_4709e034-e7a7-4c7c-b4a5-15a54c4cb533.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.3_387cc6fd-6aea-4f31-aee6-0e4c29e094bc.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.3_387cc6fd-6aea-4f31-aee6-0e4c29e094bc.changelog.crc
new file mode 100644
index 0000000000000..15f83c0300538
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.3_387cc6fd-6aea-4f31-aee6-0e4c29e094bc.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.4_e019a70c-e45f-4280-b140-cf32ec57225e.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.4_e019a70c-e45f-4280-b140-cf32ec57225e.changelog.crc
new file mode 100644
index 0000000000000..1fd08087e2e14
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.4_e019a70c-e45f-4280-b140-cf32ec57225e.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.4_e019a70c-e45f-4280-b140-cf32ec57225e.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.4_e019a70c-e45f-4280-b140-cf32ec57225e.zip.crc
new file mode 100644
index 0000000000000..df25b5318c9c8
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.4_e019a70c-e45f-4280-b140-cf32ec57225e.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.5_abd45128-2b27-4cee-8466-17cd543cdeff.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.5_abd45128-2b27-4cee-8466-17cd543cdeff.changelog.crc
new file mode 100644
index 0000000000000..463978faf5615
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/.5_abd45128-2b27-4cee-8466-17cd543cdeff.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/1_4cb064c2-cf82-48d0-ab28-59a823ec1d0b.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/1_4cb064c2-cf82-48d0-ab28-59a823ec1d0b.changelog
new file mode 100644
index 0000000000000..b842ca7e8a4c1
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/1_4cb064c2-cf82-48d0-ab28-59a823ec1d0b.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/2_4709e034-e7a7-4c7c-b4a5-15a54c4cb533.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/2_4709e034-e7a7-4c7c-b4a5-15a54c4cb533.changelog
new file mode 100644
index 0000000000000..d7dd1d21488af
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/2_4709e034-e7a7-4c7c-b4a5-15a54c4cb533.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/2_4709e034-e7a7-4c7c-b4a5-15a54c4cb533.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/2_4709e034-e7a7-4c7c-b4a5-15a54c4cb533.zip
new file mode 100644
index 0000000000000..ed127ac37b2ce
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/2_4709e034-e7a7-4c7c-b4a5-15a54c4cb533.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/3_387cc6fd-6aea-4f31-aee6-0e4c29e094bc.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/3_387cc6fd-6aea-4f31-aee6-0e4c29e094bc.changelog
new file mode 100644
index 0000000000000..303cb4d9db546
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/3_387cc6fd-6aea-4f31-aee6-0e4c29e094bc.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/4_e019a70c-e45f-4280-b140-cf32ec57225e.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/4_e019a70c-e45f-4280-b140-cf32ec57225e.changelog
new file mode 100644
index 0000000000000..cb1789cb9071b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/4_e019a70c-e45f-4280-b140-cf32ec57225e.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/4_e019a70c-e45f-4280-b140-cf32ec57225e.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/4_e019a70c-e45f-4280-b140-cf32ec57225e.zip
new file mode 100644
index 0000000000000..031d258ca1df5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/4_e019a70c-e45f-4280-b140-cf32ec57225e.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/5_abd45128-2b27-4cee-8466-17cd543cdeff.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/5_abd45128-2b27-4cee-8466-17cd543cdeff.changelog
new file mode 100644
index 0000000000000..93d77a695ccc6
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/5_abd45128-2b27-4cee-8466-17cd543cdeff.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/SSTs/.000008-31297002-f2be-4930-876b-3fd459976cf1.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/SSTs/.000008-31297002-f2be-4930-876b-3fd459976cf1.sst.crc
new file mode 100644
index 0000000000000..7a7c01ac50322
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/SSTs/.000008-31297002-f2be-4930-876b-3fd459976cf1.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/SSTs/.000009-5d5c23d2-9e22-4a53-b1cd-407d0c3a029d.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/SSTs/.000009-5d5c23d2-9e22-4a53-b1cd-407d0c3a029d.sst.crc
new file mode 100644
index 0000000000000..75595d43eea1a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/SSTs/.000009-5d5c23d2-9e22-4a53-b1cd-407d0c3a029d.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/SSTs/000008-31297002-f2be-4930-876b-3fd459976cf1.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/SSTs/000008-31297002-f2be-4930-876b-3fd459976cf1.sst
new file mode 100644
index 0000000000000..e27afed78ff24
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/SSTs/000008-31297002-f2be-4930-876b-3fd459976cf1.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/SSTs/000009-5d5c23d2-9e22-4a53-b1cd-407d0c3a029d.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/SSTs/000009-5d5c23d2-9e22-4a53-b1cd-407d0c3a029d.sst
new file mode 100644
index 0000000000000..6f79575ab10c5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyToNumValues/SSTs/000009-5d5c23d2-9e22-4a53-b1cd-407d0c3a029d.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.1_660629fa-ccb7-4c2e-8bd9-c0917e51d1af.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.1_660629fa-ccb7-4c2e-8bd9-c0917e51d1af.changelog.crc
new file mode 100644
index 0000000000000..78406dd36e908
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.1_660629fa-ccb7-4c2e-8bd9-c0917e51d1af.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.2_5cb49350-1260-48c3-b546-1eb53817decd.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.2_5cb49350-1260-48c3-b546-1eb53817decd.changelog.crc
new file mode 100644
index 0000000000000..b371b17d9f823
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.2_5cb49350-1260-48c3-b546-1eb53817decd.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.2_5cb49350-1260-48c3-b546-1eb53817decd.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.2_5cb49350-1260-48c3-b546-1eb53817decd.zip.crc
new file mode 100644
index 0000000000000..e33e2628caf51
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.2_5cb49350-1260-48c3-b546-1eb53817decd.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.3_a62dab53-b8d5-4329-b21c-0ee623b350d5.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.3_a62dab53-b8d5-4329-b21c-0ee623b350d5.changelog.crc
new file mode 100644
index 0000000000000..330dfe03f75d8
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.3_a62dab53-b8d5-4329-b21c-0ee623b350d5.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.4_582e56d1-6a1d-434d-9afc-c1a812b37a06.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.4_582e56d1-6a1d-434d-9afc-c1a812b37a06.changelog.crc
new file mode 100644
index 0000000000000..1730e86542de7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.4_582e56d1-6a1d-434d-9afc-c1a812b37a06.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.4_582e56d1-6a1d-434d-9afc-c1a812b37a06.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.4_582e56d1-6a1d-434d-9afc-c1a812b37a06.zip.crc
new file mode 100644
index 0000000000000..e9faba4f17f78
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.4_582e56d1-6a1d-434d-9afc-c1a812b37a06.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.5_db88e60d-780c-42d1-bd36-50e6666b322c.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.5_db88e60d-780c-42d1-bd36-50e6666b322c.changelog.crc
new file mode 100644
index 0000000000000..c4f950ac44271
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/.5_db88e60d-780c-42d1-bd36-50e6666b322c.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/1_660629fa-ccb7-4c2e-8bd9-c0917e51d1af.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/1_660629fa-ccb7-4c2e-8bd9-c0917e51d1af.changelog
new file mode 100644
index 0000000000000..c0953173510c0
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/1_660629fa-ccb7-4c2e-8bd9-c0917e51d1af.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/2_5cb49350-1260-48c3-b546-1eb53817decd.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/2_5cb49350-1260-48c3-b546-1eb53817decd.changelog
new file mode 100644
index 0000000000000..459561ce6711d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/2_5cb49350-1260-48c3-b546-1eb53817decd.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/2_5cb49350-1260-48c3-b546-1eb53817decd.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/2_5cb49350-1260-48c3-b546-1eb53817decd.zip
new file mode 100644
index 0000000000000..a7aa302537926
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/2_5cb49350-1260-48c3-b546-1eb53817decd.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/3_a62dab53-b8d5-4329-b21c-0ee623b350d5.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/3_a62dab53-b8d5-4329-b21c-0ee623b350d5.changelog
new file mode 100644
index 0000000000000..1f97342501fa5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/3_a62dab53-b8d5-4329-b21c-0ee623b350d5.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/4_582e56d1-6a1d-434d-9afc-c1a812b37a06.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/4_582e56d1-6a1d-434d-9afc-c1a812b37a06.changelog
new file mode 100644
index 0000000000000..7de5996d61873
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/4_582e56d1-6a1d-434d-9afc-c1a812b37a06.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/4_582e56d1-6a1d-434d-9afc-c1a812b37a06.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/4_582e56d1-6a1d-434d-9afc-c1a812b37a06.zip
new file mode 100644
index 0000000000000..bfbb40cf26ee1
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/4_582e56d1-6a1d-434d-9afc-c1a812b37a06.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/5_db88e60d-780c-42d1-bd36-50e6666b322c.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/5_db88e60d-780c-42d1-bd36-50e6666b322c.changelog
new file mode 100644
index 0000000000000..1ca0ed8995eda
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/5_db88e60d-780c-42d1-bd36-50e6666b322c.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/SSTs/.000008-17a15b91-abb1-4c81-b3dd-f4e36fae53a4.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/SSTs/.000008-17a15b91-abb1-4c81-b3dd-f4e36fae53a4.sst.crc
new file mode 100644
index 0000000000000..a7019e739cab0
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/SSTs/.000008-17a15b91-abb1-4c81-b3dd-f4e36fae53a4.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/SSTs/.000009-31c31aeb-37e5-477a-a908-cdb3336b732c.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/SSTs/.000009-31c31aeb-37e5-477a-a908-cdb3336b732c.sst.crc
new file mode 100644
index 0000000000000..a75c86c155dc3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/SSTs/.000009-31c31aeb-37e5-477a-a908-cdb3336b732c.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/SSTs/000008-17a15b91-abb1-4c81-b3dd-f4e36fae53a4.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/SSTs/000008-17a15b91-abb1-4c81-b3dd-f4e36fae53a4.sst
new file mode 100644
index 0000000000000..4a5fa92887dde
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/SSTs/000008-17a15b91-abb1-4c81-b3dd-f4e36fae53a4.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/SSTs/000009-31c31aeb-37e5-477a-a908-cdb3336b732c.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/SSTs/000009-31c31aeb-37e5-477a-a908-cdb3336b732c.sst
new file mode 100644
index 0000000000000..9cd8d54bda49e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/2/right-keyWithIndexToValue/SSTs/000009-31c31aeb-37e5-477a-a908-cdb3336b732c.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.1_321b1232-a719-446c-b197-4627893768cb.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.1_321b1232-a719-446c-b197-4627893768cb.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.1_321b1232-a719-446c-b197-4627893768cb.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.2_8b68d3d4-01ca-478a-9968-85481070d793.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.2_8b68d3d4-01ca-478a-9968-85481070d793.changelog.crc
new file mode 100644
index 0000000000000..4aa3f608962e6
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.2_8b68d3d4-01ca-478a-9968-85481070d793.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.2_8b68d3d4-01ca-478a-9968-85481070d793.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.2_8b68d3d4-01ca-478a-9968-85481070d793.zip.crc
new file mode 100644
index 0000000000000..acd377ea5c2f3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.2_8b68d3d4-01ca-478a-9968-85481070d793.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.3_fef54f55-9d1b-4733-862b-c0b42a3795ae.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.3_fef54f55-9d1b-4733-862b-c0b42a3795ae.changelog.crc
new file mode 100644
index 0000000000000..e20258f974f71
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.3_fef54f55-9d1b-4733-862b-c0b42a3795ae.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.4_3c10e0cf-023f-4dfa-bbc7-329a4c0597e8.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.4_3c10e0cf-023f-4dfa-bbc7-329a4c0597e8.changelog.crc
new file mode 100644
index 0000000000000..6ac2ad197c4e1
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.4_3c10e0cf-023f-4dfa-bbc7-329a4c0597e8.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.4_3c10e0cf-023f-4dfa-bbc7-329a4c0597e8.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.4_3c10e0cf-023f-4dfa-bbc7-329a4c0597e8.zip.crc
new file mode 100644
index 0000000000000..57d6fa76fbc3e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.4_3c10e0cf-023f-4dfa-bbc7-329a4c0597e8.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.5_4b6f18f7-2fb6-470d-b1dc-447089b72b38.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.5_4b6f18f7-2fb6-470d-b1dc-447089b72b38.changelog.crc
new file mode 100644
index 0000000000000..16a5eb9c08774
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/.5_4b6f18f7-2fb6-470d-b1dc-447089b72b38.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/1_321b1232-a719-446c-b197-4627893768cb.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/1_321b1232-a719-446c-b197-4627893768cb.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/1_321b1232-a719-446c-b197-4627893768cb.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/2_8b68d3d4-01ca-478a-9968-85481070d793.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/2_8b68d3d4-01ca-478a-9968-85481070d793.changelog
new file mode 100644
index 0000000000000..7af11eabf4759
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/2_8b68d3d4-01ca-478a-9968-85481070d793.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/2_8b68d3d4-01ca-478a-9968-85481070d793.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/2_8b68d3d4-01ca-478a-9968-85481070d793.zip
new file mode 100644
index 0000000000000..7d31eb168d92c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/2_8b68d3d4-01ca-478a-9968-85481070d793.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/3_fef54f55-9d1b-4733-862b-c0b42a3795ae.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/3_fef54f55-9d1b-4733-862b-c0b42a3795ae.changelog
new file mode 100644
index 0000000000000..adfc76600c1a0
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/3_fef54f55-9d1b-4733-862b-c0b42a3795ae.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/4_3c10e0cf-023f-4dfa-bbc7-329a4c0597e8.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/4_3c10e0cf-023f-4dfa-bbc7-329a4c0597e8.changelog
new file mode 100644
index 0000000000000..7963b64724b45
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/4_3c10e0cf-023f-4dfa-bbc7-329a4c0597e8.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/4_3c10e0cf-023f-4dfa-bbc7-329a4c0597e8.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/4_3c10e0cf-023f-4dfa-bbc7-329a4c0597e8.zip
new file mode 100644
index 0000000000000..9fe933267b353
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/4_3c10e0cf-023f-4dfa-bbc7-329a4c0597e8.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/5_4b6f18f7-2fb6-470d-b1dc-447089b72b38.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/5_4b6f18f7-2fb6-470d-b1dc-447089b72b38.changelog
new file mode 100644
index 0000000000000..b50d73d88ed0f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/5_4b6f18f7-2fb6-470d-b1dc-447089b72b38.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/SSTs/.000008-06ae64e9-ae38-42e3-b432-f4f0c3a2d718.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/SSTs/.000008-06ae64e9-ae38-42e3-b432-f4f0c3a2d718.sst.crc
new file mode 100644
index 0000000000000..637f2de97e745
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/SSTs/.000008-06ae64e9-ae38-42e3-b432-f4f0c3a2d718.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/SSTs/.000009-6a880d8c-3efc-4d74-bddc-2470cb77191e.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/SSTs/.000009-6a880d8c-3efc-4d74-bddc-2470cb77191e.sst.crc
new file mode 100644
index 0000000000000..d5002ebffc520
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/SSTs/.000009-6a880d8c-3efc-4d74-bddc-2470cb77191e.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/SSTs/000008-06ae64e9-ae38-42e3-b432-f4f0c3a2d718.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/SSTs/000008-06ae64e9-ae38-42e3-b432-f4f0c3a2d718.sst
new file mode 100644
index 0000000000000..e32cb39e0fbbf
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/SSTs/000008-06ae64e9-ae38-42e3-b432-f4f0c3a2d718.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/SSTs/000009-6a880d8c-3efc-4d74-bddc-2470cb77191e.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/SSTs/000009-6a880d8c-3efc-4d74-bddc-2470cb77191e.sst
new file mode 100644
index 0000000000000..e3b3449dc46cf
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyToNumValues/SSTs/000009-6a880d8c-3efc-4d74-bddc-2470cb77191e.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.1_49d64c9d-21df-4dbf-ab0f-947a47b91d53.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.1_49d64c9d-21df-4dbf-ab0f-947a47b91d53.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.1_49d64c9d-21df-4dbf-ab0f-947a47b91d53.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.2_0229f413-f8bf-4f9c-8ea2-1148a23305a8.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.2_0229f413-f8bf-4f9c-8ea2-1148a23305a8.changelog.crc
new file mode 100644
index 0000000000000..069e9ce7e7722
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.2_0229f413-f8bf-4f9c-8ea2-1148a23305a8.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.2_0229f413-f8bf-4f9c-8ea2-1148a23305a8.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.2_0229f413-f8bf-4f9c-8ea2-1148a23305a8.zip.crc
new file mode 100644
index 0000000000000..ad5ace3c2ce38
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.2_0229f413-f8bf-4f9c-8ea2-1148a23305a8.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.3_f7a82f8a-6c01-44d7-a984-aeb298b0a5fc.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.3_f7a82f8a-6c01-44d7-a984-aeb298b0a5fc.changelog.crc
new file mode 100644
index 0000000000000..53335d76880c5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.3_f7a82f8a-6c01-44d7-a984-aeb298b0a5fc.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.4_25ef5b0c-fbc4-4568-ae87-a53235efa728.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.4_25ef5b0c-fbc4-4568-ae87-a53235efa728.changelog.crc
new file mode 100644
index 0000000000000..26b7beb54f2cc
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.4_25ef5b0c-fbc4-4568-ae87-a53235efa728.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.4_25ef5b0c-fbc4-4568-ae87-a53235efa728.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.4_25ef5b0c-fbc4-4568-ae87-a53235efa728.zip.crc
new file mode 100644
index 0000000000000..81c8d1137700f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.4_25ef5b0c-fbc4-4568-ae87-a53235efa728.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.5_ffdb4256-b0da-476c-9028-7ed3233befb3.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.5_ffdb4256-b0da-476c-9028-7ed3233befb3.changelog.crc
new file mode 100644
index 0000000000000..926c0ae243603
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/.5_ffdb4256-b0da-476c-9028-7ed3233befb3.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/1_49d64c9d-21df-4dbf-ab0f-947a47b91d53.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/1_49d64c9d-21df-4dbf-ab0f-947a47b91d53.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/1_49d64c9d-21df-4dbf-ab0f-947a47b91d53.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/2_0229f413-f8bf-4f9c-8ea2-1148a23305a8.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/2_0229f413-f8bf-4f9c-8ea2-1148a23305a8.changelog
new file mode 100644
index 0000000000000..56dd1634e6b3c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/2_0229f413-f8bf-4f9c-8ea2-1148a23305a8.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/2_0229f413-f8bf-4f9c-8ea2-1148a23305a8.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/2_0229f413-f8bf-4f9c-8ea2-1148a23305a8.zip
new file mode 100644
index 0000000000000..d3e33f403fe17
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/2_0229f413-f8bf-4f9c-8ea2-1148a23305a8.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/3_f7a82f8a-6c01-44d7-a984-aeb298b0a5fc.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/3_f7a82f8a-6c01-44d7-a984-aeb298b0a5fc.changelog
new file mode 100644
index 0000000000000..2601f4cf9f2ff
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/3_f7a82f8a-6c01-44d7-a984-aeb298b0a5fc.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/4_25ef5b0c-fbc4-4568-ae87-a53235efa728.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/4_25ef5b0c-fbc4-4568-ae87-a53235efa728.changelog
new file mode 100644
index 0000000000000..1fd648be03256
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/4_25ef5b0c-fbc4-4568-ae87-a53235efa728.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/4_25ef5b0c-fbc4-4568-ae87-a53235efa728.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/4_25ef5b0c-fbc4-4568-ae87-a53235efa728.zip
new file mode 100644
index 0000000000000..d792b4446b905
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/4_25ef5b0c-fbc4-4568-ae87-a53235efa728.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/5_ffdb4256-b0da-476c-9028-7ed3233befb3.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/5_ffdb4256-b0da-476c-9028-7ed3233befb3.changelog
new file mode 100644
index 0000000000000..ed35d2cec2056
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/5_ffdb4256-b0da-476c-9028-7ed3233befb3.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/SSTs/.000008-2872cbb8-ed4f-49b6-a758-2bd0785c9813.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/SSTs/.000008-2872cbb8-ed4f-49b6-a758-2bd0785c9813.sst.crc
new file mode 100644
index 0000000000000..a3d97278717ad
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/SSTs/.000008-2872cbb8-ed4f-49b6-a758-2bd0785c9813.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/SSTs/.000009-da165204-f078-4d4f-983a-39c581fdd01c.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/SSTs/.000009-da165204-f078-4d4f-983a-39c581fdd01c.sst.crc
new file mode 100644
index 0000000000000..da08ff4c369dd
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/SSTs/.000009-da165204-f078-4d4f-983a-39c581fdd01c.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/SSTs/000008-2872cbb8-ed4f-49b6-a758-2bd0785c9813.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/SSTs/000008-2872cbb8-ed4f-49b6-a758-2bd0785c9813.sst
new file mode 100644
index 0000000000000..04459938d0e15
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/SSTs/000008-2872cbb8-ed4f-49b6-a758-2bd0785c9813.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/SSTs/000009-da165204-f078-4d4f-983a-39c581fdd01c.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/SSTs/000009-da165204-f078-4d4f-983a-39c581fdd01c.sst
new file mode 100644
index 0000000000000..6cfa76e264cb2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/left-keyWithIndexToValue/SSTs/000009-da165204-f078-4d4f-983a-39c581fdd01c.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.1_196dfd41-d84c-407a-b5c8-374ad31aee0e.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.1_196dfd41-d84c-407a-b5c8-374ad31aee0e.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.1_196dfd41-d84c-407a-b5c8-374ad31aee0e.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.2_c0169e38-57f3-4e1e-8568-24a4481bafd4.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.2_c0169e38-57f3-4e1e-8568-24a4481bafd4.changelog.crc
new file mode 100644
index 0000000000000..dbc6bfc3b97f5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.2_c0169e38-57f3-4e1e-8568-24a4481bafd4.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.2_c0169e38-57f3-4e1e-8568-24a4481bafd4.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.2_c0169e38-57f3-4e1e-8568-24a4481bafd4.zip.crc
new file mode 100644
index 0000000000000..d41f33c0b8618
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.2_c0169e38-57f3-4e1e-8568-24a4481bafd4.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.3_91a401ae-a73c-45da-a3c9-7ad53af90c6e.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.3_91a401ae-a73c-45da-a3c9-7ad53af90c6e.changelog.crc
new file mode 100644
index 0000000000000..5b9a9a8cc5f02
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.3_91a401ae-a73c-45da-a3c9-7ad53af90c6e.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.4_64486e03-757d-444d-80a5-81f4d10f7279.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.4_64486e03-757d-444d-80a5-81f4d10f7279.changelog.crc
new file mode 100644
index 0000000000000..2c64baa8cf566
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.4_64486e03-757d-444d-80a5-81f4d10f7279.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.4_64486e03-757d-444d-80a5-81f4d10f7279.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.4_64486e03-757d-444d-80a5-81f4d10f7279.zip.crc
new file mode 100644
index 0000000000000..a72095ca6e773
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.4_64486e03-757d-444d-80a5-81f4d10f7279.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.5_14f32827-c3d9-4d85-bb6b-a61c317d06b7.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.5_14f32827-c3d9-4d85-bb6b-a61c317d06b7.changelog.crc
new file mode 100644
index 0000000000000..db8dd0bc7c64d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/.5_14f32827-c3d9-4d85-bb6b-a61c317d06b7.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/1_196dfd41-d84c-407a-b5c8-374ad31aee0e.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/1_196dfd41-d84c-407a-b5c8-374ad31aee0e.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/1_196dfd41-d84c-407a-b5c8-374ad31aee0e.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/2_c0169e38-57f3-4e1e-8568-24a4481bafd4.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/2_c0169e38-57f3-4e1e-8568-24a4481bafd4.changelog
new file mode 100644
index 0000000000000..e03b1919571e5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/2_c0169e38-57f3-4e1e-8568-24a4481bafd4.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/2_c0169e38-57f3-4e1e-8568-24a4481bafd4.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/2_c0169e38-57f3-4e1e-8568-24a4481bafd4.zip
new file mode 100644
index 0000000000000..ae974edab2b7a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/2_c0169e38-57f3-4e1e-8568-24a4481bafd4.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/3_91a401ae-a73c-45da-a3c9-7ad53af90c6e.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/3_91a401ae-a73c-45da-a3c9-7ad53af90c6e.changelog
new file mode 100644
index 0000000000000..48033868294b2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/3_91a401ae-a73c-45da-a3c9-7ad53af90c6e.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/4_64486e03-757d-444d-80a5-81f4d10f7279.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/4_64486e03-757d-444d-80a5-81f4d10f7279.changelog
new file mode 100644
index 0000000000000..cf82b398d4a39
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/4_64486e03-757d-444d-80a5-81f4d10f7279.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/4_64486e03-757d-444d-80a5-81f4d10f7279.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/4_64486e03-757d-444d-80a5-81f4d10f7279.zip
new file mode 100644
index 0000000000000..d604c76824185
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/4_64486e03-757d-444d-80a5-81f4d10f7279.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/5_14f32827-c3d9-4d85-bb6b-a61c317d06b7.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/5_14f32827-c3d9-4d85-bb6b-a61c317d06b7.changelog
new file mode 100644
index 0000000000000..fe2db93620687
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/5_14f32827-c3d9-4d85-bb6b-a61c317d06b7.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/SSTs/.000008-c10ffbfa-cdf0-4e28-b213-fac5e0bc17e6.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/SSTs/.000008-c10ffbfa-cdf0-4e28-b213-fac5e0bc17e6.sst.crc
new file mode 100644
index 0000000000000..ba27443014c98
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/SSTs/.000008-c10ffbfa-cdf0-4e28-b213-fac5e0bc17e6.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/SSTs/.000009-66339210-614b-4efd-b3c7-3c0f154965a4.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/SSTs/.000009-66339210-614b-4efd-b3c7-3c0f154965a4.sst.crc
new file mode 100644
index 0000000000000..e520fc7a27f65
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/SSTs/.000009-66339210-614b-4efd-b3c7-3c0f154965a4.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/SSTs/000008-c10ffbfa-cdf0-4e28-b213-fac5e0bc17e6.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/SSTs/000008-c10ffbfa-cdf0-4e28-b213-fac5e0bc17e6.sst
new file mode 100644
index 0000000000000..413b6336e0ecd
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/SSTs/000008-c10ffbfa-cdf0-4e28-b213-fac5e0bc17e6.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/SSTs/000009-66339210-614b-4efd-b3c7-3c0f154965a4.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/SSTs/000009-66339210-614b-4efd-b3c7-3c0f154965a4.sst
new file mode 100644
index 0000000000000..e0736066aa52a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyToNumValues/SSTs/000009-66339210-614b-4efd-b3c7-3c0f154965a4.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.1_78ced041-0750-48e5-b2fa-36b8b6f8fa26.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.1_78ced041-0750-48e5-b2fa-36b8b6f8fa26.changelog.crc
new file mode 100644
index 0000000000000..3e66be5d5a116
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.1_78ced041-0750-48e5-b2fa-36b8b6f8fa26.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.2_3af3c8f3-7549-4981-8084-253c807897f6.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.2_3af3c8f3-7549-4981-8084-253c807897f6.changelog.crc
new file mode 100644
index 0000000000000..705b682d5c4b0
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.2_3af3c8f3-7549-4981-8084-253c807897f6.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.2_3af3c8f3-7549-4981-8084-253c807897f6.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.2_3af3c8f3-7549-4981-8084-253c807897f6.zip.crc
new file mode 100644
index 0000000000000..50637f6f5a9ce
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.2_3af3c8f3-7549-4981-8084-253c807897f6.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.3_36d60395-522a-4129-a324-dd41beebad34.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.3_36d60395-522a-4129-a324-dd41beebad34.changelog.crc
new file mode 100644
index 0000000000000..f021d5337b2c8
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.3_36d60395-522a-4129-a324-dd41beebad34.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.4_61ab3c53-bbc9-44ee-b397-5622fc3e19be.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.4_61ab3c53-bbc9-44ee-b397-5622fc3e19be.changelog.crc
new file mode 100644
index 0000000000000..fa7fec0362307
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.4_61ab3c53-bbc9-44ee-b397-5622fc3e19be.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.4_61ab3c53-bbc9-44ee-b397-5622fc3e19be.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.4_61ab3c53-bbc9-44ee-b397-5622fc3e19be.zip.crc
new file mode 100644
index 0000000000000..43b7181aca4e0
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.4_61ab3c53-bbc9-44ee-b397-5622fc3e19be.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.5_570cf616-6ae9-4f6d-932e-053fa820166c.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.5_570cf616-6ae9-4f6d-932e-053fa820166c.changelog.crc
new file mode 100644
index 0000000000000..358983532b699
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/.5_570cf616-6ae9-4f6d-932e-053fa820166c.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/1_78ced041-0750-48e5-b2fa-36b8b6f8fa26.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/1_78ced041-0750-48e5-b2fa-36b8b6f8fa26.changelog
new file mode 100644
index 0000000000000..e32a2f46392eb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/1_78ced041-0750-48e5-b2fa-36b8b6f8fa26.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/2_3af3c8f3-7549-4981-8084-253c807897f6.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/2_3af3c8f3-7549-4981-8084-253c807897f6.changelog
new file mode 100644
index 0000000000000..c87b2b7e9433b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/2_3af3c8f3-7549-4981-8084-253c807897f6.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/2_3af3c8f3-7549-4981-8084-253c807897f6.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/2_3af3c8f3-7549-4981-8084-253c807897f6.zip
new file mode 100644
index 0000000000000..c7a27374abbdb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/2_3af3c8f3-7549-4981-8084-253c807897f6.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/3_36d60395-522a-4129-a324-dd41beebad34.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/3_36d60395-522a-4129-a324-dd41beebad34.changelog
new file mode 100644
index 0000000000000..31dae50b41368
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/3_36d60395-522a-4129-a324-dd41beebad34.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/4_61ab3c53-bbc9-44ee-b397-5622fc3e19be.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/4_61ab3c53-bbc9-44ee-b397-5622fc3e19be.changelog
new file mode 100644
index 0000000000000..72628de55e7e4
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/4_61ab3c53-bbc9-44ee-b397-5622fc3e19be.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/4_61ab3c53-bbc9-44ee-b397-5622fc3e19be.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/4_61ab3c53-bbc9-44ee-b397-5622fc3e19be.zip
new file mode 100644
index 0000000000000..771bdeee51931
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/4_61ab3c53-bbc9-44ee-b397-5622fc3e19be.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/5_570cf616-6ae9-4f6d-932e-053fa820166c.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/5_570cf616-6ae9-4f6d-932e-053fa820166c.changelog
new file mode 100644
index 0000000000000..6c1ed691bbf69
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/5_570cf616-6ae9-4f6d-932e-053fa820166c.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/SSTs/.000008-83e443ca-3070-4a5e-b83e-541f847e6891.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/SSTs/.000008-83e443ca-3070-4a5e-b83e-541f847e6891.sst.crc
new file mode 100644
index 0000000000000..f59721fb9eae2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/SSTs/.000008-83e443ca-3070-4a5e-b83e-541f847e6891.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/SSTs/.000009-b71420b2-2462-4e8a-a3ce-86cbf54cb3ee.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/SSTs/.000009-b71420b2-2462-4e8a-a3ce-86cbf54cb3ee.sst.crc
new file mode 100644
index 0000000000000..98be0615942bd
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/SSTs/.000009-b71420b2-2462-4e8a-a3ce-86cbf54cb3ee.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/SSTs/000008-83e443ca-3070-4a5e-b83e-541f847e6891.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/SSTs/000008-83e443ca-3070-4a5e-b83e-541f847e6891.sst
new file mode 100644
index 0000000000000..cc7d09a0e7770
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/SSTs/000008-83e443ca-3070-4a5e-b83e-541f847e6891.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/SSTs/000009-b71420b2-2462-4e8a-a3ce-86cbf54cb3ee.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/SSTs/000009-b71420b2-2462-4e8a-a3ce-86cbf54cb3ee.sst
new file mode 100644
index 0000000000000..377a69827fc06
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/3/right-keyWithIndexToValue/SSTs/000009-b71420b2-2462-4e8a-a3ce-86cbf54cb3ee.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.1_0040b5e8-b186-4d97-b69a-e1d48d768d8f.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.1_0040b5e8-b186-4d97-b69a-e1d48d768d8f.changelog.crc
new file mode 100644
index 0000000000000..1b44d43130d13
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.1_0040b5e8-b186-4d97-b69a-e1d48d768d8f.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.2_dfea3958-bb40-48bc-bfa9-572dd76eedfd.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.2_dfea3958-bb40-48bc-bfa9-572dd76eedfd.changelog.crc
new file mode 100644
index 0000000000000..7b8982567b80b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.2_dfea3958-bb40-48bc-bfa9-572dd76eedfd.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.2_dfea3958-bb40-48bc-bfa9-572dd76eedfd.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.2_dfea3958-bb40-48bc-bfa9-572dd76eedfd.zip.crc
new file mode 100644
index 0000000000000..b23b2ec8a67ae
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.2_dfea3958-bb40-48bc-bfa9-572dd76eedfd.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.3_a01d7c5d-d373-4dc7-8a8f-25bf03849360.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.3_a01d7c5d-d373-4dc7-8a8f-25bf03849360.changelog.crc
new file mode 100644
index 0000000000000..1868970ff82a5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.3_a01d7c5d-d373-4dc7-8a8f-25bf03849360.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.4_aeb92d41-0961-4b4c-bb6f-49b636ee728e.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.4_aeb92d41-0961-4b4c-bb6f-49b636ee728e.changelog.crc
new file mode 100644
index 0000000000000..da31af6425e41
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.4_aeb92d41-0961-4b4c-bb6f-49b636ee728e.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.4_aeb92d41-0961-4b4c-bb6f-49b636ee728e.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.4_aeb92d41-0961-4b4c-bb6f-49b636ee728e.zip.crc
new file mode 100644
index 0000000000000..f0c693bbd4e9d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.4_aeb92d41-0961-4b4c-bb6f-49b636ee728e.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.5_9bd7274b-5353-4fc1-8a6b-a4a7bd1afe93.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.5_9bd7274b-5353-4fc1-8a6b-a4a7bd1afe93.changelog.crc
new file mode 100644
index 0000000000000..e432bae298575
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/.5_9bd7274b-5353-4fc1-8a6b-a4a7bd1afe93.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/1_0040b5e8-b186-4d97-b69a-e1d48d768d8f.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/1_0040b5e8-b186-4d97-b69a-e1d48d768d8f.changelog
new file mode 100644
index 0000000000000..f1403c9e68632
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/1_0040b5e8-b186-4d97-b69a-e1d48d768d8f.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/2_dfea3958-bb40-48bc-bfa9-572dd76eedfd.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/2_dfea3958-bb40-48bc-bfa9-572dd76eedfd.changelog
new file mode 100644
index 0000000000000..2d128101825e7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/2_dfea3958-bb40-48bc-bfa9-572dd76eedfd.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/2_dfea3958-bb40-48bc-bfa9-572dd76eedfd.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/2_dfea3958-bb40-48bc-bfa9-572dd76eedfd.zip
new file mode 100644
index 0000000000000..a51eea0d41176
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/2_dfea3958-bb40-48bc-bfa9-572dd76eedfd.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/3_a01d7c5d-d373-4dc7-8a8f-25bf03849360.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/3_a01d7c5d-d373-4dc7-8a8f-25bf03849360.changelog
new file mode 100644
index 0000000000000..b1182e9c28584
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/3_a01d7c5d-d373-4dc7-8a8f-25bf03849360.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/4_aeb92d41-0961-4b4c-bb6f-49b636ee728e.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/4_aeb92d41-0961-4b4c-bb6f-49b636ee728e.changelog
new file mode 100644
index 0000000000000..df3ec59f693aa
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/4_aeb92d41-0961-4b4c-bb6f-49b636ee728e.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/4_aeb92d41-0961-4b4c-bb6f-49b636ee728e.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/4_aeb92d41-0961-4b4c-bb6f-49b636ee728e.zip
new file mode 100644
index 0000000000000..ab6fc89851c64
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/4_aeb92d41-0961-4b4c-bb6f-49b636ee728e.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/5_9bd7274b-5353-4fc1-8a6b-a4a7bd1afe93.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/5_9bd7274b-5353-4fc1-8a6b-a4a7bd1afe93.changelog
new file mode 100644
index 0000000000000..a8374af6c8b29
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/5_9bd7274b-5353-4fc1-8a6b-a4a7bd1afe93.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/SSTs/.000008-935a9552-8457-47d4-a970-455d5c020652.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/SSTs/.000008-935a9552-8457-47d4-a970-455d5c020652.sst.crc
new file mode 100644
index 0000000000000..cbe565f21b163
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/SSTs/.000008-935a9552-8457-47d4-a970-455d5c020652.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/SSTs/.000009-19d0b0ea-5e91-4b32-bcfa-00d9bca85e7a.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/SSTs/.000009-19d0b0ea-5e91-4b32-bcfa-00d9bca85e7a.sst.crc
new file mode 100644
index 0000000000000..3c4bb78579477
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/SSTs/.000009-19d0b0ea-5e91-4b32-bcfa-00d9bca85e7a.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/SSTs/000008-935a9552-8457-47d4-a970-455d5c020652.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/SSTs/000008-935a9552-8457-47d4-a970-455d5c020652.sst
new file mode 100644
index 0000000000000..d1f000b654ae0
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/SSTs/000008-935a9552-8457-47d4-a970-455d5c020652.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/SSTs/000009-19d0b0ea-5e91-4b32-bcfa-00d9bca85e7a.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/SSTs/000009-19d0b0ea-5e91-4b32-bcfa-00d9bca85e7a.sst
new file mode 100644
index 0000000000000..ac2481cc6d8be
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyToNumValues/SSTs/000009-19d0b0ea-5e91-4b32-bcfa-00d9bca85e7a.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.1_469dcb5c-d2a0-4d96-805e-4460a4d4b5aa.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.1_469dcb5c-d2a0-4d96-805e-4460a4d4b5aa.changelog.crc
new file mode 100644
index 0000000000000..ae5355f7bc287
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.1_469dcb5c-d2a0-4d96-805e-4460a4d4b5aa.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.2_b1e0c8aa-88b8-49b7-a734-bc9966161850.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.2_b1e0c8aa-88b8-49b7-a734-bc9966161850.changelog.crc
new file mode 100644
index 0000000000000..afb24995554f2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.2_b1e0c8aa-88b8-49b7-a734-bc9966161850.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.2_b1e0c8aa-88b8-49b7-a734-bc9966161850.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.2_b1e0c8aa-88b8-49b7-a734-bc9966161850.zip.crc
new file mode 100644
index 0000000000000..8d80ffbe5942f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.2_b1e0c8aa-88b8-49b7-a734-bc9966161850.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.3_bceb4cde-7197-4db6-842d-04b3c5463505.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.3_bceb4cde-7197-4db6-842d-04b3c5463505.changelog.crc
new file mode 100644
index 0000000000000..68e6cf9bcf156
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.3_bceb4cde-7197-4db6-842d-04b3c5463505.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.4_5e37c9ad-9142-47cb-943c-4c2c231483c1.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.4_5e37c9ad-9142-47cb-943c-4c2c231483c1.changelog.crc
new file mode 100644
index 0000000000000..dea7c7af39688
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.4_5e37c9ad-9142-47cb-943c-4c2c231483c1.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.4_5e37c9ad-9142-47cb-943c-4c2c231483c1.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.4_5e37c9ad-9142-47cb-943c-4c2c231483c1.zip.crc
new file mode 100644
index 0000000000000..7d59b789f3f03
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.4_5e37c9ad-9142-47cb-943c-4c2c231483c1.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.5_2fef25a0-611c-4bde-be77-84e6b7261698.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.5_2fef25a0-611c-4bde-be77-84e6b7261698.changelog.crc
new file mode 100644
index 0000000000000..0169ea4d52e04
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/.5_2fef25a0-611c-4bde-be77-84e6b7261698.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/1_469dcb5c-d2a0-4d96-805e-4460a4d4b5aa.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/1_469dcb5c-d2a0-4d96-805e-4460a4d4b5aa.changelog
new file mode 100644
index 0000000000000..792cd7007bc1f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/1_469dcb5c-d2a0-4d96-805e-4460a4d4b5aa.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/2_b1e0c8aa-88b8-49b7-a734-bc9966161850.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/2_b1e0c8aa-88b8-49b7-a734-bc9966161850.changelog
new file mode 100644
index 0000000000000..5cd0948f916c0
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/2_b1e0c8aa-88b8-49b7-a734-bc9966161850.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/2_b1e0c8aa-88b8-49b7-a734-bc9966161850.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/2_b1e0c8aa-88b8-49b7-a734-bc9966161850.zip
new file mode 100644
index 0000000000000..ba06bb6bebf37
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/2_b1e0c8aa-88b8-49b7-a734-bc9966161850.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/3_bceb4cde-7197-4db6-842d-04b3c5463505.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/3_bceb4cde-7197-4db6-842d-04b3c5463505.changelog
new file mode 100644
index 0000000000000..9fd22feb707ee
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/3_bceb4cde-7197-4db6-842d-04b3c5463505.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/4_5e37c9ad-9142-47cb-943c-4c2c231483c1.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/4_5e37c9ad-9142-47cb-943c-4c2c231483c1.changelog
new file mode 100644
index 0000000000000..bb84f4c79d59f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/4_5e37c9ad-9142-47cb-943c-4c2c231483c1.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/4_5e37c9ad-9142-47cb-943c-4c2c231483c1.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/4_5e37c9ad-9142-47cb-943c-4c2c231483c1.zip
new file mode 100644
index 0000000000000..a774e386fa817
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/4_5e37c9ad-9142-47cb-943c-4c2c231483c1.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/5_2fef25a0-611c-4bde-be77-84e6b7261698.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/5_2fef25a0-611c-4bde-be77-84e6b7261698.changelog
new file mode 100644
index 0000000000000..7dd3066349749
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/5_2fef25a0-611c-4bde-be77-84e6b7261698.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/SSTs/.000008-90ff0b41-2ae4-407b-8c24-8c72b4b590f4.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/SSTs/.000008-90ff0b41-2ae4-407b-8c24-8c72b4b590f4.sst.crc
new file mode 100644
index 0000000000000..dfdfd5677bd18
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/SSTs/.000008-90ff0b41-2ae4-407b-8c24-8c72b4b590f4.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/SSTs/.000009-a9f7cde7-b941-4e5a-9f23-63d809f23377.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/SSTs/.000009-a9f7cde7-b941-4e5a-9f23-63d809f23377.sst.crc
new file mode 100644
index 0000000000000..720f0e6876f97
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/SSTs/.000009-a9f7cde7-b941-4e5a-9f23-63d809f23377.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/SSTs/000008-90ff0b41-2ae4-407b-8c24-8c72b4b590f4.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/SSTs/000008-90ff0b41-2ae4-407b-8c24-8c72b4b590f4.sst
new file mode 100644
index 0000000000000..a44d2e1f064ca
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/SSTs/000008-90ff0b41-2ae4-407b-8c24-8c72b4b590f4.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/SSTs/000009-a9f7cde7-b941-4e5a-9f23-63d809f23377.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/SSTs/000009-a9f7cde7-b941-4e5a-9f23-63d809f23377.sst
new file mode 100644
index 0000000000000..38b19a3266fbb
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/left-keyWithIndexToValue/SSTs/000009-a9f7cde7-b941-4e5a-9f23-63d809f23377.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.1_6f4596d1-cd7b-4881-8c8d-862d6db13b4e.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.1_6f4596d1-cd7b-4881-8c8d-862d6db13b4e.changelog.crc
new file mode 100644
index 0000000000000..1b44d43130d13
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.1_6f4596d1-cd7b-4881-8c8d-862d6db13b4e.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.2_09a46dfc-b60b-4888-b0d5-403df472a9bd.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.2_09a46dfc-b60b-4888-b0d5-403df472a9bd.changelog.crc
new file mode 100644
index 0000000000000..92b3fa2b42a74
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.2_09a46dfc-b60b-4888-b0d5-403df472a9bd.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.2_09a46dfc-b60b-4888-b0d5-403df472a9bd.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.2_09a46dfc-b60b-4888-b0d5-403df472a9bd.zip.crc
new file mode 100644
index 0000000000000..68d5e1617fd02
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.2_09a46dfc-b60b-4888-b0d5-403df472a9bd.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.3_978ed7db-3984-4e58-9042-5bdd7f0ede44.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.3_978ed7db-3984-4e58-9042-5bdd7f0ede44.changelog.crc
new file mode 100644
index 0000000000000..e56acde98d923
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.3_978ed7db-3984-4e58-9042-5bdd7f0ede44.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.4_de24c722-fc71-4201-83da-6b55390fe898.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.4_de24c722-fc71-4201-83da-6b55390fe898.changelog.crc
new file mode 100644
index 0000000000000..4a893aa74c843
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.4_de24c722-fc71-4201-83da-6b55390fe898.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.4_de24c722-fc71-4201-83da-6b55390fe898.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.4_de24c722-fc71-4201-83da-6b55390fe898.zip.crc
new file mode 100644
index 0000000000000..dd1987ae16a87
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.4_de24c722-fc71-4201-83da-6b55390fe898.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.5_c4e584d8-814e-48ea-a413-13542733d8b7.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.5_c4e584d8-814e-48ea-a413-13542733d8b7.changelog.crc
new file mode 100644
index 0000000000000..3aa228de63aa3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/.5_c4e584d8-814e-48ea-a413-13542733d8b7.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/1_6f4596d1-cd7b-4881-8c8d-862d6db13b4e.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/1_6f4596d1-cd7b-4881-8c8d-862d6db13b4e.changelog
new file mode 100644
index 0000000000000..f1403c9e68632
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/1_6f4596d1-cd7b-4881-8c8d-862d6db13b4e.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/2_09a46dfc-b60b-4888-b0d5-403df472a9bd.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/2_09a46dfc-b60b-4888-b0d5-403df472a9bd.changelog
new file mode 100644
index 0000000000000..4f3c91588e627
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/2_09a46dfc-b60b-4888-b0d5-403df472a9bd.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/2_09a46dfc-b60b-4888-b0d5-403df472a9bd.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/2_09a46dfc-b60b-4888-b0d5-403df472a9bd.zip
new file mode 100644
index 0000000000000..d0faf597f0960
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/2_09a46dfc-b60b-4888-b0d5-403df472a9bd.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/3_978ed7db-3984-4e58-9042-5bdd7f0ede44.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/3_978ed7db-3984-4e58-9042-5bdd7f0ede44.changelog
new file mode 100644
index 0000000000000..96aee08824e40
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/3_978ed7db-3984-4e58-9042-5bdd7f0ede44.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/4_de24c722-fc71-4201-83da-6b55390fe898.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/4_de24c722-fc71-4201-83da-6b55390fe898.changelog
new file mode 100644
index 0000000000000..c4241d868d735
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/4_de24c722-fc71-4201-83da-6b55390fe898.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/4_de24c722-fc71-4201-83da-6b55390fe898.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/4_de24c722-fc71-4201-83da-6b55390fe898.zip
new file mode 100644
index 0000000000000..db8dbf60d081e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/4_de24c722-fc71-4201-83da-6b55390fe898.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/5_c4e584d8-814e-48ea-a413-13542733d8b7.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/5_c4e584d8-814e-48ea-a413-13542733d8b7.changelog
new file mode 100644
index 0000000000000..82380b0163d50
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/5_c4e584d8-814e-48ea-a413-13542733d8b7.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/SSTs/.000008-aae7e696-4af6-43e6-b5ca-59c18d6532c6.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/SSTs/.000008-aae7e696-4af6-43e6-b5ca-59c18d6532c6.sst.crc
new file mode 100644
index 0000000000000..4ff99f4adc971
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/SSTs/.000008-aae7e696-4af6-43e6-b5ca-59c18d6532c6.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/SSTs/.000009-111105a8-7ccb-4fa9-8a45-2aedaedb5953.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/SSTs/.000009-111105a8-7ccb-4fa9-8a45-2aedaedb5953.sst.crc
new file mode 100644
index 0000000000000..5586b90b71182
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/SSTs/.000009-111105a8-7ccb-4fa9-8a45-2aedaedb5953.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/SSTs/000008-aae7e696-4af6-43e6-b5ca-59c18d6532c6.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/SSTs/000008-aae7e696-4af6-43e6-b5ca-59c18d6532c6.sst
new file mode 100644
index 0000000000000..ba0ee6d9cb829
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/SSTs/000008-aae7e696-4af6-43e6-b5ca-59c18d6532c6.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/SSTs/000009-111105a8-7ccb-4fa9-8a45-2aedaedb5953.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/SSTs/000009-111105a8-7ccb-4fa9-8a45-2aedaedb5953.sst
new file mode 100644
index 0000000000000..980e3320865c0
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyToNumValues/SSTs/000009-111105a8-7ccb-4fa9-8a45-2aedaedb5953.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.1_bea10842-b3de-4eed-8cbb-483ce10864f7.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.1_bea10842-b3de-4eed-8cbb-483ce10864f7.changelog.crc
new file mode 100644
index 0000000000000..8c3bb07e10daf
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.1_bea10842-b3de-4eed-8cbb-483ce10864f7.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.2_17d9f074-f585-4dc6-9496-601853ae6537.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.2_17d9f074-f585-4dc6-9496-601853ae6537.changelog.crc
new file mode 100644
index 0000000000000..8c5e39fa40dbf
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.2_17d9f074-f585-4dc6-9496-601853ae6537.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.2_17d9f074-f585-4dc6-9496-601853ae6537.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.2_17d9f074-f585-4dc6-9496-601853ae6537.zip.crc
new file mode 100644
index 0000000000000..67f2d7427bb2d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.2_17d9f074-f585-4dc6-9496-601853ae6537.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.3_041cb4db-b9ab-4a99-b7b1-a114cd7544ad.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.3_041cb4db-b9ab-4a99-b7b1-a114cd7544ad.changelog.crc
new file mode 100644
index 0000000000000..88b40fb88db49
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.3_041cb4db-b9ab-4a99-b7b1-a114cd7544ad.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.4_ad8df34d-c475-47d6-ad60-3c22b00bcbb2.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.4_ad8df34d-c475-47d6-ad60-3c22b00bcbb2.changelog.crc
new file mode 100644
index 0000000000000..ed78a6d258419
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.4_ad8df34d-c475-47d6-ad60-3c22b00bcbb2.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.4_ad8df34d-c475-47d6-ad60-3c22b00bcbb2.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.4_ad8df34d-c475-47d6-ad60-3c22b00bcbb2.zip.crc
new file mode 100644
index 0000000000000..70779d2eae320
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.4_ad8df34d-c475-47d6-ad60-3c22b00bcbb2.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.5_24c41882-0aef-4e18-a83c-dfaac502c893.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.5_24c41882-0aef-4e18-a83c-dfaac502c893.changelog.crc
new file mode 100644
index 0000000000000..231793c626e03
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/.5_24c41882-0aef-4e18-a83c-dfaac502c893.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/1_bea10842-b3de-4eed-8cbb-483ce10864f7.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/1_bea10842-b3de-4eed-8cbb-483ce10864f7.changelog
new file mode 100644
index 0000000000000..dc642c1455d11
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/1_bea10842-b3de-4eed-8cbb-483ce10864f7.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/2_17d9f074-f585-4dc6-9496-601853ae6537.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/2_17d9f074-f585-4dc6-9496-601853ae6537.changelog
new file mode 100644
index 0000000000000..bcf49ec1d71b6
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/2_17d9f074-f585-4dc6-9496-601853ae6537.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/2_17d9f074-f585-4dc6-9496-601853ae6537.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/2_17d9f074-f585-4dc6-9496-601853ae6537.zip
new file mode 100644
index 0000000000000..5c69b47b3464c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/2_17d9f074-f585-4dc6-9496-601853ae6537.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/3_041cb4db-b9ab-4a99-b7b1-a114cd7544ad.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/3_041cb4db-b9ab-4a99-b7b1-a114cd7544ad.changelog
new file mode 100644
index 0000000000000..8e7583f2006a7
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/3_041cb4db-b9ab-4a99-b7b1-a114cd7544ad.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/4_ad8df34d-c475-47d6-ad60-3c22b00bcbb2.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/4_ad8df34d-c475-47d6-ad60-3c22b00bcbb2.changelog
new file mode 100644
index 0000000000000..d02d8b27c2ac3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/4_ad8df34d-c475-47d6-ad60-3c22b00bcbb2.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/4_ad8df34d-c475-47d6-ad60-3c22b00bcbb2.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/4_ad8df34d-c475-47d6-ad60-3c22b00bcbb2.zip
new file mode 100644
index 0000000000000..75274a6e8f97c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/4_ad8df34d-c475-47d6-ad60-3c22b00bcbb2.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/5_24c41882-0aef-4e18-a83c-dfaac502c893.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/5_24c41882-0aef-4e18-a83c-dfaac502c893.changelog
new file mode 100644
index 0000000000000..240ae1e3e4d95
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/5_24c41882-0aef-4e18-a83c-dfaac502c893.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/SSTs/.000008-fc81fc2d-9d9e-495e-ae26-141b4dadf556.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/SSTs/.000008-fc81fc2d-9d9e-495e-ae26-141b4dadf556.sst.crc
new file mode 100644
index 0000000000000..22e2682ccbda3
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/SSTs/.000008-fc81fc2d-9d9e-495e-ae26-141b4dadf556.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/SSTs/.000009-68b31719-b7dd-4d86-95e1-5000960e0e5a.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/SSTs/.000009-68b31719-b7dd-4d86-95e1-5000960e0e5a.sst.crc
new file mode 100644
index 0000000000000..904646841729d
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/SSTs/.000009-68b31719-b7dd-4d86-95e1-5000960e0e5a.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/SSTs/000008-fc81fc2d-9d9e-495e-ae26-141b4dadf556.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/SSTs/000008-fc81fc2d-9d9e-495e-ae26-141b4dadf556.sst
new file mode 100644
index 0000000000000..975645945ce84
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/SSTs/000008-fc81fc2d-9d9e-495e-ae26-141b4dadf556.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/SSTs/000009-68b31719-b7dd-4d86-95e1-5000960e0e5a.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/SSTs/000009-68b31719-b7dd-4d86-95e1-5000960e0e5a.sst
new file mode 100644
index 0000000000000..9a5c983dd122e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/4/right-keyWithIndexToValue/SSTs/000009-68b31719-b7dd-4d86-95e1-5000960e0e5a.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/_metadata/.metadata.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/_metadata/.metadata.crc
new file mode 100644
index 0000000000000..708273c1fed03
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/_metadata/.metadata.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/_metadata/metadata b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/_metadata/metadata
new file mode 100644
index 0000000000000..b73f1e3e66ac5
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/join2/state/0/_metadata/metadata
@@ -0,0 +1,2 @@
+v1
+{"operatorInfo":{"operatorId":0,"operatorName":"symmetricHashJoin"},"stateStoreInfo":[{"storeName":"left-keyToNumValues","numColsPrefixKey":0,"numPartitions":5},{"storeName":"left-keyWithIndexToValue","numColsPrefixKey":0,"numPartitions":5},{"storeName":"right-keyToNumValues","numColsPrefixKey":0,"numPartitions":5},{"storeName":"right-keyWithIndexToValue","numColsPrefixKey":0,"numPartitions":5}]}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/.metadata.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/.metadata.crc
new file mode 100644
index 0000000000000..09f4282369505
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/.metadata.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/.0.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/.0.crc
new file mode 100644
index 0000000000000..9a97caa6db348
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/.0.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/.1.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/.1.crc
new file mode 100644
index 0000000000000..aba67203d4fba
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/.1.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/.2.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/.2.crc
new file mode 100644
index 0000000000000..308c44917d24c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/.2.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/.3.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/.3.crc
new file mode 100644
index 0000000000000..dc2816ce834c6
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/.3.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/0 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/0
new file mode 100644
index 0000000000000..e578217b61f62
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/0
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":0,"stateUniqueIds":{"0":[["509acca3-4c04-47f8-b6f8-80294d4113ce"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/1 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/1
new file mode 100644
index 0000000000000..8ca5a96e7460b
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/1
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":0,"stateUniqueIds":{"0":[["33a64dcb-1866-4b88-8786-4c7cebb5c7aa"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/2 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/2
new file mode 100644
index 0000000000000..fcb694c37a560
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/2
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":0,"stateUniqueIds":{"0":[["405bdb41-2510-48a7-afae-ae16460cdf4a"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/3 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/3
new file mode 100644
index 0000000000000..0c2fc7f3ea372
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/commits/3
@@ -0,0 +1,2 @@
+v2
+{"nextBatchWatermarkMs":0,"stateUniqueIds":{"0":[["3425a443-3db7-4f79-bbe0-0aa785c103c7"]]}}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/metadata b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/metadata
new file mode 100644
index 0000000000000..b463219aa8ea5
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/metadata
@@ -0,0 +1 @@
+{"id":"5abf3d49-f6b3-434b-b30f-88e60b91f1b0"}
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/.0.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/.0.crc
new file mode 100644
index 0000000000000..207d671ed180f
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/.0.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/.1.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/.1.crc
new file mode 100644
index 0000000000000..f6f23d0e3ef9c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/.1.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/.2.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/.2.crc
new file mode 100644
index 0000000000000..22002d2ba409a
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/.2.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/.3.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/.3.crc
new file mode 100644
index 0000000000000..569241980afe5
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/.3.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/0 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/0
new file mode 100644
index 0000000000000..ca751d0efa93e
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/0
@@ -0,0 +1,3 @@
+v1
+{"batchWatermarkMs":0,"batchTimestampMs":1757004827171,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"3","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+0
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/1 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/1
new file mode 100644
index 0000000000000..4932664f71d55
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/1
@@ -0,0 +1,3 @@
+v1
+{"batchWatermarkMs":0,"batchTimestampMs":1757004831149,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"3","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+1
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/2 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/2
new file mode 100644
index 0000000000000..96e49ec6c5d71
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/2
@@ -0,0 +1,3 @@
+v1
+{"batchWatermarkMs":0,"batchTimestampMs":1757004833480,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"3","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+2
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/3 b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/3
new file mode 100644
index 0000000000000..ecd5448a132e6
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/offsets/3
@@ -0,0 +1,3 @@
+v1
+{"batchWatermarkMs":0,"batchTimestampMs":1757004835757,"conf":{"spark.sql.streaming.stateStore.providerClass":"org.apache.spark.sql.execution.streaming.state.RocksDBStateStoreProvider","spark.sql.streaming.stateStore.rocksdb.formatVersion":"5","spark.sql.streaming.stateStore.encodingFormat":"unsaferow","spark.sql.streaming.statefulOperator.useStrictDistribution":"true","spark.sql.streaming.flatMapGroupsWithState.stateFormatVersion":"2","spark.sql.streaming.multipleWatermarkPolicy":"min","spark.sql.streaming.aggregation.stateFormatVersion":"2","spark.sql.shuffle.partitions":"5","spark.sql.streaming.join.stateFormatVersion":"3","spark.sql.streaming.stateStore.compression.codec":"lz4","spark.sql.optimizer.pruneFiltersCanPruneStreamingSubplan":"false"}}
+3
\ No newline at end of file
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.1_509acca3-4c04-47f8-b6f8-80294d4113ce.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.1_509acca3-4c04-47f8-b6f8-80294d4113ce.changelog.crc
new file mode 100644
index 0000000000000..be24d06a7fee2
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.1_509acca3-4c04-47f8-b6f8-80294d4113ce.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.2_33a64dcb-1866-4b88-8786-4c7cebb5c7aa.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.2_33a64dcb-1866-4b88-8786-4c7cebb5c7aa.changelog.crc
new file mode 100644
index 0000000000000..062d452f5afdf
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.2_33a64dcb-1866-4b88-8786-4c7cebb5c7aa.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.2_33a64dcb-1866-4b88-8786-4c7cebb5c7aa.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.2_33a64dcb-1866-4b88-8786-4c7cebb5c7aa.zip.crc
new file mode 100644
index 0000000000000..45a8014b2dda9
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.2_33a64dcb-1866-4b88-8786-4c7cebb5c7aa.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.3_405bdb41-2510-48a7-afae-ae16460cdf4a.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.3_405bdb41-2510-48a7-afae-ae16460cdf4a.changelog.crc
new file mode 100644
index 0000000000000..772a965d543d4
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.3_405bdb41-2510-48a7-afae-ae16460cdf4a.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.4_3425a443-3db7-4f79-bbe0-0aa785c103c7.changelog.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.4_3425a443-3db7-4f79-bbe0-0aa785c103c7.changelog.crc
new file mode 100644
index 0000000000000..4e66d5bcc6077
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.4_3425a443-3db7-4f79-bbe0-0aa785c103c7.changelog.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.4_3425a443-3db7-4f79-bbe0-0aa785c103c7.zip.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.4_3425a443-3db7-4f79-bbe0-0aa785c103c7.zip.crc
new file mode 100644
index 0000000000000..2a878e3b775da
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/.4_3425a443-3db7-4f79-bbe0-0aa785c103c7.zip.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/1_509acca3-4c04-47f8-b6f8-80294d4113ce.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/1_509acca3-4c04-47f8-b6f8-80294d4113ce.changelog
new file mode 100644
index 0000000000000..221fa52a98360
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/1_509acca3-4c04-47f8-b6f8-80294d4113ce.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/2_33a64dcb-1866-4b88-8786-4c7cebb5c7aa.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/2_33a64dcb-1866-4b88-8786-4c7cebb5c7aa.changelog
new file mode 100644
index 0000000000000..4855ac9b36015
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/2_33a64dcb-1866-4b88-8786-4c7cebb5c7aa.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/2_33a64dcb-1866-4b88-8786-4c7cebb5c7aa.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/2_33a64dcb-1866-4b88-8786-4c7cebb5c7aa.zip
new file mode 100644
index 0000000000000..cb01f4039343c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/2_33a64dcb-1866-4b88-8786-4c7cebb5c7aa.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/3_405bdb41-2510-48a7-afae-ae16460cdf4a.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/3_405bdb41-2510-48a7-afae-ae16460cdf4a.changelog
new file mode 100644
index 0000000000000..a017fbf0beb71
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/3_405bdb41-2510-48a7-afae-ae16460cdf4a.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/4_3425a443-3db7-4f79-bbe0-0aa785c103c7.changelog b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/4_3425a443-3db7-4f79-bbe0-0aa785c103c7.changelog
new file mode 100644
index 0000000000000..01e1cbaf26a8c
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/4_3425a443-3db7-4f79-bbe0-0aa785c103c7.changelog differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/4_3425a443-3db7-4f79-bbe0-0aa785c103c7.zip b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/4_3425a443-3db7-4f79-bbe0-0aa785c103c7.zip
new file mode 100644
index 0000000000000..a5a73be9fa68e
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/4_3425a443-3db7-4f79-bbe0-0aa785c103c7.zip differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/SSTs/.000008-a09c535f-c77b-4499-82e8-c0f6cddad2e2.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/SSTs/.000008-a09c535f-c77b-4499-82e8-c0f6cddad2e2.sst.crc
new file mode 100644
index 0000000000000..ecd4723eba6cc
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/SSTs/.000008-a09c535f-c77b-4499-82e8-c0f6cddad2e2.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/SSTs/.000009-92c5d471-6c9f-4f2e-a86c-8b694be7eb8a.sst.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/SSTs/.000009-92c5d471-6c9f-4f2e-a86c-8b694be7eb8a.sst.crc
new file mode 100644
index 0000000000000..6b448c82ecf91
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/SSTs/.000009-92c5d471-6c9f-4f2e-a86c-8b694be7eb8a.sst.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/SSTs/000008-a09c535f-c77b-4499-82e8-c0f6cddad2e2.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/SSTs/000008-a09c535f-c77b-4499-82e8-c0f6cddad2e2.sst
new file mode 100644
index 0000000000000..50cc29320655b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/SSTs/000008-a09c535f-c77b-4499-82e8-c0f6cddad2e2.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/SSTs/000009-92c5d471-6c9f-4f2e-a86c-8b694be7eb8a.sst b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/SSTs/000009-92c5d471-6c9f-4f2e-a86c-8b694be7eb8a.sst
new file mode 100644
index 0000000000000..f5af711977373
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/SSTs/000009-92c5d471-6c9f-4f2e-a86c-8b694be7eb8a.sst differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/_metadata/.schema.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/_metadata/.schema.crc
new file mode 100644
index 0000000000000..4914a0c3e4b79
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/_metadata/.schema.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/_metadata/schema b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/_metadata/schema
new file mode 100644
index 0000000000000..371b0df09d80b
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/0/_metadata/schema differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/_metadata/.metadata.crc b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/_metadata/.metadata.crc
new file mode 100644
index 0000000000000..c1295e9a3a347
Binary files /dev/null and b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/_metadata/.metadata.crc differ
diff --git a/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/_metadata/metadata b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/_metadata/metadata
new file mode 100644
index 0000000000000..5792421dd423e
--- /dev/null
+++ b/sql/core/src/test/resources/structured-streaming/checkpoint-version-4.0.0-checkpoint-v2/rocksdb/limit/state/0/_metadata/metadata
@@ -0,0 +1,2 @@
+v1
+{"operatorInfo":{"operatorId":0,"operatorName":"globalLimit"},"stateStoreInfo":[{"storeName":"default","numColsPrefixKey":0,"numPartitions":5}]}
\ No newline at end of file
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/v2/state/StateDataSourceReadSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/v2/state/StateDataSourceReadSuite.scala
index 59c67973a3280..526d39478b915 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/v2/state/StateDataSourceReadSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/v2/state/StateDataSourceReadSuite.scala
@@ -527,9 +527,6 @@ class RocksDBStateDataSourceReadSuite extends StateDataSourceReadSuite {
 
 class RocksDBWithChangelogCheckpointStateDataSourceReaderSuite extends
 StateDataSourceReadSuite {
-
-  import testImplicits._
-
   override protected def newStateStoreProvider(): RocksDBStateStoreProvider =
     new RocksDBStateStoreProvider
 
@@ -579,41 +576,7 @@ StateDataSourceReadSuite {
    * the getResource model used in other similar tests on runbot.
    */
   test("snapshotStartBatchId on join state v3") {
-    withTempDir { tmpDir =>
-      withSQLConf(
-        SQLConf.STREAMING_JOIN_STATE_FORMAT_VERSION.key -> "3",
-        SQLConf.STREAMING_MAINTENANCE_INTERVAL.key -> "100"
-      ) {
-        val inputData = MemoryStream[(Int, Long)]
-        val query = getStreamStreamJoinQuery(inputData)
-        testStream(query)(
-          StartStream(checkpointLocation = tmpDir.getCanonicalPath),
-          AddData(inputData, (1, 1L), (2, 2L), (3, 3L), (4, 4L), (5, 5L)),
-          ProcessAllAvailable(),
-          Execute { _ => Thread.sleep(2000) },
-          AddData(inputData, (6, 6L), (7, 7L), (8, 8L), (9, 9L), (10, 10L)),
-          ProcessAllAvailable(),
-          Execute { _ => Thread.sleep(2000) },
-          AddData(inputData, (11, 11L), (12, 12L), (13, 13L), (14, 14L), (15, 15L)),
-          ProcessAllAvailable(),
-          Execute { _ => Thread.sleep(5000) },
-          StopStream
-        )
-
-        val stateSnapshotDf = spark.read.format("statestore")
-          .option("snapshotPartitionId", 2)
-          .option("snapshotStartBatchId", 0)
-          .option("joinSide", "left")
-          .load(tmpDir.getCanonicalPath)
-
-        val stateDf = spark.read.format("statestore")
-          .option("joinSide", "left")
-          .load(tmpDir.getCanonicalPath)
-          .filter(col("partition_id") === 2)
-
-        checkAnswer(stateSnapshotDf, stateDf)
-      }
-    }
+    testSnapshotOnJoinStateV3()
   }
 }
 
@@ -663,34 +626,56 @@ class RocksDBWithCheckpointV2StateDataSourceReaderSuite extends StateDataSourceR
       }
     }
   }
+}
 
-  test("check unsupported modes with checkpoint v2") {
-    withTempDir { tmpDir =>
-      val inputData = MemoryStream[(Int, Long)]
-      val query = getStreamStreamJoinQuery(inputData)
-      testStream(query)(
-        StartStream(checkpointLocation = tmpDir.getCanonicalPath),
-        AddData(inputData, (1, 1L), (2, 2L), (3, 3L), (4, 4L), (5, 5L)),
-        ProcessAllAvailable(),
-        Execute { _ => Thread.sleep(2000) },
-        StopStream
-      )
+class RocksDBWithCheckpointV2StateDataSourceReaderSnapshotSuite extends StateDataSourceReadSuite {
+  override protected def newStateStoreProvider(): RocksDBStateStoreProvider =
+    new RocksDBStateStoreProvider
 
-      // Verify reading snapshot throws error with checkpoint v2
-      val exc1 = intercept[StateDataSourceInvalidOptionValue] {
-        val stateSnapshotDf = spark.read.format("statestore")
-          .option("snapshotPartitionId", 2)
-          .option("snapshotStartBatchId", 0)
-          .option("joinSide", "left")
-          .load(tmpDir.getCanonicalPath)
-        stateSnapshotDf.collect()
-      }
+  override def beforeAll(): Unit = {
+    super.beforeAll()
+    spark.conf.set(SQLConf.STATE_STORE_CHECKPOINT_FORMAT_VERSION, 2)
+    spark.conf.set(SQLConf.STATE_STORE_PROVIDER_CLASS.key,
+      newStateStoreProvider().getClass.getName)
+    spark.conf.set("spark.sql.streaming.stateStore.rocksdb.changelogCheckpointing.enabled",
+      "true")
+    // make sure we have a snapshot for every two delta files
+    // HDFS maintenance task will not count the latest delta file, which has the same version
+    // as the snapshot version
+    spark.conf.set(SQLConf.STATE_STORE_MIN_DELTAS_FOR_SNAPSHOT.key, 2)
+  }
 
-      checkError(exc1, "STDS_INVALID_OPTION_VALUE.WITH_MESSAGE", "42616",
-        Map(
-          "optionName" -> StateSourceOptions.SNAPSHOT_START_BATCH_ID,
-          "message" -> "Snapshot reading is currently not supported with checkpoint v2."))
-    }
+  test("ERROR: snapshot of version not found") {
+    testSnapshotNotFound()
+  }
+
+  test("provider.getReadStore(snapshotVersion, endVersion)") {
+    testGetReadStoreWithStartVersion()
+  }
+
+  test("option snapshotPartitionId") {
+    testSnapshotPartitionId()
+  }
+
+  test("snapshotStartBatchId on limit state") {
+    testSnapshotOnLimitState("rocksdb", checkpointFormatVersion = 2)
+  }
+
+  test("snapshotStartBatchId on aggregation state") {
+    testSnapshotOnAggregateState("rocksdb", checkpointFormatVersion = 2)
+  }
+
+  test("snapshotStartBatchId on deduplication state") {
+    testSnapshotOnDeduplicateState("rocksdb", checkpointFormatVersion = 2)
+  }
+
+  test("snapshotStartBatchId on join state") {
+    testSnapshotOnJoinState("rocksdb", 1, checkpointFormatVersion = 2)
+    testSnapshotOnJoinState("rocksdb", 2, checkpointFormatVersion = 2)
+  }
+
+  test("snapshotStartBatchId on join state v3") {
+    testSnapshotOnJoinStateV3()
   }
 }
 
@@ -1228,17 +1213,23 @@ abstract class StateDataSourceReadSuite extends StateDataSourceTestBase with Ass
 
   protected def testGetReadStoreWithStartVersion(): Unit = {
     withTempDir { tempDir =>
+      val versionToCkptId = scala.collection.mutable.Map[Long, Option[String]]()
       val provider = getNewStateStoreProvider(tempDir.getAbsolutePath)
       for (i <- 1 to 4) {
-        val store = provider.getStore(i - 1)
+        val store = provider.getStore(i - 1, versionToCkptId.getOrElse(i - 1, None))
         put(store, "a", i, i)
         store.commit()
+
+        val ssInfo = store.getStateStoreCheckpointInfo()
+        versionToCkptId(ssInfo.batchVersion) = ssInfo.stateStoreCkptId
+
         provider.doMaintenance()
       }
 
       val result =
         provider.asInstanceOf[SupportsFineGrainedReplay]
-          .replayReadStateFromSnapshot(2, 3)
+          .replayReadStateFromSnapshot(2, 3,
+            versionToCkptId.getOrElse(2, None), versionToCkptId.getOrElse(3, None))
 
       assert(get(result, "a", 1).get == 1)
       assert(get(result, "a", 2).get == 2)
@@ -1298,10 +1289,13 @@ abstract class StateDataSourceReadSuite extends StateDataSourceTestBase with Ass
     checkAnswer(stateSnapshotDf, stateDf)
   }
 
-  protected def testSnapshotOnLimitState(providerName: String): Unit = {
+  protected def testSnapshotOnLimitState(
+      providerName: String,
+      checkpointFormatVersion: Int = 1): Unit = {
     /** The golden files are generated by:
       withSQLConf({
         SQLConf.STREAMING_MAINTENANCE_INTERVAL.key -> "100"
+        SQLConf.STATE_STORE_CHECKPOINT_FORMAT_VERSION.key -> checkpointFormatVersion.toString
       }) {
         val inputData = MemoryStream[(Int, Long)]
         val query = inputData.toDF().limit(10)
@@ -1322,17 +1316,27 @@ abstract class StateDataSourceReadSuite extends StateDataSourceTestBase with Ass
         )
       }
      */
+
+    val versionSuffix = if (checkpointFormatVersion == 2) {
+      "-checkpoint-v2"
+    } else {
+      ""
+    }
+
     val resourceUri = this.getClass.getResource(
-      s"/structured-streaming/checkpoint-version-4.0.0/$providerName/limit/"
+      s"/structured-streaming/checkpoint-version-4.0.0$versionSuffix/$providerName/limit/"
     ).toURI
 
     testSnapshotStateDfAgainstStateDf(new File(resourceUri))
   }
 
-  protected def testSnapshotOnAggregateState(providerName: String): Unit = {
+  protected def testSnapshotOnAggregateState(
+      providerName: String,
+      checkpointFormatVersion: Int = 1): Unit = {
     /** The golden files are generated by:
       withSQLConf({
         SQLConf.STREAMING_MAINTENANCE_INTERVAL.key -> "100"
+        SQLConf.STATE_STORE_CHECKPOINT_FORMAT_VERSION.key -> checkpointFormatVersion.toString
       }) {
         val inputData = MemoryStream[(Int, Long)]
         val query = inputData.toDF().groupBy("_1").count()
@@ -1353,17 +1357,26 @@ abstract class StateDataSourceReadSuite extends StateDataSourceTestBase with Ass
         )
       }
      */
+    val versionSuffix = if (checkpointFormatVersion == 2) {
+      "-checkpoint-v2"
+    } else {
+      ""
+    }
+
     val resourceUri = this.getClass.getResource(
-      s"/structured-streaming/checkpoint-version-4.0.0/$providerName/dedup/"
+      s"/structured-streaming/checkpoint-version-4.0.0$versionSuffix/$providerName/dedup/"
     ).toURI
 
     testSnapshotStateDfAgainstStateDf(new File(resourceUri))
   }
 
-  protected def testSnapshotOnDeduplicateState(providerName: String): Unit = {
+  protected def testSnapshotOnDeduplicateState(
+      providerName: String,
+      checkpointFormatVersion: Int = 1): Unit = {
     /** The golden files are generated by:
       withSQLConf({
         SQLConf.STREAMING_MAINTENANCE_INTERVAL.key -> "100"
+        SQLConf.STATE_STORE_CHECKPOINT_FORMAT_VERSION.key -> checkpointFormatVersion.toString
       }) {
         val inputData = MemoryStream[(Int, Long)]
         val query = inputData.toDF().dropDuplicates("_1")
@@ -1384,18 +1397,28 @@ abstract class StateDataSourceReadSuite extends StateDataSourceTestBase with Ass
         )
       }
      */
+    val versionSuffix = if (checkpointFormatVersion == 2) {
+      "-checkpoint-v2"
+    } else {
+      ""
+    }
+
     val resourceUri = this.getClass.getResource(
-      s"/structured-streaming/checkpoint-version-4.0.0/$providerName/dedup/"
+      s"/structured-streaming/checkpoint-version-4.0.0$versionSuffix/$providerName/dedup/"
     ).toURI
 
     testSnapshotStateDfAgainstStateDf(new File(resourceUri))
   }
 
-  protected def testSnapshotOnJoinState(providerName: String, stateVersion: Int): Unit = {
+  protected def testSnapshotOnJoinState(
+      providerName: String,
+      stateVersion: Int,
+      checkpointFormatVersion: Int = 1): Unit = {
     /** The golden files are generated by:
       withSQLConf({
         SQLConf.STREAMING_JOIN_STATE_FORMAT_VERSION.key -> stateVersion.toString
         SQLConf.STREAMING_MAINTENANCE_INTERVAL.key -> "100"
+        SQLConf.STATE_STORE_CHECKPOINT_FORMAT_VERSION.key -> checkpointFormatVersion.toString
       }) {
         val inputData = MemoryStream[(Int, Long)]
         val query = getStreamStreamJoinQuery(inputData)
@@ -1413,8 +1436,15 @@ abstract class StateDataSourceReadSuite extends StateDataSourceTestBase with Ass
         )
       }
      */
+    val versionSuffix = if (checkpointFormatVersion == 2) {
+      "-checkpoint-v2"
+    } else {
+      ""
+    }
+
     val resourceUri = this.getClass.getResource(
-      s"/structured-streaming/checkpoint-version-4.0.0/$providerName/join$stateVersion/"
+      s"/structured-streaming/checkpoint-version-4.0.0$versionSuffix/" +
+        s"$providerName/join$stateVersion/"
     ).toURI
 
     val resourceDir = new File(resourceUri)
@@ -1432,4 +1462,42 @@ abstract class StateDataSourceReadSuite extends StateDataSourceTestBase with Ass
 
     checkAnswer(stateSnapshotDf, stateDf)
   }
+
+  protected def testSnapshotOnJoinStateV3(): Unit = {
+    withTempDir { tmpDir =>
+      withSQLConf(
+        SQLConf.STREAMING_JOIN_STATE_FORMAT_VERSION.key -> "3",
+        SQLConf.STREAMING_MAINTENANCE_INTERVAL.key -> "100"
+      ) {
+        val inputData = MemoryStream[(Int, Long)]
+        val query = getStreamStreamJoinQuery(inputData)
+        testStream(query)(
+          StartStream(checkpointLocation = tmpDir.getCanonicalPath),
+          AddData(inputData, (1, 1L), (2, 2L), (3, 3L), (4, 4L), (5, 5L)),
+          ProcessAllAvailable(),
+          Execute { _ => Thread.sleep(2000) },
+          AddData(inputData, (6, 6L), (7, 7L), (8, 8L), (9, 9L), (10, 10L)),
+          ProcessAllAvailable(),
+          Execute { _ => Thread.sleep(2000) },
+          AddData(inputData, (11, 11L), (12, 12L), (13, 13L), (14, 14L), (15, 15L)),
+          ProcessAllAvailable(),
+          Execute { _ => Thread.sleep(5000) },
+          StopStream
+        )
+
+        val stateSnapshotDf = spark.read.format("statestore")
+          .option("snapshotPartitionId", 2)
+          .option("snapshotStartBatchId", 0)
+          .option("joinSide", "left")
+          .load(tmpDir.getCanonicalPath)
+
+        val stateDf = spark.read.format("statestore")
+          .option("joinSide", "left")
+          .load(tmpDir.getCanonicalPath)
+          .filter(col("partition_id") === 2)
+
+        checkAnswer(stateSnapshotDf, stateDf)
+      }
+    }
+  }
 }
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/v2/state/StateDataSourceTransformWithStateSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/v2/state/StateDataSourceTransformWithStateSuite.scala
index 2061cf645a03b..1be5f32ebd4d8 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/v2/state/StateDataSourceTransformWithStateSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/v2/state/StateDataSourceTransformWithStateSuite.scala
@@ -23,7 +23,7 @@ import org.apache.hadoop.conf.Configuration
 
 import org.apache.spark.io.CompressionCodec
 import org.apache.spark.sql.{Encoders, Row}
-import org.apache.spark.sql.execution.streaming.runtime.MemoryStream
+import org.apache.spark.sql.execution.streaming.runtime.{MemoryStream, StreamingQueryCheckpointMetadata}
 import org.apache.spark.sql.execution.streaming.state.{AlsoTestWithEncodingTypes, AlsoTestWithRocksDBFeatures, RocksDBFileManager, RocksDBStateStoreProvider, TestClass}
 import org.apache.spark.sql.functions.{col, explode, timestamp_seconds}
 import org.apache.spark.sql.internal.SQLConf
@@ -1013,8 +1013,6 @@ class StateDataSourceTransformWithStateSuite extends StateStoreMetricsTest
    * the state data.
    */
   testWithChangelogCheckpointingEnabled("snapshotStartBatchId with transformWithState") {
-    // TODO(SPARK-53332): Remove this line once snapshotStartBatchId is supported for V2 format
-    assume(SQLConf.get.stateStoreCheckpointFormatVersion == 1)
     class AggregationStatefulProcessor extends StatefulProcessor[Int, (Int, Long), (Int, Long)] {
       @transient protected var _countState: ValueState[Long] = _
 
@@ -1079,23 +1077,44 @@ class StateDataSourceTransformWithStateSuite extends StateStoreMetricsTest
       // Read the changelog for one of the partitions at version 3 and
       // ensure that we have two entries
       // For this test - keys 9 and 12 are written at version 3 for partition 4
-      val changelogReader = fileManager.getChangelogReader(3)
+      val commitLog = new StreamingQueryCheckpointMetadata(spark, tmpDir.getCanonicalPath).commitLog
+      val commitMetadata = commitLog.get(3 - 1) // batchId = version - 1
+      val operatorId = 0
+      val operatorStateUniqueIds = if (commitMetadata.get.stateUniqueIds.isDefined) {
+        Some(commitMetadata.get.stateUniqueIds.get(operatorId))
+      } else {
+        None
+      }
+      val checkpointUniqueId = operatorStateUniqueIds.map(_(4).head)
+
+      val changelogReader = fileManager.getChangelogReader(3, checkpointUniqueId)
       val entries = changelogReader.toSeq
       assert(entries.size == 2)
       val retainEntry = entries.head
 
+      // Retain the lineage for the changelog file
+      val lineage = if (checkpointUniqueId.isDefined) {
+        Some(changelogReader.lineage)
+      } else {
+        None
+      }
+
       // Retain one of the entries and delete the changelog file
-      val changelogFilePath = dfsRootDir.getAbsolutePath + "/3.changelog"
+      val changelogFilePath = if (checkpointUniqueId.isDefined) {
+        dfsRootDir.getAbsolutePath + s"/3_${checkpointUniqueId.get}.changelog"
+      } else {
+        dfsRootDir.getAbsolutePath + "/3.changelog"
+      }
       Utils.deleteRecursively(new File(changelogFilePath))
 
       // Write the retained entry back to the changelog
-      val changelogWriter = fileManager.getChangeLogWriter(3)
+      val changelogWriter = fileManager.getChangeLogWriter(3, false, checkpointUniqueId, lineage)
       changelogWriter.put(retainEntry._2, retainEntry._3)
       changelogWriter.commit()
 
       // Ensure that we have only one entry in the changelog for version 3
       // For this test - key 9 is retained and key 12 is deleted
-      val changelogReader1 = fileManager.getChangelogReader(3)
+      val changelogReader1 = fileManager.getChangelogReader(3, checkpointUniqueId)
       val entries1 = changelogReader1.toSeq
       assert(entries1.size == 1)