From bf03d47784146fb186d6a438b985517df226c7ae Mon Sep 17 00:00:00 2001 From: walon Date: Thu, 4 Nov 2021 16:22:28 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91=E8=B7=9F?= =?UTF-8?q?=E9=9A=8Fbrightdb=E8=B0=83=E6=95=B4=EF=BC=8C=E7=94=9F=E6=88=90?= =?UTF-8?q?=E4=B8=8E=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC=E7=9B=B8=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Job.Db/Source/Defs/DefTable.cs | 2 +- .../Source/TypeVisitors/DbCsDefineTypeVisitor.cs | 6 +++--- src/Luban.Server/Templates/db/cs_async/bean.tpl | 12 ++++++------ src/Luban.Server/Templates/db/cs_async/tables.tpl | 2 +- src/Luban.Server/Templates/db/cs_sync/bean.tpl | 10 +++++----- src/Luban.Server/Templates/db/cs_sync/tables.tpl | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Luban.Job.Db/Source/Defs/DefTable.cs b/src/Luban.Job.Db/Source/Defs/DefTable.cs index 1a0f2cf..409b002 100644 --- a/src/Luban.Job.Db/Source/Defs/DefTable.cs +++ b/src/Luban.Job.Db/Source/Defs/DefTable.cs @@ -32,7 +32,7 @@ namespace Luban.Job.Db.Defs public string InternalTableType => "_" + Name; - public string BaseTableType => $"Bright.Transaction.{(KeyTType is TLong ? "Long" : "String")}TxnTable<{ValueTType.Apply(DbCsDefineTypeVisitor.Ins)}>"; + public string BaseTableType => $"BrightDB.Transaction.{(KeyTType is TLong ? "Long" : "String")}TxnTable<{ValueTType.Apply(DbCsDefineTypeVisitor.Ins)}>"; public override void Compile() { diff --git a/src/Luban.Job.Db/Source/TypeVisitors/DbCsDefineTypeVisitor.cs b/src/Luban.Job.Db/Source/TypeVisitors/DbCsDefineTypeVisitor.cs index 1d64f59..fe9a695 100644 --- a/src/Luban.Job.Db/Source/TypeVisitors/DbCsDefineTypeVisitor.cs +++ b/src/Luban.Job.Db/Source/TypeVisitors/DbCsDefineTypeVisitor.cs @@ -15,17 +15,17 @@ namespace Luban.Job.Db.TypeVisitors public override string Accept(TList type) { - return $"Bright.Transaction.Collections.{(type.ElementType is TBean ? " PList2" : "PList1")}<{type.ElementType.Apply(this)}>"; + return $"BrightDB.Transaction.Collections.{(type.ElementType is TBean ? " PList2" : "PList1")}<{type.ElementType.Apply(this)}>"; } public override string Accept(TSet type) { - return $"Bright.Transaction.Collections.PSet<{type.ElementType.Apply(this)}>"; + return $"BrightDB.Transaction.Collections.PSet<{type.ElementType.Apply(this)}>"; } public override string Accept(TMap type) { - return $"Bright.Transaction.Collections.{(type.ValueType is TBean ? " PMap2" : "PMap1")}<{type.KeyType.Apply(this)}, {type.ValueType.Apply(this)}>"; + return $"BrightDB.Transaction.Collections.{(type.ValueType is TBean ? " PMap2" : "PMap1")}<{type.KeyType.Apply(this)}, {type.ValueType.Apply(this)}>"; } } } diff --git a/src/Luban.Server/Templates/db/cs_async/bean.tpl b/src/Luban.Server/Templates/db/cs_async/bean.tpl index f77b3a6..6a9fee9 100644 --- a/src/Luban.Server/Templates/db/cs_async/bean.tpl +++ b/src/Luban.Server/Templates/db/cs_async/bean.tpl @@ -29,7 +29,7 @@ public interface {{readonly_name}} {{if parent_def_type}}: IReadOnly{{x.parent_d /// {{x.escape_comment}} /// {{~end~}} -public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.parent}} {{else}} Bright.Transaction.TxnBeanBase {{end}}, {{readonly_name}} +public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.parent}} {{else}} BrightDB.Transaction.TxnBeanBase {{end}}, {{readonly_name}} { {{~ for field in fields~}} {{if is_abstract_type}}protected{{else}}private{{end}} {{db_cs_define_type field.ctype}} {{field.internal_name}}; @@ -46,7 +46,7 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren {{ctype = field.ctype}} {{~if has_setter ctype~}} - private sealed class {{field.log_type}} : Bright.Transaction.FieldLogger<{{name}}, {{db_cs_define_type ctype}}> + private sealed class {{field.log_type}} : BrightDB.Transaction.FieldLogger<{{name}}, {{db_cs_define_type ctype}}> { public {{field.log_type}}({{name}} self, {{db_cs_define_type ctype}} value) : base(self, value) { } @@ -74,7 +74,7 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren { if (this.IsManaged) { - var txn = Bright.Transaction.TransactionContext.ThreadStaticCtx; + var txn = BrightDB.Transaction.TransactionContext.ThreadStaticCtx; if (txn == null) return {{field.internal_name}}; var log = ({{field.log_type}})txn.GetField(this.GetObjectId() + {{field.id}}); return log != null ? log.Value : {{field.internal_name}}; @@ -91,7 +91,7 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren {{~end~}} if (this.IsManaged) { - var txn = Bright.Transaction.TransactionContext.ThreadStaticCtx; + var txn = BrightDB.Transaction.TransactionContext.ThreadStaticCtx; txn.PutField(this.GetObjectId() + {{field.id}}, new {{field.log_type}}(this, value)); {{~if ctype.need_set_children_root}} value?.InitRoot(GetRoot()); @@ -125,7 +125,7 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren /// {{field.escape_comment}} /// {{~end~}} - {{db_cs_readonly_define_type ctype}} {{readonly_name}}.{{field.convention_name}} => new Bright.Transaction.Collections.PReadOnlyMap<{{db_cs_readonly_define_type ctype.key_type}}, {{db_cs_readonly_define_type ctype.value_type}}, {{db_cs_define_type ctype.value_type}}>({{field.internal_name}}); + {{db_cs_readonly_define_type ctype}} {{readonly_name}}.{{field.convention_name}} => new BrightDB.Transaction.Collections.PReadOnlyMap<{{db_cs_readonly_define_type ctype.key_type}}, {{db_cs_readonly_define_type ctype.value_type}}, {{db_cs_define_type ctype.value_type}}>({{field.internal_name}}); {{~end~}} {{~end~}} @@ -180,7 +180,7 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren public override int GetTypeId() => ID; {{~end~}} - protected override void InitChildrenRoot(Bright.Storage.TKey root) + protected override void InitChildrenRoot(BrightDB.Storage.TKey root) { {{~ for field in hierarchy_fields~}} {{~if need_set_children_root field.ctype~}} diff --git a/src/Luban.Server/Templates/db/cs_async/tables.tpl b/src/Luban.Server/Templates/db/cs_async/tables.tpl index 8718064..fa138c2 100644 --- a/src/Luban.Server/Templates/db/cs_async/tables.tpl +++ b/src/Luban.Server/Templates/db/cs_async/tables.tpl @@ -5,7 +5,7 @@ namespace {{namespace}} public static class {{name}} { - public static System.Collections.Generic.List TableList { get; } = new System.Collections.Generic.List + public static System.Collections.Generic.List TableList { get; } = new System.Collections.Generic.List { {{~ for table in tables~}} {{table.full_name}}.Table, diff --git a/src/Luban.Server/Templates/db/cs_sync/bean.tpl b/src/Luban.Server/Templates/db/cs_sync/bean.tpl index f77b3a6..ea95cd5 100644 --- a/src/Luban.Server/Templates/db/cs_sync/bean.tpl +++ b/src/Luban.Server/Templates/db/cs_sync/bean.tpl @@ -29,7 +29,7 @@ public interface {{readonly_name}} {{if parent_def_type}}: IReadOnly{{x.parent_d /// {{x.escape_comment}} /// {{~end~}} -public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.parent}} {{else}} Bright.Transaction.TxnBeanBase {{end}}, {{readonly_name}} +public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.parent}} {{else}} BrightDB.Transaction.TxnBeanBase {{end}}, {{readonly_name}} { {{~ for field in fields~}} {{if is_abstract_type}}protected{{else}}private{{end}} {{db_cs_define_type field.ctype}} {{field.internal_name}}; @@ -46,7 +46,7 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren {{ctype = field.ctype}} {{~if has_setter ctype~}} - private sealed class {{field.log_type}} : Bright.Transaction.FieldLogger<{{name}}, {{db_cs_define_type ctype}}> + private sealed class {{field.log_type}} : BrightDB.Transaction.FieldLogger<{{name}}, {{db_cs_define_type ctype}}> { public {{field.log_type}}({{name}} self, {{db_cs_define_type ctype}} value) : base(self, value) { } @@ -74,7 +74,7 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren { if (this.IsManaged) { - var txn = Bright.Transaction.TransactionContext.ThreadStaticCtx; + var txn = BrightDB.Transaction.TransactionContext.ThreadStaticCtx; if (txn == null) return {{field.internal_name}}; var log = ({{field.log_type}})txn.GetField(this.GetObjectId() + {{field.id}}); return log != null ? log.Value : {{field.internal_name}}; @@ -91,7 +91,7 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren {{~end~}} if (this.IsManaged) { - var txn = Bright.Transaction.TransactionContext.ThreadStaticCtx; + var txn = BrightDB.Transaction.TransactionContext.ThreadStaticCtx; txn.PutField(this.GetObjectId() + {{field.id}}, new {{field.log_type}}(this, value)); {{~if ctype.need_set_children_root}} value?.InitRoot(GetRoot()); @@ -125,7 +125,7 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren /// {{field.escape_comment}} /// {{~end~}} - {{db_cs_readonly_define_type ctype}} {{readonly_name}}.{{field.convention_name}} => new Bright.Transaction.Collections.PReadOnlyMap<{{db_cs_readonly_define_type ctype.key_type}}, {{db_cs_readonly_define_type ctype.value_type}}, {{db_cs_define_type ctype.value_type}}>({{field.internal_name}}); + {{db_cs_readonly_define_type ctype}} {{readonly_name}}.{{field.convention_name}} => new BrightDB.Transaction.Collections.PReadOnlyMap<{{db_cs_readonly_define_type ctype.key_type}}, {{db_cs_readonly_define_type ctype.value_type}}, {{db_cs_define_type ctype.value_type}}>({{field.internal_name}}); {{~end~}} {{~end~}} diff --git a/src/Luban.Server/Templates/db/cs_sync/tables.tpl b/src/Luban.Server/Templates/db/cs_sync/tables.tpl index a2dcb33..e4c4e56 100644 --- a/src/Luban.Server/Templates/db/cs_sync/tables.tpl +++ b/src/Luban.Server/Templates/db/cs_sync/tables.tpl @@ -5,7 +5,7 @@ namespace {{namespace}} public static class {{name}} { - public static System.Collections.Generic.List TableList { get; } = new System.Collections.Generic.List + public static System.Collections.Generic.List TableList { get; } = new System.Collections.Generic.List { {{~ for table in tables~}} {{table.full_name}}.Table,