fix breaking changes

risingwavelabs · Nov 1, 2024 · 6671d71 · 6671d71
1 parent dde12ee
commit 6671d71
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 34 deletions.
diff --git a/src/meta/model/migration/src/m20230908_072257_init.rs b/src/meta/model/migration/src/m20230908_072257_init.rs
@@ -376,11 +376,7 @@ impl MigrationTrait for Migration {
                             .string()
                             .not_null(),
                     )
-                    .col(
-                        ColumnDef::new(Fragment::StreamNode)
-                            .blob(BlobSize::Long)
-                            .not_null(),
-                    )
+                    .col(ColumnDef::new(Fragment::StreamNode).blob().not_null())
                     .col(ColumnDef::new(Fragment::VnodeMapping).binary().not_null())
                     .col(ColumnDef::new(Fragment::StateTableIds).json_binary())
                     .col(ColumnDef::new(Fragment::UpstreamFragmentId).json_binary())

diff --git a/src/meta/model/migration/src/m20231008_020431_hummock.rs b/src/meta/model/migration/src/m20231008_020431_hummock.rs
@@ -30,11 +30,7 @@ impl MigrationTrait for Migration {
                             .not_null()
                             .primary_key(),
                     )
-                    .col(
-                        ColumnDef::new(CompactionTask::Task)
-                            .blob(BlobSize::Long)
-                            .not_null(),
-                    )
+                    .col(ColumnDef::new(CompactionTask::Task).blob().not_null())
                     .col(
                         ColumnDef::new(CompactionTask::ContextId)
                             .integer()
@@ -54,7 +50,7 @@ impl MigrationTrait for Migration {
                             .not_null()
                             .primary_key(),
                     )
-                    .col(ColumnDef::new(CompactionConfig::Config).blob(BlobSize::Long))
+                    .col(ColumnDef::new(CompactionConfig::Config).blob())
                     .to_owned(),
             )
             .await?;
@@ -69,7 +65,7 @@ impl MigrationTrait for Migration {
                             .not_null()
                             .primary_key(),
                     )
-                    .col(ColumnDef::new(CompactionStatus::Status).blob(BlobSize::Long))
+                    .col(ColumnDef::new(CompactionStatus::Status).blob())
                     .to_owned(),
             )
             .await?;
@@ -142,7 +138,7 @@ impl MigrationTrait for Migration {
                             .boolean()
                             .not_null(),
                     )
-                    .col(ColumnDef::new(HummockVersionDelta::FullVersionDelta).blob(BlobSize::Long))
+                    .col(ColumnDef::new(HummockVersionDelta::FullVersionDelta).blob())
                     .to_owned(),
             )
             .await?;

diff --git a/src/meta/model/migration/src/m20240618_072634_function_compressed_binary.rs b/src/meta/model/migration/src/m20240618_072634_function_compressed_binary.rs
@@ -18,9 +18,7 @@ impl MigrationTrait for Migration {
                     .alter_table(
                         Table::alter()
                             .table(Function::Table)
-                            .modify_column(
-                                ColumnDef::new(Function::CompressedBinary).blob(BlobSize::Medium),
-                            )
+                            .modify_column(ColumnDef::new(Function::CompressedBinary).blob())
                             .to_owned(),
                     )
                     .await?;

diff --git a/src/meta/model/migration/src/m20240701_060504_hummock_time_travel.rs b/src/meta/model/migration/src/m20240701_060504_hummock_time_travel.rs
@@ -26,7 +26,7 @@ impl MigrationTrait for Migration {
                     )
                     .col(
                         ColumnDef::new(HummockSstableInfo::SstableInfo)
-                            .blob(BlobSize::Long)
+                            .blob()
                             .null(),
                     )
                     .to_owned(),
@@ -46,7 +46,7 @@ impl MigrationTrait for Migration {
                     )
                     .col(
                         ColumnDef::new(HummockTimeTravelVersion::Version)
-                            .blob(BlobSize::Long)
+                            .blob()
                             .null(),
                     )
                     .to_owned(),
@@ -66,7 +66,7 @@ impl MigrationTrait for Migration {
                     )
                     .col(
                         ColumnDef::new(HummockTimeTravelDelta::VersionDelta)
-                            .blob(BlobSize::Long)
+                            .blob()
                             .null(),
                     )
                     .to_owned(),

diff --git a/src/meta/model/src/actor.rs b/src/meta/model/src/actor.rs
@@ -21,7 +21,7 @@ use crate::{
 };
 
 #[derive(Clone, Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
-#[sea_orm(rs_type = "String", db_type = "String(None)")]
+#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
 pub enum ActorStatus {
     #[sea_orm(string_value = "INACTIVE")]
     Inactive,

diff --git a/src/meta/model/src/actor_dispatcher.rs b/src/meta/model/src/actor_dispatcher.rs
@@ -23,7 +23,7 @@ use crate::{ActorId, ActorMapping, FragmentId, I32Array};
 #[derive(
     Hash, Copy, Clone, Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize,
 )]
