批量操作时，埋点数据标签增加部分sql

NewLifeX · Jun 25, 2024 · 3cb8ea1 · 3cb8ea1
1 parent 6686b44
commit 3cb8ea1
Show file tree

Hide file tree

Showing 11 changed files with 363 additions and 335 deletions.
diff --git a/XCode/DataAccessLayer/Database/DB2.cs b/XCode/DataAccessLayer/Database/DB2.cs
@@ -7,6 +7,7 @@
 using NewLife;
 using NewLife.Collections;
 using NewLife.Data;
+using NewLife.Log;
 using NewLife.Reflection;
 using XCode.Common;
 
@@ -403,6 +404,7 @@ public override Int32 Insert(IDataTable table, IDataColumn[] columns, IEnumerabl
         var ps = new HashSet<String>();
         var sql = GetInsertSql(table, columns, ps);
         var dps = GetParameters(columns, ps, list);
+        DefaultSpan.Current?.AppendTag(sql);
 
         return Execute(sql, CommandType.Text, dps);
     }
@@ -494,6 +496,7 @@ public override Int32 Upsert(IDataTable table, IDataColumn[] columns, ICollectio
         sb.AppendLine("END;");
 
         var sql = sb.Put(true);
+        DefaultSpan.Current?.AppendTag(sql);
 
         var dps = GetParameters(columns, ps, list);
 
@@ -550,6 +553,7 @@ public override Int32 Update(IDataTable table, IDataColumn[] columns, ICollectio
         var ps = new HashSet<String>();
         var sql = GetUpdateSql(table, columns, updateColumns, addColumns, ps);
         if (sql.IsNullOrEmpty()) return 0;
+        DefaultSpan.Current?.AppendTag(sql);
 
         var dps = GetParameters(columns, ps, list);
 

diff --git a/XCode/DataAccessLayer/Database/DaMeng.cs b/XCode/DataAccessLayer/Database/DaMeng.cs
@@ -6,6 +6,7 @@
 using NewLife;
 using NewLife.Collections;
 using NewLife.Data;
+using NewLife.Log;
 using NewLife.Reflection;
 using XCode.Common;
 
@@ -293,6 +294,7 @@ public override Int32 Insert(IDataTable table, IDataColumn[] columns, IEnumerabl
         var ps = new HashSet<String>();
         var sql = GetInsertSql(table, columns, ps);
         var dps = GetParameters(columns, ps, list);
+        DefaultSpan.Current?.AppendTag(sql);
 
         return Execute(sql, CommandType.Text, dps);
     }
@@ -384,6 +386,7 @@ public override Int32 Upsert(IDataTable table, IDataColumn[] columns, ICollectio
         sb.AppendLine("END;");
 
         var sql = sb.Put(true);
+        DefaultSpan.Current?.AppendTag(sql);
 
         var dps = GetParameters(columns, ps, list);
 
@@ -440,6 +443,7 @@ public override Int32 Update(IDataTable table, IDataColumn[] columns, ICollectio
         var ps = new HashSet<String>();
         var sql = GetUpdateSql(table, columns, updateColumns, addColumns, ps);
         if (sql.IsNullOrEmpty()) return 0;
+        DefaultSpan.Current?.AppendTag(sql);
 
         var dps = GetParameters(columns, ps, list);
 

diff --git a/XCode/DataAccessLayer/Database/Hana.cs b/XCode/DataAccessLayer/Database/Hana.cs
@@ -4,6 +4,7 @@
 using NewLife;
 using NewLife.Collections;
 using NewLife.Data;
+using NewLife.Log;
 
 namespace XCode.DataAccessLayer;
 
@@ -272,8 +273,9 @@ private String GetBatchSql(String action, IDataTable table, IDataColumn[] column
         var db = Database as DbBase;
 
         // 字段列表
-        if (columns == null) columns = table.Columns.ToArray();
+        columns ??= table.Columns.ToArray();
         BuildInsert(sb, db, action, table, columns);
+        DefaultSpan.Current?.AppendTag(sb.ToString());
 
         // 值列表
         sb.Append(" Values");

diff --git a/XCode/DataAccessLayer/Database/HighGo.cs b/XCode/DataAccessLayer/Database/HighGo.cs
diff --git a/XCode/DataAccessLayer/Database/KingBase.cs b/XCode/DataAccessLayer/Database/KingBase.cs
@@ -3,6 +3,7 @@
 using NewLife;
 using NewLife.Collections;
 using NewLife.Data;
+using NewLife.Log;
 using NewLife.Web;
 
 namespace XCode.DataAccessLayer;
@@ -121,8 +122,9 @@ string GetBatchSql(String action, IDataTable table, IDataColumn[] columns, IColl
         var db = Database as DbBase;
 
         // 字段列表
-        if (columns == null) columns = table.Columns.ToArray();
+        columns ??= table.Columns.ToArray();
         BuildInsert(sb, db, action, table, columns);
+        DefaultSpan.Current?.AppendTag(sb.ToString());
 
         // 值列表
         sb.Append(" Values");

diff --git a/XCode/DataAccessLayer/Database/MySql.cs b/XCode/DataAccessLayer/Database/MySql.cs
@@ -4,6 +4,7 @@
 using NewLife;
 using NewLife.Collections;
 using NewLife.Data;
+using NewLife.Log;
 
 namespace XCode.DataAccessLayer;
 
@@ -315,8 +316,9 @@ private String GetBatchSql(String action, IDataTable table, IDataColumn[] column
         var db = Database as DbBase;
 
         // 字段列表
-        if (columns == null) columns = table.Columns.ToArray();
+        columns ??= table.Columns.ToArray();
         BuildInsert(sb, db, action, table, columns);
+        DefaultSpan.Current?.AppendTag(sb.ToString());
 
         // 值列表
         sb.Append(" Values");

diff --git a/XCode/DataAccessLayer/Database/Oracle.cs b/XCode/DataAccessLayer/Database/Oracle.cs
@@ -6,6 +6,7 @@
 using NewLife;
 using NewLife.Collections;
 using NewLife.Data;
+using NewLife.Log;
 using NewLife.Reflection;
 using XCode.Common;
 
@@ -549,6 +550,7 @@ public override Int32 Insert(IDataTable table, IDataColumn[] columns, IEnumerabl
         var ps = new HashSet<String>();
         var sql = GetInsertSql(table, columns, ps);
         var dps = GetParameters(columns, ps, list);
+        DefaultSpan.Current?.AppendTag(sql);
 
         return Execute(sql, CommandType.Text, dps);
     }
@@ -639,6 +641,7 @@ public override Int32 Upsert(IDataTable table, IDataColumn[] columns, ICollectio
         sb.AppendLine("END;");
 
         var sql = sb.Put(true);
+        DefaultSpan.Current?.AppendTag(sql);
 
         var dps = GetParameters(columns, ps, list);
 
@@ -695,6 +698,7 @@ public override Int32 Update(IDataTable table, IDataColumn[] columns, ICollectio
         var ps = new HashSet<String>();
         var sql = GetUpdateSql(table, columns, updateColumns, addColumns, ps);
         var dps = GetParameters(columns, ps, list);
+        DefaultSpan.Current?.AppendTag(sql);
 
         return Execute(sql, CommandType.Text, dps);
     }

diff --git a/XCode/DataAccessLayer/Database/PostgreSQL.cs b/XCode/DataAccessLayer/Database/PostgreSQL.cs
@@ -5,6 +5,7 @@
 using NewLife;
 using NewLife.Collections;
 using NewLife.Data;
+using NewLife.Log;
 
 namespace XCode.DataAccessLayer;
 
@@ -271,8 +272,9 @@ private String GetBatchSql(String action, IDataTable table, IDataColumn[] column
         var db = Database as DbBase;
 
         // 字段列表
-        if (columns == null) columns = table.Columns.ToArray();
+        columns ??= table.Columns.ToArray();
         BuildInsert(sb, db, action, table, columns);
+        DefaultSpan.Current?.AppendTag(sb.ToString());
 
         // 值列表
         sb.Append(" Values");

diff --git a/XCode/DataAccessLayer/Database/SQLite.cs b/XCode/DataAccessLayer/Database/SQLite.cs
@@ -347,8 +347,9 @@ private String GetBatchSql(String action, IDataTable table, IDataColumn[] column
         var db = Database as DbBase;
 
         // 字段列表
-        if (columns == null) columns = table.Columns.ToArray();
+        columns ??= table.Columns.ToArray();
         BuildInsert(sb, db, action, table, columns);
+        DefaultSpan.Current?.AppendTag(sb.ToString());
 
         // 值列表
         sb.Append(" Values");

diff --git a/XCode/DataAccessLayer/Database/SqlServer.cs b/XCode/DataAccessLayer/Database/SqlServer.cs
@@ -610,6 +610,7 @@ public override Int32 Insert(IDataTable table, IDataColumn[] columns, IEnumerabl
         var ps = new HashSet<String>();
         var sql = GetInsertSql(table, columns, ps);
         var dpsList = GetParametersList(columns, ps, list);
+        DefaultSpan.Current?.AppendTag(sql);
 
         return BatchExecute(sql, dpsList);
     }
@@ -664,6 +665,7 @@ public override Int32 Upsert(IDataTable table, IDataColumn[] columns, ICollectio
         sb.AppendLine(";");
         sb.AppendLine("END;");
         var sql = sb.Put(true);
+        DefaultSpan.Current?.AppendTag(sql);
 
         var dpsList = GetParametersList(columns, ps, list, true);
         return BatchExecute(sql, dpsList);

diff --git a/XCode/DataAccessLayer/Database/TDengine.cs b/XCode/DataAccessLayer/Database/TDengine.cs
@@ -5,6 +5,7 @@
 using NewLife;
 using NewLife.Collections;
 using NewLife.Data;
+using NewLife.Log;
 using NewLife.Web;
 using XCode.TDengine;
 
@@ -193,8 +194,9 @@ private String GetBatchSql(String action, IDataTable table, IDataColumn[] column
         var db = Database as DbBase;
 
         // 字段列表
-        if (columns == null) columns = table.Columns.ToArray();
+        columns ??= table.Columns.ToArray();
         BuildInsert(sb, db, action, table, columns);
+        DefaultSpan.Current?.AppendTag(sb.ToString());
 
         // 值列表
         sb.Append(" Values");