Browse Source

open util

libf 3 tháng trước cách đây
mục cha
commit
4795c0a9f6
12 tập tin đã thay đổi với 27 bổ sung30 xóa
  1. 4 5
      go.mod
  2. 8 10
      go.sum
  3. 1 1
      graph/edgeinfo.go
  4. 1 1
      importer/cgistatus.go
  5. 1 1
      importer/datainfo.go
  6. 2 2
      importer/importer.go
  7. 2 2
      importer/odbcimporter.go
  8. 2 2
      odbc/cfg.go
  9. 1 1
      odbc/odbclient.go
  10. 1 1
      schema/classinfo.go
  11. 3 3
      sqlite/sqldb.go
  12. 1 1
      sqlite/sqlvalue.go

+ 4 - 5
go.mod

@@ -3,12 +3,11 @@ module git.wecise.com/wecise/cgimport
 go 1.20
 
 require (
-	git.wecise.com/wecise/odb-go v0.0.0-20250212072429-c71a97f66859
-	git.wecise.com/wecise/util v0.0.0-20250211130446-7940676f0a44
+	git.wecise.com/wecise/odb-go v0.0.0-20250212095024-d3ceac66fe05
 	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13
 	github.com/scylladb/go-set v1.0.3-0.20200225121959-cc7b2070d91e
 	github.com/spf13/cast v1.7.0
-	github.com/wecisecode/util v0.0.0-20250211095752-7b0229971c4a
+	github.com/wecisecode/util v0.0.0-20250212093710-d44d3c1dbcac
 	modernc.org/sqlite v1.30.1
 )
 
@@ -40,8 +39,8 @@ require (
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.17.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect

+ 8 - 10
go.sum

@@ -1,7 +1,5 @@
-git.wecise.com/wecise/odb-go v0.0.0-20250212072429-c71a97f66859 h1:AVvCMUNkBvaxMh63IGfKaA3Jz1m/WUI7iH4lKeJcZj0=
-git.wecise.com/wecise/odb-go v0.0.0-20250212072429-c71a97f66859/go.mod h1:0T/iXlwXGZTVpSW9GnvRQMa2ucjg1HnVFO2IeHeuMhg=
-git.wecise.com/wecise/util v0.0.0-20250211130446-7940676f0a44 h1:kfzUFxCxLdlhOoBaP0SFYCwvTl6qFOReFnNXZJ5sel4=
-git.wecise.com/wecise/util v0.0.0-20250211130446-7940676f0a44/go.mod h1:9349QCkjPB2gs9a+kCzwHgMtOuf+KovY/2uRkLT4w3A=
+git.wecise.com/wecise/odb-go v0.0.0-20250212095024-d3ceac66fe05 h1:jIw0AzhUw8bb3XitYlrYTrRsovO87X0CPVUgeDIQUFY=
+git.wecise.com/wecise/odb-go v0.0.0-20250212095024-d3ceac66fe05/go.mod h1:mzQ6s4PMIy5H3JL0sPDfaMbeepCexm0eq9c3sbKImhY=
 github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw=
 github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0=
 github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao=
@@ -77,8 +75,8 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU
 github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
-github.com/wecisecode/util v0.0.0-20250211095752-7b0229971c4a h1:vA4zLRyhLT8ggWQ9z0GKXwOdflvlUj4srN2rJTEShu4=
-github.com/wecisecode/util v0.0.0-20250211095752-7b0229971c4a/go.mod h1:JuKKMe2bEPXEDz3oFuCidZnW+0jdXWhUGFNPmkgsz78=
+github.com/wecisecode/util v0.0.0-20250212093710-d44d3c1dbcac h1:4iVHQNUKZCiuYvXdP0xVq5T/KTKJd3StiDEhSxCundI=
+github.com/wecisecode/util v0.0.0-20250212093710-d44d3c1dbcac/go.mod h1:lZZE2bgkzjh4lH+fHuW+tV5dC97Ba6dDS57tsa+ZwYc=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.etcd.io/etcd/api/v3 v3.5.8 h1:Zf44zJszoU7zRV0X/nStPenegNXoFDWcB/MwrJbA+L4=
@@ -103,8 +101,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -114,8 +112,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=

+ 1 - 1
graph/edgeinfo.go

@@ -5,8 +5,8 @@ import (
 	"sync"
 
 	"git.wecise.com/wecise/cgimport/schema"
-	"git.wecise.com/wecise/util/deepcopy"
 	"github.com/spf13/cast"
+	"github.com/wecisecode/util/deepcopy"
 	"github.com/wecisecode/util/merrs"
 )
 

+ 1 - 1
importer/cgistatus.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"git.wecise.com/wecise/cgimport/odbc"
-	"git.wecise.com/wecise/util/rc"
+	"github.com/wecisecode/util/rc"
 )
 
 type ImportStatus struct {

+ 1 - 1
importer/datainfo.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"git.wecise.com/wecise/cgimport/schema"
-	"git.wecise.com/wecise/util/cmap"
+	"github.com/wecisecode/util/cmap"
 	"github.com/wecisecode/util/merrs"
 )
 

