Merge pull request #365 from lazzyfu/xff

升级tidb parser和优化底层执行逻辑

goinsight-fe/src/views/orders/commit/AuditResult.vue

@@ -47,7 +47,7 @@ const tableColumns = [
     title: '语句',
     dataIndex: 'query',
     key: 'query',
-    width: '25%',
+    width: '30%',
     ellipsis: true,
     scopedSlots: {
       customRender: 'query',
@@ -57,7 +57,7 @@ const tableColumns = [
     title: '提示',
     dataIndex: 'summary',
     key: 'summary',
-    width: '50%',
+    width: '40%',
     scopedSlots: {
       customRender: 'summary',
     },

goinsight-fe/src/views/orders/commit/index.vue

@@ -459,6 +459,7 @@ export default {
               })
             }
           } else {
+            this.visibleAuditResult = false
             this.$notification.error({
               message: '错误',
               description: res.message,

goinsight-fe/src/views/orders/list/detail.vue

@@ -12,7 +12,9 @@
         <a-descriptions-item label="库名">
           <span style="color: blue">{{ orderDetail.schema }}</span>
         </a-descriptions-item>
-        <a-descriptions-item v-if="orderDetail.sql_type==='EXPORT'" label="文件格式">{{ orderDetail.export_file_format }}</a-descriptions-item>
+        <a-descriptions-item v-if="orderDetail.sql_type === 'EXPORT'" label="文件格式">{{
+          orderDetail.export_file_format
+        }}</a-descriptions-item>
         <a-descriptions-item label="创建时间">{{ orderDetail.created_at }}</a-descriptions-item>
         <a-descriptions-item label="更新时间">{{ orderDetail.updated_at }}</a-descriptions-item>
       </a-descriptions>
@@ -33,7 +35,8 @@
         </a-descriptions-item>
         <a-descriptions-item label="工单备注">
           <span v-if="orderDetail.remark">{{ orderDetail.remark }}</span>
-          <span v-else>无</span></a-descriptions-item>
+          <span v-else>无</span></a-descriptions-item
+        >
         <a-descriptions-item label="工单执行人">
           <span v-if="orderDetail.executor">
             <span v-for="k of orderDetail.executor" :key="k">
@@ -112,43 +115,42 @@
     <!-- 任务进度 -->
     <a-card :bordered="false" v-show="statistics.total != 0" title="任务进度" style="margin-top: 12px">
       <a-row :gutter="16">
-        <a-col :span="4">
+        <a-col :span="3">
           <a-statistic title="任务数" :value="this.statistics.total" style="margin-right: 50px">
             <template #suffix>
               <a-icon type="flag" />
             </template>
           </a-statistic>
         </a-col>
-        <a-col :span="4">
+        <a-col :span="3">
           <a-statistic title="已完成" :value="this.statistics.completed" class="demo-class">
             <template #suffix>
               <a-icon type="flag" />
             </template>
           </a-statistic>
         </a-col>
-        <a-col :span="4">
+        <a-col :span="3">
           <a-statistic title="未执行" :value="this.statistics.unexecuted" class="demo-class">
             <template #suffix>
               <a-icon type="flag" />
             </template>
           </a-statistic>
         </a-col>
-        <a-col :span="4">
+        <a-col :span="3">
           <a-statistic title="已失败" :value="this.statistics.failed" class="demo-class">
             <template #suffix>
               <a-icon type="flag" />
             </template>
           </a-statistic>
         </a-col>
-
-        <a-col :span="4">
+        <a-col :span="3">
           <a-statistic title="执行中" :value="this.statistics.processing" class="demo-class">
             <template #suffix>
               <a-icon type="flag" />
             </template>
           </a-statistic>
         </a-col>
-        <a-col :span="4">
+        <a-col :span="3">
           <a-statistic title="已暂停" :value="this.statistics.paused" class="demo-class">
             <template #suffix>
               <a-icon type="flag" />

goinsight-fe/src/views/orders/tasks/components/TasksResult.vue

@@ -87,7 +87,7 @@ export default {
       cm.setSize('height', `250px`)
     },
     onCmReadyLog(cm) {
-      cm.setSize('height', `200px`)
+      cm.setSize('height', `300px`)
     },
     onCmReadyErr(cm) {
       cm.setSize('height', `100px`)

goinsight-fe/src/views/orders/tasks/index.vue

@@ -225,7 +225,7 @@ export default {
       } else {
         this.$notification.warning({
         message: '警告',
-        description: '当前任务状态不为【未完成】或【已失败】',
+        description: '当前任务状态不为【已完成】或【已失败】',
       })
       }
     },

goinsight/go.mod

@@ -1,94 +1,106 @@
 module goInsight
 
-go 1.19
+go 1.21
 
-require github.com/go-redis/redis/v8 v8.11.5
+require (
+	github.com/ClickHouse/clickhouse-go/v2 v2.13.3
+	github.com/alexmullins/zip v0.0.0-20180717182244-4affb64b04d0
+	github.com/dustin/go-humanize v1.0.1
+	github.com/gin-contrib/cors v1.5.0
+	github.com/go-mysql-org/go-mysql v1.7.0
+	github.com/gorilla/websocket v1.5.1
+	github.com/pquerna/otp v1.4.0
+	github.com/redis/go-redis/v9 v9.3.0
+	github.com/shopspring/decimal v1.3.1
+	github.com/xuri/excelize/v2 v2.8.0
+	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
+)
 
 require (
-	github.com/BurntSushi/toml v1.2.1 // indirect
+	github.com/BurntSushi/toml v1.3.2 // indirect
 	github.com/ClickHouse/ch-go v0.58.2 // indirect
-	github.com/ClickHouse/clickhouse-go/v2 v2.13.3 // indirect
-	github.com/alexmullins/zip v0.0.0-20180717182244-4affb64b04d0 // indirect
 	github.com/andybalholm/brotli v1.0.5 // indirect
-	github.com/benbjohnson/clock v1.3.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
 	github.com/chenzhuoyu/iasm v0.9.1 // indirect
+	github.com/cloudfoundry/gosigar v1.3.6 // indirect
 	github.com/cockroachdb/errors v1.8.1 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect
 	github.com/cockroachdb/redact v1.0.8 // indirect
 	github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect
 	github.com/danjacques/gofslock v0.0.0-20191023191349-0a45f885bc37 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/gin-contrib/cors v1.5.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
 	github.com/go-faster/city v1.0.1 // indirect
 	github.com/go-faster/errors v0.6.1 // indirect
-	github.com/go-mysql-org/go-mysql v1.7.0 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/google/btree v1.1.2 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
-	github.com/klauspost/compress v1.16.7 // indirect
+	github.com/influxdata/tdigest v0.0.1 // indirect
+	github.com/jellydator/ttlcache/v3 v3.0.1 // indirect
+	github.com/klauspost/compress v1.17.1 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/opentracing/basictracer-go v1.0.0 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/paulmach/orb v0.10.0 // indirect
 	github.com/pierrec/lz4/v4 v4.1.18 // indirect
-	github.com/pingcap/errors v0.11.5-0.20221009092201-b66cddb77c32 // indirect
+	github.com/pingcap/errors v0.11.5-0.20231212100244-799fae176cfb // indirect
 	github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c // indirect
-	github.com/pingcap/kvproto v0.0.0-20230426023724-d90a321b46be // indirect
+	github.com/pingcap/kvproto v0.0.0-20231226064240-4f28b82c7860 // indirect
 	github.com/pingcap/log v1.1.1-0.20230317032135-a0d097d16e22 // indirect
 	github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21 // indirect
-	github.com/pingcap/tidb v1.1.0-beta.0.20230530104642-635a4362235e // indirect
-	github.com/pingcap/tidb/parser v0.0.0-20230530104642-635a4362235e // indirect
-	github.com/pingcap/tipb v0.0.0-20230310043643-5362260ee6f7 // indirect
+	github.com/pingcap/tidb v1.1.0-beta.0.20240122141050-52794d985ba6 // indirect
+	github.com/pingcap/tidb/pkg/parser v0.0.0-20240122141050-52794d985ba6 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
-	github.com/pquerna/otp v1.4.0 // indirect
-	github.com/prometheus/client_golang v1.15.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.42.0 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
-	github.com/redis/go-redis/v9 v9.3.0 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
+	github.com/prometheus/client_golang v1.18.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.46.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/richardlehane/mscfb v1.0.4 // indirect
 	github.com/richardlehane/msoleps v1.0.3 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
-	github.com/shirou/gopsutil/v3 v3.23.3 // indirect
-	github.com/shoenig/go-m1cpu v0.1.5 // indirect
-	github.com/shopspring/decimal v1.3.1 // indirect
+	github.com/shirou/gopsutil/v3 v3.23.10 // indirect
+	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726 // indirect
 	github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07 // indirect
-	github.com/tikv/client-go/v2 v2.0.8-0.20230524032653-1b2876693630 // indirect
-	github.com/tikv/pd/client v0.0.0-20230519121736-d15a686a670e // indirect
-	github.com/tklauser/go-sysconf v0.3.11 // indirect
-	github.com/tklauser/numcpus v0.6.0 // indirect
+	github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
+	github.com/tikv/client-go/v2 v2.0.8-0.20240219030752-98ed21b132fa // indirect
+	github.com/tikv/pd/client v0.0.0-20240210135946-3488a653ddd9 // indirect
+	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
+	github.com/twmb/murmur3 v1.1.6 // indirect
 	github.com/uber/jaeger-client-go v2.22.1+incompatible // indirect
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	github.com/xuri/efp v0.0.0-20231025114914-d1ff6096ae53 // indirect
-	github.com/xuri/excelize/v2 v2.8.0 // indirect
 	github.com/xuri/nfp v0.0.0-20230919160717-d98342af3f05 // indirect
-	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	go.opentelemetry.io/otel v1.16.0 // indirect
-	go.opentelemetry.io/otel/trace v1.16.0 // indirect
+	github.com/yusufpapurcu/wmi v1.2.3 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.10 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.10 // indirect
+	go.opentelemetry.io/otel v1.21.0 // indirect
+	go.opentelemetry.io/otel/trace v1.21.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.25.0 // indirect
-	golang.org/x/exp v0.0.0-20221023144134-a1e5550cf13e // indirect
-	golang.org/x/sync v0.3.0 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	google.golang.org/grpc v1.55.0 // indirect
+	go.uber.org/zap v1.26.0 // indirect
+	golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 // indirect
+	golang.org/x/sync v0.5.0 // indirect
+	google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
+	google.golang.org/grpc v1.60.1 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
-	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 )
 
@@ -102,10 +114,10 @@ require (
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.16.0 // indirect
-	github.com/go-sql-driver/mysql v1.7.1 // indirect
+	github.com/go-sql-driver/mysql v1.7.1
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
-	github.com/google/uuid v1.3.1 // indirect
+	github.com/google/uuid v1.4.0
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
@@ -114,12 +126,12 @@ require (
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.0
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
 	github.com/spf13/afero v1.9.5 // indirect
-	github.com/spf13/cast v1.5.1 // indirect
+	github.com/spf13/cast v1.5.1
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
@@ -130,7 +142,7 @@ require (
 	golang.org/x/net v0.21.0 // indirect
 	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )