Fixes

Author: shnikd

ydb/core/protos/tx_sequenceshard.proto

@@ -17,6 +17,11 @@ message TEvMarkSchemeShardPipe {
     uint64 Round = 3;
 }
 
+message TSetVal {
+    sint64 NextValue = 1;
+    bool NextUsed = 2;
+}
+
 message TEvCreateSequence {
     NKikimrProto.TPathID PathId = 1;
     uint64 TxId = 2;
@@ -40,7 +45,9 @@ message TEvCreateSequence {
         bool Cycle = 9;
     }
     bool Frozen = 10; // defaults to false
-    bool Overflowed = 11; // defaults to false
+    oneof OptionalSetVal {
+        TSetVal SetVal = 11;
+    }
 }
 
 message TEvCreateSequenceResult {

ydb/core/tx/schemeshard/schemeshard__operation_copy_sequence.cpp

@@ -275,47 +275,15 @@ class TProposedCopySequence : public TSubOperationState {
     }
 
     void UpdateSequenceDescription(NKikimrSchemeOp::TSequenceDescription& descr) {
-        descr.SetStartValue(GetSequenceResult.GetNextValue());
+        descr.SetStartValue(GetSequenceResult.GetStartValue());
         descr.SetMinValue(GetSequenceResult.GetMinValue());
         descr.SetMaxValue(GetSequenceResult.GetMaxValue());
         descr.SetCache(GetSequenceResult.GetCache());
         descr.SetIncrement(GetSequenceResult.GetIncrement());
         descr.SetCycle(GetSequenceResult.GetCycle());
-
-        i64 nextValue = GetSequenceResult.GetNextValue();
-        i64 minValue = GetSequenceResult.GetMinValue();
-        i64 maxValue = GetSequenceResult.GetMaxValue();
-        bool cycle = GetSequenceResult.GetCycle();
-        bool overflowed = false;
-
-        if (GetSequenceResult.GetNextUsed()) {
-            i64 increment = GetSequenceResult.GetIncrement();
-            if (increment > 0) {
-                ui64 delta = increment;
-
-                if (nextValue < maxValue && ui64(maxValue) - ui64(nextValue) >= delta) {
-                    nextValue += delta;
-                } else {
-                    if (cycle) {
-                        nextValue = minValue;
-                    }
-                    overflowed = true;
-                }
-            } else {
-                ui64 delta = -increment;
-
-                if (nextValue > minValue && ui64(nextValue) - ui64(minValue) >= delta) {
-                    nextValue -= delta;
-                } else {
-                    if (cycle) {
-                        nextValue = maxValue;
-                    }
-                    overflowed = true;
-                }
-            }
-        }
-        descr.SetStartValue(nextValue);
-        descr.SetOverflowed(overflowed);
+        auto* setValMsg = descr.MutableSetVal();
+        setValMsg->SetNextValue(GetSequenceResult.GetNextValue());
+        setValMsg->SetNextUsed(GetSequenceResult.GetNextUsed());
     }
 
 public:

ydb/core/tx/schemeshard/schemeshard__operation_create_sequence.cpp

@@ -142,7 +142,10 @@ class TConfigureParts : public TSubOperationState {
             if (alterData->Description.HasCycle()) {
                 event->Record.SetCycle(alterData->Description.GetCycle());
             }
-            event->Record.SetOverflowed(alterData->Description.GetOverflowed());
+            if (alterData->Description.HasSetVal()) {
+                event->Record.MutableSetVal()->SetNextValue(alterData->Description.GetSetVal().GetNextValue());
+                event->Record.MutableSetVal()->SetNextUsed(alterData->Description.GetSetVal().GetNextUsed());
+            }
 
             LOG_DEBUG_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
                         "TCreateSequence TConfigureParts ProgressState"

ydb/core/tx/schemeshard/schemeshard_import_flow_proposals.cpp

@@ -72,7 +72,11 @@ THolder<TEvSchemeShard::TEvModifySchemeTransaction> CreateTablePropose(
                 if (fromSequence.has_cycle()) {
                     seqDesc->SetCycle(fromSequence.cycle());
                 }
-                seqDesc->SetOverflowed(fromSequence.overflowed());
+                if (fromSequence.has_set_val()) {
+                    auto* setVal = seqDesc->MutableSetVal();
+                    setVal->SetNextUsed(fromSequence.set_val().next_used());
+                    setVal->SetNextValue(fromSequence.set_val().next_value());
+                }
 
                 break;
             }

ydb/core/tx/sequenceshard/public/events.h

@@ -104,11 +104,6 @@ namespace NSequenceShard {
                     return std::move(*this);
                 }
 
-                TBuilder&& SetOverflowed(bool overflowed) && {
-                    Msg->Record.SetOverflowed(overflowed);
-                    return std::move(*this);
-                }
-
                 THolder<TEvCreateSequence> Done() && {
                     return std::move(Msg);
                 }

ydb/core/tx/sequenceshard/tx_create_sequence.cpp

@@ -74,9 +74,14 @@ namespace NSequenceShard {
                 sequence.Cycle = msg->Record.GetCycle();
             }
 
-            sequence.NextValue = sequence.StartValue;
-            bool overflowed = msg->Record.GetOverflowed();
-            sequence.NextUsed = overflowed;
+
+            if (msg->Record.OptionalSetVal_case() == NKikimrTxSequenceShard::TEvCreateSequence::kSetVal) {
+                sequence.NextValue = msg->Record.GetSetVal().GetNextValue();
+                sequence.NextUsed = msg->Record.GetSetVal().GetNextUsed();
+            } else {
+                sequence.NextUsed = false;
+                sequence.NextValue = sequence.StartValue;
+            }
 
             if (msg->Record.OptionalCache_case() == NKikimrTxSequenceShard::TEvCreateSequence::kCache) {
                 sequence.Cache = msg->Record.GetCache();
@@ -105,8 +110,7 @@ namespace NSequenceShard {
                 << " Cache# " << sequence.Cache
                 << " Increment# " << sequence.Increment
                 << " Cycle# " << (sequence.Cycle ? "true" : "false")
-                << " State# " << (frozen ? "Frozen" : "Active")
-                << " Overflowed# " << (overflowed ? "true" : "false"));
+                << " State# " << (frozen ? "Frozen" : "Active"));
             return true;
         }
 

ydb/core/ydb_convert/table_description.cpp

@@ -1419,7 +1419,11 @@ void FillSequenceDescription(Ydb::Table::CreateTableRequest& out, const NKikimrS
                 if (sequenceDescription.HasCycle()) {
                     fromSequence->set_cycle(sequenceDescription.GetCycle());
                 }
-                fromSequence->set_overflowed(sequenceDescription.GetOverflowed());
+                if (sequenceDescription.HasSetVal()) {
+                    auto* setVal = fromSequence->mutable_set_val();
+                    setVal->set_next_used(sequenceDescription.GetSetVal().GetNextUsed());
+                    setVal->set_next_value(sequenceDescription.GetSetVal().GetNextValue());
+                }
                 break;
             }
             case Ydb::Table::ColumnMeta::kFromLiteral: {