+ 2 - 2
importer/importer.go

@@ -16,9 +16,9 @@ import (
 	"git.wecise.com/wecise/cgimport/odbc"
 	"git.wecise.com/wecise/cgimport/reader"
 	"git.wecise.com/wecise/cgimport/schema"
-	"git.wecise.com/wecise/util/filewalker"
-	"git.wecise.com/wecise/util/rc"
+	"github.com/wecisecode/util/filewalker"
 	"github.com/wecisecode/util/merrs"
+	"github.com/wecisecode/util/rc"
 )
 
 var mcfg = odbc.Config

+ 2 - 2
importer/odbcimporter.go

@@ -10,10 +10,10 @@ import (
 	"git.wecise.com/wecise/cgimport/graph"
 	"git.wecise.com/wecise/cgimport/odbc"
 	"git.wecise.com/wecise/odb-go/odb"
-	"git.wecise.com/wecise/util/cast"
-	"git.wecise.com/wecise/util/cmap"
 	"github.com/dgryski/go-farm"
 	"github.com/scylladb/go-set/strset"
+	"github.com/wecisecode/util/cast"
+	"github.com/wecisecode/util/cmap"
 	"github.com/wecisecode/util/merrs"
 )
 

+ 2 - 2
odbc/cfg.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"path/filepath"
 
-	ucfg "git.wecise.com/wecise/util/cfg"
-	ulog "git.wecise.com/wecise/util/logger"
+	ucfg "github.com/wecisecode/util/cfg"
+	ulog "github.com/wecisecode/util/logger"
 )
 
 var DefaultAppName = "cgimport"

+ 1 - 1
odbc/odbclient.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	odb "git.wecise.com/wecise/odb-go/odb"
-	ucfg "git.wecise.com/wecise/util/cfg"
 	"github.com/scylladb/go-set/strset"
+	ucfg "github.com/wecisecode/util/cfg"
 )
 
 var ODBClient odb.Client

+ 1 - 1
schema/classinfo.go

@@ -3,8 +3,8 @@ package schema
 import (
 	"strings"
 
-	"git.wecise.com/wecise/util/cmap"
 	"github.com/scylladb/go-set/strset"
+	"github.com/wecisecode/util/cmap"
 )
 
 type FieldInfo struct {

+ 3 - 3
sqlite/sqldb.go

@@ -12,11 +12,11 @@ import (
 	"time"
 
 	"git.wecise.com/wecise/cgimport/sqlite/schema"
-	"git.wecise.com/wecise/util/cmap"
-	"git.wecise.com/wecise/util/msgpack"
-	"git.wecise.com/wecise/util/rc"
 	"github.com/spf13/cast"
+	"github.com/wecisecode/util/cmap"
 	"github.com/wecisecode/util/merrs"
+	"github.com/wecisecode/util/msgpack"
+	"github.com/wecisecode/util/rc"
 	"modernc.org/sqlite"
 	sqlite3 "modernc.org/sqlite/lib"
 )

+ 1 - 1
sqlite/sqlvalue.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"git.wecise.com/wecise/util/msgpack"
 	"github.com/spf13/cast"
+	"github.com/wecisecode/util/msgpack"
 )
 
 func BlobMarshal(v interface{}) (s string) {