From ea1d86ae202bc14239870724a6fbf152ca9a05f2 Mon Sep 17 00:00:00 2001 From: Anish Shrigondekar Date: Mon, 30 Jun 2025 22:48:27 -0700 Subject: [PATCH 1/7] [SPARK-52630][SS] Reorganize streaming operator and state mgmt code and dirs --- .../stateful/fmgws}/FlatMapGroupsWithStateExec.scala | 0 .../stateful/fmgws}/FlatMapGroupsWithStateExecHelper.scala | 0 .../stateful/join}/StreamingSymmetricHashJoinExec.scala | 0 .../stateful/join}/StreamingSymmetricHashJoinHelper.scala | 0 .../stateful/join}/SymmetricHashJoinStateManager.scala | 0 .../streaming/{ => operators/stateful}/statefulOperators.scala | 0 .../stateful/transformWithState}/TransformWithStateExec.scala | 0 .../stateful/transformWithState}/TransformWithStateExecBase.scala | 0 .../transformWithState}/TransformWithStateVariableUtils.scala | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/fmgws}/FlatMapGroupsWithStateExec.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{state => operators/stateful/fmgws}/FlatMapGroupsWithStateExecHelper.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/join}/StreamingSymmetricHashJoinExec.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/join}/StreamingSymmetricHashJoinHelper.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{state => operators/stateful/join}/SymmetricHashJoinStateManager.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful}/statefulOperators.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState}/TransformWithStateExec.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState}/TransformWithStateExecBase.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState}/TransformWithStateVariableUtils.scala (100%) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/FlatMapGroupsWithStateExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/fmgws/FlatMapGroupsWithStateExec.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/FlatMapGroupsWithStateExec.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/fmgws/FlatMapGroupsWithStateExec.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/FlatMapGroupsWithStateExecHelper.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/fmgws/FlatMapGroupsWithStateExecHelper.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/FlatMapGroupsWithStateExecHelper.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/fmgws/FlatMapGroupsWithStateExecHelper.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StreamingSymmetricHashJoinExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/join/StreamingSymmetricHashJoinExec.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StreamingSymmetricHashJoinExec.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/join/StreamingSymmetricHashJoinExec.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StreamingSymmetricHashJoinHelper.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/join/StreamingSymmetricHashJoinHelper.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StreamingSymmetricHashJoinHelper.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/join/StreamingSymmetricHashJoinHelper.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/SymmetricHashJoinStateManager.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/join/SymmetricHashJoinStateManager.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/SymmetricHashJoinStateManager.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/join/SymmetricHashJoinStateManager.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/statefulOperators.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/statefulOperators.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/statefulOperators.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/statefulOperators.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/TransformWithStateExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/TransformWithStateExec.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/TransformWithStateExec.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/TransformWithStateExec.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/TransformWithStateExecBase.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/TransformWithStateExecBase.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/TransformWithStateExecBase.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/TransformWithStateExecBase.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/TransformWithStateVariableUtils.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/TransformWithStateVariableUtils.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/TransformWithStateVariableUtils.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/TransformWithStateVariableUtils.scala From 9e436b95daf387f8b4426ecbc93a27d1abda3335 Mon Sep 17 00:00:00 2001 From: Anish Shrigondekar Date: Tue, 1 Jul 2025 16:58:07 -0700 Subject: [PATCH 2/7] Misc update --- .../stateful}/MergingSortWithSessionWindowStateIterator.scala | 0 .../{ => operators/stateful}/StatefulOperatorPartitioning.scala | 0 .../stateful}/StreamingAggregationStateManager.scala | 0 .../stateful}/StreamingSessionWindowStateManager.scala | 0 .../streaming/{ => operators/stateful/fmgws}/GroupStateImpl.scala | 0 .../transformWithState}/StateStoreColumnFamilySchemaUtils.scala | 0 .../stateful/transformWithState}/StateTypesEncoderUtils.scala | 0 .../stateful/transformWithState/stateVars}/ListStateImpl.scala | 0 .../transformWithState/stateVars}/ListStateMetricsImpl.scala | 0 .../stateful/transformWithState/stateVars}/MapStateImpl.scala | 0 .../stateful/transformWithState/stateVars}/ValueStateImpl.scala | 0 .../statefulProcessor}/StatefulProcessorHandleImpl.scala | 0 .../statefulProcessor}/StatefulProcessorHandleImplBase.scala | 0 .../transformWithState/timers}/ExpiredTimerInfoImpl.scala | 0 .../stateful/transformWithState/timers}/TimerStateImpl.scala | 0 .../stateful/transformWithState/timers}/TimerValuesImpl.scala | 0 .../stateful/transformWithState/ttl}/ListStateImplWithTTL.scala | 0 .../stateful/transformWithState/ttl}/MapStateImplWithTTL.scala | 0 .../stateful/transformWithState/ttl}/TTLState.scala | 0 .../stateful/transformWithState/ttl}/ValueStateImplWithTTL.scala | 0 20 files changed, 0 insertions(+), 0 deletions(-) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful}/MergingSortWithSessionWindowStateIterator.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful}/StatefulOperatorPartitioning.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{state => operators/stateful}/StreamingAggregationStateManager.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{state => operators/stateful}/StreamingSessionWindowStateManager.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/fmgws}/GroupStateImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState}/StateStoreColumnFamilySchemaUtils.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState}/StateTypesEncoderUtils.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState/stateVars}/ListStateImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState/stateVars}/ListStateMetricsImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState/stateVars}/MapStateImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState/stateVars}/ValueStateImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState/statefulProcessor}/StatefulProcessorHandleImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState/statefulProcessor}/StatefulProcessorHandleImplBase.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState/timers}/ExpiredTimerInfoImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState/timers}/TimerStateImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState/timers}/TimerValuesImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState/ttl}/ListStateImplWithTTL.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState/ttl}/MapStateImplWithTTL.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState/ttl}/TTLState.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful/transformWithState/ttl}/ValueStateImplWithTTL.scala (100%) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/MergingSortWithSessionWindowStateIterator.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/MergingSortWithSessionWindowStateIterator.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/MergingSortWithSessionWindowStateIterator.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/MergingSortWithSessionWindowStateIterator.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StatefulOperatorPartitioning.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/StatefulOperatorPartitioning.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StatefulOperatorPartitioning.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/StatefulOperatorPartitioning.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/StreamingAggregationStateManager.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/StreamingAggregationStateManager.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/StreamingAggregationStateManager.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/StreamingAggregationStateManager.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/StreamingSessionWindowStateManager.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/StreamingSessionWindowStateManager.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/StreamingSessionWindowStateManager.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/StreamingSessionWindowStateManager.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/GroupStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/fmgws/GroupStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/GroupStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/fmgws/GroupStateImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StateStoreColumnFamilySchemaUtils.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/StateStoreColumnFamilySchemaUtils.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StateStoreColumnFamilySchemaUtils.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/StateStoreColumnFamilySchemaUtils.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StateTypesEncoderUtils.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/StateTypesEncoderUtils.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StateTypesEncoderUtils.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/StateTypesEncoderUtils.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/ListStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/stateVars/ListStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/ListStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/stateVars/ListStateImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/ListStateMetricsImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/stateVars/ListStateMetricsImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/ListStateMetricsImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/stateVars/ListStateMetricsImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/MapStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/stateVars/MapStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/MapStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/stateVars/MapStateImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/ValueStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/stateVars/ValueStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/ValueStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/stateVars/ValueStateImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StatefulProcessorHandleImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statefulProcessor/StatefulProcessorHandleImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StatefulProcessorHandleImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statefulProcessor/StatefulProcessorHandleImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StatefulProcessorHandleImplBase.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statefulProcessor/StatefulProcessorHandleImplBase.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StatefulProcessorHandleImplBase.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statefulProcessor/StatefulProcessorHandleImplBase.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/ExpiredTimerInfoImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/timers/ExpiredTimerInfoImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/ExpiredTimerInfoImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/timers/ExpiredTimerInfoImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/TimerStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/timers/TimerStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/TimerStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/timers/TimerStateImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/TimerValuesImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/timers/TimerValuesImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/TimerValuesImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/timers/TimerValuesImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/ListStateImplWithTTL.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/ttl/ListStateImplWithTTL.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/ListStateImplWithTTL.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/ttl/ListStateImplWithTTL.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/MapStateImplWithTTL.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/ttl/MapStateImplWithTTL.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/MapStateImplWithTTL.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/ttl/MapStateImplWithTTL.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/TTLState.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/ttl/TTLState.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/TTLState.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/ttl/TTLState.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/ValueStateImplWithTTL.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/ttl/ValueStateImplWithTTL.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/ValueStateImplWithTTL.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/ttl/ValueStateImplWithTTL.scala From d5e3eb7af6a1a4236eef0361eb791c38b13290b4 Mon Sep 17 00:00:00 2001 From: Anish Shrigondekar Date: Tue, 1 Jul 2025 21:29:44 -0700 Subject: [PATCH 3/7] Misc update --- .../FlatMapGroupsWithStateExec.scala | 0 .../FlatMapGroupsWithStateExecHelper.scala | 0 .../{fmgws => flatmapgroupswithstate}/GroupStateImpl.scala | 0 .../{stateVars => statevariables}/ListStateImpl.scala | 0 .../{stateVars => statevariables}/ListStateMetricsImpl.scala | 0 .../{stateVars => statevariables}/MapStateImpl.scala | 0 .../{stateVars => statevariables}/ValueStateImpl.scala | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{fmgws => flatmapgroupswithstate}/FlatMapGroupsWithStateExec.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{fmgws => flatmapgroupswithstate}/FlatMapGroupsWithStateExecHelper.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{fmgws => flatmapgroupswithstate}/GroupStateImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/{stateVars => statevariables}/ListStateImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/{stateVars => statevariables}/ListStateMetricsImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/{stateVars => statevariables}/MapStateImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/{stateVars => statevariables}/ValueStateImpl.scala (100%) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/fmgws/FlatMapGroupsWithStateExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/flatmapgroupswithstate/FlatMapGroupsWithStateExec.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/fmgws/FlatMapGroupsWithStateExec.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/flatmapgroupswithstate/FlatMapGroupsWithStateExec.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/fmgws/FlatMapGroupsWithStateExecHelper.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/flatmapgroupswithstate/FlatMapGroupsWithStateExecHelper.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/fmgws/FlatMapGroupsWithStateExecHelper.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/flatmapgroupswithstate/FlatMapGroupsWithStateExecHelper.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/fmgws/GroupStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/flatmapgroupswithstate/GroupStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/fmgws/GroupStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/flatmapgroupswithstate/GroupStateImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/stateVars/ListStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statevariables/ListStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/stateVars/ListStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statevariables/ListStateImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/stateVars/ListStateMetricsImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statevariables/ListStateMetricsImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/stateVars/ListStateMetricsImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statevariables/ListStateMetricsImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/stateVars/MapStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statevariables/MapStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/stateVars/MapStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statevariables/MapStateImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/stateVars/ValueStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statevariables/ValueStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/stateVars/ValueStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statevariables/ValueStateImpl.scala From 073050d60d61a004fd25711cc5806d386044d849 Mon Sep 17 00:00:00 2001 From: Anish Shrigondekar Date: Tue, 1 Jul 2025 22:09:06 -0700 Subject: [PATCH 4/7] Misc update --- .../StateStoreColumnFamilySchemaUtils.scala | 0 .../{transformWithState => tws}/StateTypesEncoderUtils.scala | 0 .../{transformWithState => tws}/TransformWithStateExec.scala | 0 .../{transformWithState => tws}/TransformWithStateExecBase.scala | 0 .../TransformWithStateVariableUtils.scala | 0 .../statefulprocessor}/StatefulProcessorHandleImpl.scala | 0 .../statefulprocessor}/StatefulProcessorHandleImplBase.scala | 0 .../statevariables/ListStateImpl.scala | 0 .../statevariables/ListStateMetricsImpl.scala | 0 .../{transformWithState => tws}/statevariables/MapStateImpl.scala | 0 .../statevariables/ValueStateImpl.scala | 0 .../{transformWithState => tws}/timers/ExpiredTimerInfoImpl.scala | 0 .../{transformWithState => tws}/timers/TimerStateImpl.scala | 0 .../{transformWithState => tws}/timers/TimerValuesImpl.scala | 0 .../{transformWithState => tws}/ttl/ListStateImplWithTTL.scala | 0 .../{transformWithState => tws}/ttl/MapStateImplWithTTL.scala | 0 .../stateful/{transformWithState => tws}/ttl/TTLState.scala | 0 .../{transformWithState => tws}/ttl/ValueStateImplWithTTL.scala | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState => tws}/StateStoreColumnFamilySchemaUtils.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState => tws}/StateTypesEncoderUtils.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState => tws}/TransformWithStateExec.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState => tws}/TransformWithStateExecBase.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState => tws}/TransformWithStateVariableUtils.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState/statefulProcessor => tws/statefulprocessor}/StatefulProcessorHandleImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState/statefulProcessor => tws/statefulprocessor}/StatefulProcessorHandleImplBase.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState => tws}/statevariables/ListStateImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState => tws}/statevariables/ListStateMetricsImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState => tws}/statevariables/MapStateImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState => tws}/statevariables/ValueStateImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState => tws}/timers/ExpiredTimerInfoImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState => tws}/timers/TimerStateImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState => tws}/timers/TimerValuesImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState => tws}/ttl/ListStateImplWithTTL.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState => tws}/ttl/MapStateImplWithTTL.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState => tws}/ttl/TTLState.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{transformWithState => tws}/ttl/ValueStateImplWithTTL.scala (100%) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/StateStoreColumnFamilySchemaUtils.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/StateStoreColumnFamilySchemaUtils.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/StateStoreColumnFamilySchemaUtils.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/StateStoreColumnFamilySchemaUtils.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/StateTypesEncoderUtils.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/StateTypesEncoderUtils.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/StateTypesEncoderUtils.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/StateTypesEncoderUtils.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/TransformWithStateExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/TransformWithStateExec.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/TransformWithStateExec.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/TransformWithStateExec.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/TransformWithStateExecBase.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/TransformWithStateExecBase.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/TransformWithStateExecBase.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/TransformWithStateExecBase.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/TransformWithStateVariableUtils.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/TransformWithStateVariableUtils.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/TransformWithStateVariableUtils.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/TransformWithStateVariableUtils.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statefulProcessor/StatefulProcessorHandleImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statefulprocessor/StatefulProcessorHandleImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statefulProcessor/StatefulProcessorHandleImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statefulprocessor/StatefulProcessorHandleImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statefulProcessor/StatefulProcessorHandleImplBase.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statefulprocessor/StatefulProcessorHandleImplBase.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statefulProcessor/StatefulProcessorHandleImplBase.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statefulprocessor/StatefulProcessorHandleImplBase.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statevariables/ListStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statevariables/ListStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statevariables/ListStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statevariables/ListStateImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statevariables/ListStateMetricsImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statevariables/ListStateMetricsImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statevariables/ListStateMetricsImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statevariables/ListStateMetricsImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statevariables/MapStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statevariables/MapStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statevariables/MapStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statevariables/MapStateImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statevariables/ValueStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statevariables/ValueStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/statevariables/ValueStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statevariables/ValueStateImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/timers/ExpiredTimerInfoImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/timers/ExpiredTimerInfoImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/timers/ExpiredTimerInfoImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/timers/ExpiredTimerInfoImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/timers/TimerStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/timers/TimerStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/timers/TimerStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/timers/TimerStateImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/timers/TimerValuesImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/timers/TimerValuesImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/timers/TimerValuesImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/timers/TimerValuesImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/ttl/ListStateImplWithTTL.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/ttl/ListStateImplWithTTL.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/ttl/ListStateImplWithTTL.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/ttl/ListStateImplWithTTL.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/ttl/MapStateImplWithTTL.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/ttl/MapStateImplWithTTL.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/ttl/MapStateImplWithTTL.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/ttl/MapStateImplWithTTL.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/ttl/TTLState.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/ttl/TTLState.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/ttl/TTLState.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/ttl/TTLState.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/ttl/ValueStateImplWithTTL.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/ttl/ValueStateImplWithTTL.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformWithState/ttl/ValueStateImplWithTTL.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/ttl/ValueStateImplWithTTL.scala From c574c1dd9e8037ebe4d38ef4fcdca99e8938b426 Mon Sep 17 00:00:00 2001 From: Anish Shrigondekar Date: Tue, 1 Jul 2025 22:11:17 -0700 Subject: [PATCH 5/7] Misc update --- .../StateStoreColumnFamilySchemaUtils.scala | 0 .../{tws => transformwithstate}/StateTypesEncoderUtils.scala | 0 .../{tws => transformwithstate}/TransformWithStateExec.scala | 0 .../{tws => transformwithstate}/TransformWithStateExecBase.scala | 0 .../TransformWithStateVariableUtils.scala | 0 .../statefulprocessor/StatefulProcessorHandleImpl.scala | 0 .../statefulprocessor/StatefulProcessorHandleImplBase.scala | 0 .../statevariables/ListStateImpl.scala | 0 .../statevariables/ListStateMetricsImpl.scala | 0 .../{tws => transformwithstate}/statevariables/MapStateImpl.scala | 0 .../statevariables/ValueStateImpl.scala | 0 .../{tws => transformwithstate}/timers/ExpiredTimerInfoImpl.scala | 0 .../{tws => transformwithstate}/timers/TimerStateImpl.scala | 0 .../{tws => transformwithstate}/timers/TimerValuesImpl.scala | 0 .../{tws => transformwithstate}/ttl/ListStateImplWithTTL.scala | 0 .../{tws => transformwithstate}/ttl/MapStateImplWithTTL.scala | 0 .../stateful/{tws => transformwithstate}/ttl/TTLState.scala | 0 .../{tws => transformwithstate}/ttl/ValueStateImplWithTTL.scala | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/StateStoreColumnFamilySchemaUtils.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/StateTypesEncoderUtils.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/TransformWithStateExec.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/TransformWithStateExecBase.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/TransformWithStateVariableUtils.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/statefulprocessor/StatefulProcessorHandleImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/statefulprocessor/StatefulProcessorHandleImplBase.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/statevariables/ListStateImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/statevariables/ListStateMetricsImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/statevariables/MapStateImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/statevariables/ValueStateImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/timers/ExpiredTimerInfoImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/timers/TimerStateImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/timers/TimerValuesImpl.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/ttl/ListStateImplWithTTL.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/ttl/MapStateImplWithTTL.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/ttl/TTLState.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/{tws => transformwithstate}/ttl/ValueStateImplWithTTL.scala (100%) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/StateStoreColumnFamilySchemaUtils.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/StateStoreColumnFamilySchemaUtils.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/StateStoreColumnFamilySchemaUtils.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/StateStoreColumnFamilySchemaUtils.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/StateTypesEncoderUtils.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/StateTypesEncoderUtils.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/StateTypesEncoderUtils.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/StateTypesEncoderUtils.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/TransformWithStateExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/TransformWithStateExec.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/TransformWithStateExec.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/TransformWithStateExec.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/TransformWithStateExecBase.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/TransformWithStateExecBase.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/TransformWithStateExecBase.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/TransformWithStateExecBase.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/TransformWithStateVariableUtils.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/TransformWithStateVariableUtils.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/TransformWithStateVariableUtils.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/TransformWithStateVariableUtils.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statefulprocessor/StatefulProcessorHandleImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/statefulprocessor/StatefulProcessorHandleImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statefulprocessor/StatefulProcessorHandleImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/statefulprocessor/StatefulProcessorHandleImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statefulprocessor/StatefulProcessorHandleImplBase.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/statefulprocessor/StatefulProcessorHandleImplBase.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statefulprocessor/StatefulProcessorHandleImplBase.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/statefulprocessor/StatefulProcessorHandleImplBase.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statevariables/ListStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/statevariables/ListStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statevariables/ListStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/statevariables/ListStateImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statevariables/ListStateMetricsImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/statevariables/ListStateMetricsImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statevariables/ListStateMetricsImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/statevariables/ListStateMetricsImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statevariables/MapStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/statevariables/MapStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statevariables/MapStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/statevariables/MapStateImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statevariables/ValueStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/statevariables/ValueStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/statevariables/ValueStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/statevariables/ValueStateImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/timers/ExpiredTimerInfoImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/timers/ExpiredTimerInfoImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/timers/ExpiredTimerInfoImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/timers/ExpiredTimerInfoImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/timers/TimerStateImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/timers/TimerStateImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/timers/TimerStateImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/timers/TimerStateImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/timers/TimerValuesImpl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/timers/TimerValuesImpl.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/timers/TimerValuesImpl.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/timers/TimerValuesImpl.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/ttl/ListStateImplWithTTL.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/ttl/ListStateImplWithTTL.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/ttl/ListStateImplWithTTL.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/ttl/ListStateImplWithTTL.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/ttl/MapStateImplWithTTL.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/ttl/MapStateImplWithTTL.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/ttl/MapStateImplWithTTL.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/ttl/MapStateImplWithTTL.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/ttl/TTLState.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/ttl/TTLState.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/ttl/TTLState.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/ttl/TTLState.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/ttl/ValueStateImplWithTTL.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/ttl/ValueStateImplWithTTL.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/tws/ttl/ValueStateImplWithTTL.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/transformwithstate/ttl/ValueStateImplWithTTL.scala From 338f2bc8a8784d1833b48a15e34b65753307a569 Mon Sep 17 00:00:00 2001 From: Anish Shrigondekar Date: Tue, 1 Jul 2025 22:15:57 -0700 Subject: [PATCH 6/7] Misc update --- .../sql/execution/streaming/{ => sinks}/FileStreamSink.scala | 0 .../sql/execution/streaming/{ => sinks}/FileStreamSinkLog.scala | 0 .../spark/sql/execution/streaming/{ => sinks}/console.scala | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => sinks}/FileStreamSink.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => sinks}/FileStreamSinkLog.scala (100%) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => sinks}/console.scala (100%) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/FileStreamSink.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/sinks/FileStreamSink.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/FileStreamSink.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/sinks/FileStreamSink.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/FileStreamSinkLog.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/sinks/FileStreamSinkLog.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/FileStreamSinkLog.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/sinks/FileStreamSinkLog.scala diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/console.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/sinks/console.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/console.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/sinks/console.scala From ee23567932ba9164b2a879f5a56491f014f0be16 Mon Sep 17 00:00:00 2001 From: Anish Shrigondekar Date: Tue, 1 Jul 2025 22:19:09 -0700 Subject: [PATCH 7/7] Misc update --- .../streaming/{ => operators/stateful}/streamingLimits.scala | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/{ => operators/stateful}/streamingLimits.scala (100%) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/streamingLimits.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/streamingLimits.scala similarity index 100% rename from sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/streamingLimits.scala rename to sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/operators/stateful/streamingLimits.scala