Stop writing cron job next run metadata to old location (#36196)

Stop writing to old location - completing migration!

GitOrigin-RevId: 34c96bf66f1c8946e0fdea2a3b9ac9160a19b1e1

Author: nipunn1313

Cargo.lock

@@ -208,6 +208,7 @@ dependencies = [
  "base64 0.13.1",
  "derive_more",
  "headers",
+ "pretty_assertions",
  "proptest",
  "proptest-derive",
  "rand 0.9.0",

crates/convex/Cargo.oss.lock

@@ -85,6 +85,7 @@ dependencies = [
  "base64 0.13.1",
  "derive_more",
  "headers",
+ "pretty_assertions",
  "proptest",
  "proptest-derive",
  "rand 0.9.0",
@@ -112,6 +113,16 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "ctor"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "derive_more"
 version = "2.0.1"
@@ -130,10 +141,16 @@ dependencies = [
  "convert_case",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.95",
  "unicode-xid",
 ]
 
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -320,12 +337,33 @@ version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
+[[package]]
+name = "output_vt100"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
+[[package]]
+name = "pretty_assertions"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
+dependencies = [
+ "ctor",
+ "diff",
+ "output_vt100",
+ "yansi",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.92"
@@ -363,7 +401,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -505,7 +543,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -532,6 +570,17 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "syn"
 version = "2.0.95"
@@ -627,6 +676,28 @@ dependencies = [
  "wit-bindgen-rt",
 ]
 
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
@@ -709,6 +780,12 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "yansi"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+
 [[package]]
 name = "zerocopy"
 version = "0.8.20"
@@ -726,5 +803,5 @@ checksum = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.95",
 ]

crates/convex/sync_types/Cargo.oss.lock

@@ -15,6 +15,7 @@ anyhow = { version = "1" }
 base64 = { version = "0.13" }
 derive_more = { version = "2", features = [ "full" ] }
 headers = { version = "0.4" }
+pretty_assertions = { optional = true, version = "1" }
 proptest = { optional = true, version = "1" }
 proptest-derive = { optional = true, version = "0.5.0" }
 rand = { version = "0.9" }
@@ -23,11 +24,12 @@ serde_json = { features = [ "float_roundtrip", "preserve_order" ], version = "1"
 uuid = { features = [ "serde", "v4" ], version = "1.6" }
 
 [dev-dependencies]
+pretty_assertions = { version = "1" }
 proptest = { version = "1" }
 proptest-derive = { version = "0.5.0" }
 
 [features]
-testing = [ "proptest", "proptest-derive" ]
+testing = [ "proptest", "proptest-derive", "pretty_assertions" ]
 
 [lints.rust]
 unused_extern_crates = "warn"

crates/convex/sync_types/Cargo.oss.toml

@@ -15,6 +15,7 @@ anyhow = { workspace = true }
 base64 = { workspace = true }
 derive_more = { workspace = true }
 headers = { workspace = true }
+pretty_assertions = { workspace = true, optional = true }
 proptest = { workspace = true, optional = true }
 proptest-derive = { workspace = true, optional = true }
 rand = { workspace = true }
@@ -26,11 +27,12 @@ serde_json = { workspace = true, features = [
 uuid = { workspace = true, features = ["serde", "v4"] }
 
 [dev-dependencies]
+pretty_assertions = { workspace = true }
 proptest = { workspace = true }
 proptest-derive = { workspace = true }
 
 [features]
-testing = ["proptest", "proptest-derive"]
+testing = ["proptest", "proptest-derive", "pretty_assertions"]
 
 [lints]
 workspace = true

crates/convex/sync_types/Cargo.toml

@@ -1,5 +1,6 @@
 use std::fmt::Debug;
 
+use pretty_assertions::assert_eq;
 use proptest::prelude::*;
 use serde_json::Value as JsonValue;
 

crates/convex/sync_types/src/testing.rs

@@ -248,13 +248,7 @@ impl<'a, RT: Runtime> CronModel<'a, RT> {
     ) -> anyhow::Result<()> {
         let now = self.runtime().generate_timestamp()?;
         let next_ts = compute_next_ts(&cron_spec, None, now)?;
-        let cron = CronJobMetadata {
-            name,
-            cron_spec,
-            state: Some(CronJobState::Pending),
-            prev_ts: None,
-            next_ts: Some(next_ts),
-        };
+        let cron = CronJobMetadata { name, cron_spec };
 
         let cron_job_id = SystemMetadataModel::new(self.tx, self.component.into())
             .insert(&CRON_JOBS_TABLE, cron.try_into()?)
@@ -334,9 +328,6 @@ impl<'a, RT: Runtime> CronModel<'a, RT> {
         let cron_job = CronJobMetadata {
             name: job.name,
             cron_spec: job.cron_spec,
-            state: Some(job.state),
-            prev_ts: job.prev_ts,
-            next_ts: Some(job.next_ts),
         };
         SystemMetadataModel::new(self.tx, self.component.into())
             .replace(job.id, cron_job.try_into()?)

crates/model/src/cron_jobs/mod.rs

@@ -96,21 +96,13 @@ pub struct CronJobMetadata {
 
     // Cron-related metadata specified by the user and updated on pushes
     pub cron_spec: CronSpec,
-
-    // Keep these three fields for now for fwds/backwards compatibility during rollout
-    pub state: Option<CronJobState>,
-    pub prev_ts: Option<Timestamp>,
-    pub next_ts: Option<Timestamp>,
 }
 
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SerializedCronJobMetadata {
     name: String,
     cron_spec: SerializedCronSpec,
-    state: Option<CronJobState>,
-    prev_ts: Option<i64>,
-    next_ts: Option<i64>,
 }
 
 impl TryFrom<CronJobMetadata> for SerializedCronJobMetadata {
@@ -120,9 +112,6 @@ impl TryFrom<CronJobMetadata> for SerializedCronJobMetadata {
         Ok(Self {
             name: job.name.to_string(),
             cron_spec: job.cron_spec.try_into()?,
-            state: job.state,
-            prev_ts: job.prev_ts.map(|ts| ts.into()),
-            next_ts: job.next_ts.map(|ts| ts.into()),
         })
     }
 }
@@ -134,9 +123,6 @@ impl TryFrom<SerializedCronJobMetadata> for CronJobMetadata {
         Ok(Self {
             name: value.name.parse()?,
             cron_spec: value.cron_spec.try_into()?,
-            state: value.state,
-            prev_ts: value.prev_ts.map(|ts| ts.try_into()).transpose()?,
-            next_ts: value.next_ts.map(|ts| ts.try_into()).transpose()?,
         })
     }
 }
@@ -1121,9 +1107,6 @@ mod tests {
                 "udfPath" => "crons.js:vacuumOldEntries"
             },
             "name" => "vacuum old entries",
-            "nextTs" => 1702354800000000000,
-            "prevTs" => 1702268400000000000,
-            "state" => {"type" => "pending"},
         );
         assert_roundtrips::<_, CronJobMetadata>(cron_job_obj);
     }