-#[sea_orm(rs_type = "String", db_type = "String(None)")]
+#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
 pub enum DispatcherType {
     #[sea_orm(string_value = "HASH")]
     Hash,

diff --git a/src/meta/model/src/catalog_version.rs b/src/meta/model/src/catalog_version.rs
@@ -16,7 +16,7 @@ use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
-#[sea_orm(rs_type = "String", db_type = "String(None)")]
+#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
 pub enum VersionCategory {
     #[sea_orm(string_value = "NOTIFICATION")]
     Notification,

diff --git a/src/meta/model/src/fragment.rs b/src/meta/model/src/fragment.rs
@@ -33,7 +33,7 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
-#[sea_orm(rs_type = "String", db_type = "String(None)")]
+#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
 pub enum DistributionType {
     #[sea_orm(string_value = "SINGLE")]
     Single,

diff --git a/src/meta/model/src/function.rs b/src/meta/model/src/function.rs
@@ -21,7 +21,7 @@ use serde::{Deserialize, Serialize};
 use crate::{DataType, DataTypeArray, FunctionId};
 
 #[derive(Clone, Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
-#[sea_orm(rs_type = "String", db_type = "String(None)")]
+#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
 pub enum FunctionKind {
     #[sea_orm(string_value = "Scalar")]
     Scalar,

diff --git a/src/meta/model/src/lib.rs b/src/meta/model/src/lib.rs
@@ -93,7 +93,7 @@ pub type FragmentId = i32;
 pub type ActorId = i32;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
-#[sea_orm(rs_type = "String", db_type = "String(None)")]
+#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
 pub enum JobStatus {
     #[sea_orm(string_value = "INITIAL")]
     Initial,
@@ -125,7 +125,7 @@ impl From<JobStatus> for PbStreamJobState {
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
-#[sea_orm(rs_type = "String", db_type = "String(None)")]
+#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
 pub enum CreateType {
     #[sea_orm(string_value = "BACKGROUND")]
     Background,

diff --git a/src/meta/model/src/object.rs b/src/meta/model/src/object.rs
@@ -18,7 +18,7 @@ use serde::{Deserialize, Serialize};
 use crate::{DatabaseId, ObjectId, SchemaId, UserId};
 
 #[derive(Clone, Debug, PartialEq, Eq, Copy, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
-#[sea_orm(rs_type = "String", db_type = "String(None)")]
+#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
 pub enum ObjectType {
     #[sea_orm(string_value = "DATABASE")]
     Database,

diff --git a/src/meta/model/src/secret.rs b/src/meta/model/src/secret.rs
@@ -23,7 +23,7 @@ pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub secret_id: i32,
     pub name: String,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "Blob")]
     pub value: Vec<u8>,
 }
 

diff --git a/src/meta/model/src/sink.rs b/src/meta/model/src/sink.rs
@@ -23,7 +23,7 @@ use crate::{
 };
 
 #[derive(Clone, Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
-#[sea_orm(rs_type = "String", db_type = "String(None)")]
+#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
 pub enum SinkType {
     #[sea_orm(string_value = "APPEND_ONLY")]
     AppendOnly,

diff --git a/src/meta/model/src/table.rs b/src/meta/model/src/table.rs
@@ -29,7 +29,7 @@ use crate::{
 #[derive(
     Clone, Debug, PartialEq, Hash, Copy, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize,
 )]
-#[sea_orm(rs_type = "String", db_type = "String(None)")]
+#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
 pub enum TableType {
     #[sea_orm(string_value = "TABLE")]
     Table,
@@ -65,7 +65,7 @@ impl From<PbTableType> for TableType {
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
-#[sea_orm(rs_type = "String", db_type = "String(None)")]
+#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
 pub enum HandleConflictBehavior {
     #[sea_orm(string_value = "OVERWRITE")]
     Overwrite,

diff --git a/src/meta/model/src/user_privilege.rs b/src/meta/model/src/user_privilege.rs
@@ -19,7 +19,7 @@ use serde::{Deserialize, Serialize};
 use crate::{ObjectId, PrivilegeId, UserId};
 
 #[derive(Clone, Debug, Hash, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
-#[sea_orm(rs_type = "String", db_type = "String(None)")]
+#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
 pub enum Action {
     #[sea_orm(string_value = "INSERT")]
     Insert,

diff --git a/src/meta/model/src/worker.rs b/src/meta/model/src/worker.rs
@@ -21,7 +21,7 @@ use serde::{Deserialize, Serialize};
 use crate::{TransactionId, WorkerId};
 
 #[derive(Clone, Debug, Hash, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
-#[sea_orm(rs_type = "String", db_type = "String(None)")]
+#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
 pub enum WorkerType {
     #[sea_orm(string_value = "FRONTEND")]
     Frontend,
@@ -61,7 +61,7 @@ impl From<WorkerType> for PbWorkerType {
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
-#[sea_orm(rs_type = "String", db_type = "String(None)")]
+#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
 pub enum WorkerStatus {
     #[sea_orm(string_value = "STARTING")]
     Starting,