From 87877f4671b4124eebddfc3cb41920064304b0b3 Mon Sep 17 00:00:00 2001 From: walon Date: Tue, 9 Mar 2021 18:55:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91db=20?= =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E4=B8=BA=E5=90=8C=E6=AD=A5=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20db=E5=90=8C=E6=AD=A5=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=E7=9A=84?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF=EF=BC=88=E5=9B=A0=E4=B8=BA?= =?UTF-8?q?Bright=E6=A1=86=E6=9E=B6=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=BC=95=E8=B5=B7=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Job.Db/Source/Generate/SyncCsRender.cs | 16 +++++++++++----- src/Luban.Job.Db/Source/JobController.cs | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Luban.Job.Db/Source/Generate/SyncCsRender.cs b/src/Luban.Job.Db/Source/Generate/SyncCsRender.cs index dbd2273..1a0d569 100644 --- a/src/Luban.Job.Db/Source/Generate/SyncCsRender.cs +++ b/src/Luban.Job.Db/Source/Generate/SyncCsRender.cs @@ -38,6 +38,7 @@ namespace Luban.Job.Db.Generate var template = t_beanRender ??= Template.Parse(@" {{ name = x.name + full_name = x.full_name parent_def_type = x.parent_def_type fields = x.fields hierarchy_fields = x.hierarchy_fields @@ -86,7 +87,7 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren { if (this.InitedObjectId) { - var txn = Bright.Transaction.TransactionContext.ThreadStaticTxn; + var txn = Bright.Transaction.TransactionContext.ThreadStaticCtx; if (txn == null) return {{field.internal_name}}; var log = ({{field.log_type}})txn.GetField(_objectId_ + {{field.id}}); return log != null ? log.Value : {{field.internal_name}}; @@ -103,7 +104,7 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren {{~end~}} if (this.InitedObjectId) { - var txn = Bright.Transaction.TransactionContext.ThreadStaticTxn; + var txn = Bright.Transaction.TransactionContext.ThreadStaticCtx; txn.PutField(_objectId_ + {{field.id}}, new {{field.log_type}}(this, value)); {{~if field.ctype.need_set_children_root}} value?.InitRoot(GetRoot()); @@ -194,7 +195,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.Transaction.TKey root) + protected override void InitChildrenRoot(Bright.Storage.TKey root) { {{~ for field in hierarchy_fields~}} {{if need_set_children_root field.ctype}}{{field.internal_name}}?.InitRoot(root);{{end}} @@ -237,11 +238,11 @@ namespace {{x.namespace_with_top_module}} public sealed class {{name}} { - public static {{base_table_type}} Table { get; } = new {{internal_table_type}}({{x.table_uid}}); + public static {{base_table_type}} Table { get; } = new {{internal_table_type}}(); private class {{internal_table_type}} : {{base_table_type}} { - public {{internal_table_type}}(int tableId) : base(tableId) + public {{internal_table_type}}() : base({{x.table_uid}}, ""{{x.full_name}}"") { } @@ -276,6 +277,11 @@ public sealed class {{name}} { return Table.Select(key); } + + public static ValueTask<{{db_cs_define_type value_ttype}}> SelectAsync({{db_cs_define_type key_ttype}} key) + { + return Table.SelectAsync<{{db_cs_define_type value_ttype}}>(key); + } } } diff --git a/src/Luban.Job.Db/Source/JobController.cs b/src/Luban.Job.Db/Source/JobController.cs index 3d31c39..6ec1f2a 100644 --- a/src/Luban.Job.Db/Source/JobController.cs +++ b/src/Luban.Job.Db/Source/JobController.cs @@ -99,7 +99,7 @@ namespace Luban.Job.Db { case "cs": { - var render = new AsyncCsRender(); + var render = new SyncCsRender(); foreach (var c in ass.Types.Values) { tasks.Add(Task.Run(() =>