Skip to content

Commit cd0423b

Browse files
Nit: rename experimental features to just features.
1 parent 99563a4 commit cd0423b

File tree

8 files changed

+25
-30
lines changed

8 files changed

+25
-30
lines changed

crates/worker/src/partition/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ use crate::metric_definitions::{
6767
};
6868
use crate::partition::invoker_storage_reader::InvokerStorageReader;
6969
use crate::partition::leadership::LeadershipState;
70-
use crate::partition::state_machine::{ActionCollector, ExperimentalFeature, StateMachine};
70+
use crate::partition::state_machine::{ActionCollector, Feature, StateMachine};
7171

7272
/// Target leader state of the partition processor.
7373
#[derive(Clone, Copy, Debug, Default, PartialEq)]
@@ -197,7 +197,7 @@ where
197197
let mut features = EnumSet::new();
198198
// TODO(till) enable this using partition processor version barrier
199199
if env::var("RESTATE_EXPERIMENTAL_FEATURE__USE_JOURNAL_V2_BY_DEFAULT").is_ok() {
200-
features.insert(ExperimentalFeature::UseJournalTableV2AsDefault);
200+
features.insert(Feature::UseJournalTableV2AsDefault);
201201
}
202202

203203
let state_machine = StateMachine::new(

crates/worker/src/partition/state_machine/entries/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ impl<CMD> ApplyJournalCommandEffect<'_, CMD> {
405405

406406
#[cfg(test)]
407407
mod tests {
408-
use crate::partition::state_machine::ExperimentalFeature;
408+
use crate::partition::state_machine::Feature;
409409
use crate::partition::state_machine::tests::fixtures::invoker_entry_effect;
410410
use crate::partition::state_machine::tests::{TestEnv, fixtures, matchers};
411411
use bytes::Bytes;
@@ -424,7 +424,7 @@ mod tests {
424424
#[restate_core::test]
425425
async fn update_journal_and_commands_length(
426426
#[values(ExperimentalFeature::UseJournalTableV2AsDefault.into(), EnumSet::empty())]
427-
features: EnumSet<ExperimentalFeature>,
427+
features: EnumSet<Feature>,
428428
) {
429429
let mut test_env = TestEnv::create_with_experimental_features(features).await;
430430
let invocation_id = fixtures::mock_start_invocation(&mut test_env).await;

crates/worker/src/partition/state_machine/entries/notification.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ where
201201
mod tests {
202202
use super::*;
203203

204-
use crate::partition::state_machine::ExperimentalFeature;
204+
use crate::partition::state_machine::Feature;
205205
use crate::partition::state_machine::tests::{TestEnv, fixtures, matchers};
206206
use bytes::Bytes;
207207
use bytestring::ByteString;
@@ -268,7 +268,7 @@ mod tests {
268268
#[restate_core::test]
269269
async fn notify_signal_received_before_pinned_deployment(
270270
#[values(ExperimentalFeature::UseJournalTableV2AsDefault.into(), EnumSet::empty())]
271-
features: EnumSet<ExperimentalFeature>,
271+
features: EnumSet<Feature>,
272272
) {
273273
let mut test_env = TestEnv::create_with_experimental_features(features).await;
274274
let invocation_id = fixtures::mock_start_invocation(&mut test_env).await;

crates/worker/src/partition/state_machine/lifecycle/cancel.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ mod tests {
118118
use super::*;
119119

120120
use crate::partition::state_machine::tests::{TestEnv, fixtures, matchers};
121-
use crate::partition::state_machine::{Action, ExperimentalFeature};
121+
use crate::partition::state_machine::{Action, Feature};
122122
use crate::partition::types::InvokerEffectKind;
123123
use assert2::assert;
124124
use enumset::EnumSet;
@@ -237,10 +237,9 @@ mod tests {
237237

238238
#[restate_core::test]
239239
async fn cancel_invoked_invocation_without_pinned_deployment_with_journal_table_v2_default() {
240-
let mut test_env = TestEnv::create_with_experimental_features(
241-
ExperimentalFeature::UseJournalTableV2AsDefault.into(),
242-
)
243-
.await;
240+
let mut test_env =
241+
TestEnv::create_with_experimental_features(Feature::UseJournalTableV2AsDefault.into())
242+
.await;
244243
let invocation_id = fixtures::mock_start_invocation(&mut test_env).await;
245244

246245
// Send signal notification before pinning the deployment
@@ -273,7 +272,7 @@ mod tests {
273272
#[restate_core::test]
274273
async fn cancel_scheduled_invocation_through_notify_signal(
275274
#[values(ExperimentalFeature::UseJournalTableV2AsDefault.into(), EnumSet::empty())]
276-
features: EnumSet<ExperimentalFeature>,
275+
features: EnumSet<Feature>,
277276
) -> anyhow::Result<()> {
278277
let mut test_env = TestEnv::create_with_experimental_features(features).await;
279278

@@ -348,7 +347,7 @@ mod tests {
348347
#[restate_core::test]
349348
async fn cancel_inboxed_invocation_through_notify_signal(
350349
#[values(ExperimentalFeature::UseJournalTableV2AsDefault.into(), EnumSet::empty())]
351-
features: EnumSet<ExperimentalFeature>,
350+
features: EnumSet<Feature>,
352351
) -> anyhow::Result<()> {
353352
let mut test_env = TestEnv::create_with_experimental_features(features).await;
354353

crates/worker/src/partition/state_machine/lifecycle/restart_as_new.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ where
280280
mod tests {
281281
use super::*;
282282

283-
use crate::partition::state_machine::ExperimentalFeature;
283+
use crate::partition::state_machine::Feature;
284284
use crate::partition::state_machine::tests::{TestEnv, fixtures, matchers};
285285
use googletest::prelude::*;
286286
use restate_storage_api::invocation_status_table::{
@@ -382,10 +382,9 @@ mod tests {
382382
async fn restart_killed_invocation() {
383383
// This works only when using journal table v2 as default!
384384
// The corner case with journal table v1 is handled by the rpc handler instead.
385-
let mut test_env = TestEnv::create_with_experimental_features(
386-
ExperimentalFeature::UseJournalTableV2AsDefault.into(),
387-
)
388-
.await;
385+
let mut test_env =
386+
TestEnv::create_with_experimental_features(Feature::UseJournalTableV2AsDefault.into())
387+
.await;
389388

390389
// Start invocation, then kill it
391390
let invocation_target = InvocationTarget::mock_virtual_object();

crates/worker/src/partition/state_machine/mod.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ use crate::partition::state_machine::lifecycle::OnCancelCommand;
117117
use crate::partition::types::{InvokerEffect, InvokerEffectKind, OutboxMessageExt};
118118

119119
#[derive(Debug, Hash, enumset::EnumSetType, strum::Display)]
120-
pub enum ExperimentalFeature {
120+
pub enum Feature {
121121
UseJournalTableV2AsDefault,
122122
}
123123

@@ -136,7 +136,7 @@ pub struct StateMachine {
136136
pub(crate) partition_key_range: RangeInclusive<PartitionKey>,
137137

138138
/// Enabled experimental features.
139-
pub(crate) experimental_features: EnumSet<ExperimentalFeature>,
139+
pub(crate) features: EnumSet<Feature>,
140140
}
141141

142142
impl Debug for StateMachine {
@@ -221,7 +221,7 @@ impl StateMachine {
221221
outbox_head_seq_number: Option<MessageIndex>,
222222
partition_key_range: RangeInclusive<PartitionKey>,
223223
min_restate_version: SemanticRestateVersion,
224-
experimental_features: EnumSet<ExperimentalFeature>,
224+
experimental_features: EnumSet<Feature>,
225225
schema: Option<Schema>,
226226
) -> Self {
227227
Self {
@@ -230,7 +230,7 @@ impl StateMachine {
230230
outbox_head_seq_number,
231231
partition_key_range,
232232
min_restate_version,
233-
experimental_features,
233+
features: experimental_features,
234234
schema,
235235
}
236236
}
@@ -247,8 +247,7 @@ pub(crate) struct StateMachineApplyContext<'a, S> {
247247
min_restate_version: &'a mut SemanticRestateVersion,
248248
schema: &'a mut Option<Schema>,
249249
partition_key_range: RangeInclusive<PartitionKey>,
250-
#[allow(dead_code)]
251-
experimental_features: &'a EnumSet<ExperimentalFeature>,
250+
features: &'a EnumSet<Feature>,
252251
is_leader: bool,
253252
}
254253

@@ -286,7 +285,7 @@ impl StateMachine {
286285
min_restate_version: &mut self.min_restate_version,
287286
schema: &mut self.schema,
288287
partition_key_range: self.partition_key_range.clone(),
289-
experimental_features: &self.experimental_features,
288+
features: &self.features,
290289
is_leader,
291290
}
292291
.on_apply(command)
@@ -719,9 +718,7 @@ impl<S> StateMachineApplyContext<'_, S> {
719718
// A pre-flight invocation has been already deduplicated
720719

721720
// 0. Prepare the journal table v2
722-
if self
723-
.experimental_features
724-
.contains(ExperimentalFeature::UseJournalTableV2AsDefault)
721+
if self.features.contains(Feature::UseJournalTableV2AsDefault)
725722
&& let PreFlightInvocationArgument::Input(PreFlightInvocationInput {
726723
argument,
727724
headers,

crates/worker/src/partition/state_machine/tests/kill_cancel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use test_log::test;
3232
#[restate_core::test]
3333
async fn kill_inboxed_invocation(
3434
#[values(ExperimentalFeature::UseJournalTableV2AsDefault.into(), EnumSet::empty())]
35-
features: EnumSet<ExperimentalFeature>,
35+
features: EnumSet<Feature>,
3636
) -> anyhow::Result<()> {
3737
let mut test_env = TestEnv::create_with_experimental_features(features).await;
3838

crates/worker/src/partition/state_machine/tests/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ impl TestEnv {
9090
}
9191

9292
pub async fn create_with_experimental_features(
93-
experimental_features: EnumSet<ExperimentalFeature>,
93+
experimental_features: EnumSet<Feature>,
9494
) -> Self {
9595
Self::create_with_state_machine(StateMachine::new(
9696
0, /* inbox_seq_number */

0 commit comments

Comments
 (0)