From 5c9d91ff639aa63352dd930f629cd8473d574433 Mon Sep 17 00:00:00 2001 From: loveuer Date: Fri, 27 Dec 2024 11:13:28 +0800 Subject: [PATCH] chore: downgrade go version 1.20 --- Dockerfile | 8 ++--- go.mod | 23 +++++++----- go.sum | 47 +++++++++++------------- internal/database/db/client.go | 22 ++---------- internal/database/db/db_test.go | 44 ----------------------- internal/database/db/new.go | 26 +++++++++----- internal/database/db/option.go | 27 -------------- internal/database/db/sqlite.go | 63 --------------------------------- internal/invoke/client.go | 16 ++++----- internal/invoke/resolve_v2.go | 2 -- main.go | 4 ++- 11 files changed, 66 insertions(+), 216 deletions(-) delete mode 100644 internal/database/db/db_test.go delete mode 100644 internal/database/db/option.go delete mode 100644 internal/database/db/sqlite.go diff --git a/Dockerfile b/Dockerfile index 22697cb..0e43950 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -#FROM golang:1.20-alpine AS builder -FROM repository.umisen.com/external/golang:latest AS builder +FROM golang:alpine AS builder ENV GO111MODULE on ENV CGO_ENABLED 0 @@ -13,10 +12,7 @@ COPY . . RUN go mod download RUN go build -ldflags '-s -w' -o server . -#FROM alpine:latest -FROM repository.umisen.com/external/alpine:latest - -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories && apk add curl +FROM alpine:latest ENV TZ Asia/Shanghai diff --git a/go.mod b/go.mod index c5372c0..d969e9b 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module ultone -go 1.21 +go 1.20 -toolchain go1.23.0 +toolchain go1.23.4 require ( - gitea.com/taozitaozi/gredis v0.0.0-20240131032054-b02845ce1e9d + gitea.com/taozitaozi/gredis v0.0.0-20241226104049-af698e5ad477 github.com/elastic/go-elasticsearch/v7 v7.17.10 github.com/go-redis/redis/v8 v8.11.5 github.com/golang-jwt/jwt/v5 v5.2.0 @@ -14,12 +14,9 @@ require ( github.com/jackc/pgtype v1.12.0 github.com/jedib0t/go-pretty/v6 v6.5.9 github.com/loveuer/esgo2dump v0.3.3 - github.com/loveuer/go-sqlite3 v1.0.2 github.com/loveuer/nf v0.2.12 github.com/loveuer/ngorm/v2 v2.1.1 - github.com/ncruces/go-sqlite3/gormlite v0.18.0 github.com/olivere/elastic/v7 v7.0.32 - github.com/psanford/httpreadat v0.1.0 github.com/rabbitmq/amqp091-go v1.10.0 github.com/samber/lo v1.39.0 github.com/segmentio/kafka-go v0.4.47 @@ -34,11 +31,22 @@ require ( gorm.io/gorm v1.25.12 ) +require ( + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/glebarez/go-sqlite v1.21.2 // indirect + github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect + modernc.org/libc v1.22.5 // indirect + modernc.org/mathutil v1.5.0 // indirect + modernc.org/memory v1.5.0 // indirect + modernc.org/sqlite v1.23.1 // indirect +) + require ( github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295 // indirect github.com/fatih/color v1.17.0 // indirect + github.com/glebarez/sqlite v1.11.0 github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -58,15 +66,12 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect - github.com/ncruces/go-sqlite3 v0.18.3 // indirect - github.com/ncruces/julianday v1.0.0 // indirect github.com/pierrec/lz4/v4 v4.1.15 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.9.0 // indirect github.com/tdewolff/parse/v2 v2.7.11 // indirect - github.com/tetratelabs/wazero v1.8.0 // indirect github.com/vesoft-inc/nebula-go/v3 v3.5.0 // indirect golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect golang.org/x/net v0.27.0 // indirect diff --git a/go.sum b/go.sum index d05c12a..87095eb 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -gitea.com/taozitaozi/gredis v0.0.0-20240131032054-b02845ce1e9d h1:TpEOdRGqwzxx+DaN18nFE+g4EQYjneZOO1jcHtSon/g= -gitea.com/taozitaozi/gredis v0.0.0-20240131032054-b02845ce1e9d/go.mod h1:QtcL846XUtSnhmW6TZAujUQ9V5jalY7frxzZOs00kFI= +gitea.com/taozitaozi/gredis v0.0.0-20241226104049-af698e5ad477 h1:jfUtwW/lOVTqS7xbTuJsKB/fjOEZG21VhgQMXyLrPq8= +gitea.com/taozitaozi/gredis v0.0.0-20241226104049-af698e5ad477/go.mod h1:E5Y+tGZwLdT3Z7oHocc+7C3vOpPTDPd09LXwIDVbnFA= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= @@ -20,6 +20,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxxUhhltAs3Gyu1yo= github.com/elastic/go-elasticsearch/v7 v7.17.10/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -31,11 +33,12 @@ github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295/go.mod h1:2tn github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= -github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= -github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo= +github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k= +github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw= +github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= @@ -69,6 +72,7 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -140,12 +144,10 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -153,8 +155,6 @@ github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/loveuer/esgo2dump v0.3.3 h1:/AidoaFV7bDRyT1ycyBKs4XGmyVs2ShaUKrpEBiUWkM= github.com/loveuer/esgo2dump v0.3.3/go.mod h1:thZvfsO0kd7Ck3TA0jc9rRc4CuIa4Iuiq6tF3tCqXEY= -github.com/loveuer/go-sqlite3 v1.0.2 h1:kcENqm6mt0wPH/N9Sw+6UC74qtU8o+aMEO04I62pjDE= -github.com/loveuer/go-sqlite3 v1.0.2/go.mod h1:8+45etSlBYCtYP/ThX/e1wLgG+x6G6oXck2FhjC57tA= github.com/loveuer/nf v0.2.12 h1:1Og+ORHsOWKFmy9kKJhjvXDkdbaurH82HjIxuGA3nNM= github.com/loveuer/nf v0.2.12/go.mod h1:M6reF17/kJBis30H4DxR5hrtgo/oJL4AV4cBe4HzJLw= github.com/loveuer/ngorm/v2 v2.1.1 h1:v+ut5BjeSBFU87o800pI8Q3fXEOUAkvk5+btMw2oOEc= @@ -173,20 +173,11 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/ncruces/go-sqlite3 v0.18.3 h1:tyMa75uh7LcINcfo0WrzOvcTkfz8Hqu0TEPX+KVyes4= -github.com/ncruces/go-sqlite3 v0.18.3/go.mod h1:HAwOtA+cyEX3iN6YmkpQwfT4vMMgCB7rQRFUdOgEFik= -github.com/ncruces/go-sqlite3/gormlite v0.18.0 h1:KqP9a9wlX/Ba+yG+aeVX4pnNBNdaSO6xHdNDWzPxPnk= -github.com/ncruces/go-sqlite3/gormlite v0.18.0/go.mod h1:RXeT1hknrz3A0tBDL6IfluDHuNkHdJeImn5TBMQg9zc= -github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt7M= -github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/olivere/elastic/v7 v7.0.32 h1:R7CXvbu8Eq+WlsLgxmKVKPox0oOwAE/2T9Si5BnvK6E= github.com/olivere/elastic/v7 v7.0.32/go.mod h1:c7PVmLe3Fxq77PIfY/bZmxY/TAamBhCzZ8xDOE09a9k= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= -github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0= github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -195,15 +186,15 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/psanford/httpreadat v0.1.0 h1:VleW1HS2zO7/4c7c7zNl33fO6oYACSagjJIyMIwZLUE= -github.com/psanford/httpreadat v0.1.0/go.mod h1:Zg7P+TlBm3bYbyHTKv/EdtSJZn3qwbPwpfZ/I9GKCRE= github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw= github.com/rabbitmq/amqp091-go v1.10.0/go.mod h1:Hy4jKW5kQART1u+JkDTF9YYOQUHXqMuhrgxOEeS7G4o= +github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= @@ -245,9 +236,6 @@ github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIk github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= -github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= -github.com/tetratelabs/wazero v1.8.0 h1:iEKu0d4c2Pd+QSRieYbnQC9yiFlMS9D+Jr0LsRmcF4g= -github.com/tetratelabs/wazero v1.8.0/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs= github.com/vesoft-inc/nebula-go/v3 v3.5.0 h1:2ZSkoBxtIfs15AXJXqrAPDPd0Z9HrzKR7YKXPqlJcR0= github.com/vesoft-inc/nebula-go/v3 v3.5.0/go.mod h1:+sXv05jYQBARdTbTcIEsWVXCnF/6ttOlDK35xQ6m54s= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= @@ -264,7 +252,6 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= -go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= @@ -421,10 +408,8 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -439,3 +424,11 @@ gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE= +modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY= +modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ= +modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= +modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= +modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM= +modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk= diff --git a/internal/database/db/client.go b/internal/database/db/client.go index 780771f..15ef5d7 100644 --- a/internal/database/db/client.go +++ b/internal/database/db/client.go @@ -2,7 +2,6 @@ package db import ( "context" - "io" "ultone/internal/opt" "ultone/internal/tool" @@ -21,10 +20,9 @@ const ( ) type Client struct { - ctx context.Context - cli *gorm.DB - dbType DBType - cfgSqlite *cfgSqlite + ctx context.Context + cli *gorm.DB + dbType DBType } func (c *Client) Type() DBType { @@ -52,17 +50,3 @@ func (c *Client) Close() { d, _ := c.cli.DB() d.Close() } - -// Dump -// Only for sqlite with mem mode to dump data to bytes(io.Reader) -func (c *Client) Dump() (reader io.ReadSeekCloser, ok bool) { - if c.dbType != DBTypeSqlite { - return nil, false - } - - if c.cfgSqlite.fsType != "mem" { - return nil, false - } - - return c.cfgSqlite.memDump.Dump(), true -} diff --git a/internal/database/db/db_test.go b/internal/database/db/db_test.go deleted file mode 100644 index 0d28b38..0000000 --- a/internal/database/db/db_test.go +++ /dev/null @@ -1,44 +0,0 @@ -package db - -import ( - "context" - "io" - "os" - "testing" -) - -func TestOpen(t *testing.T) { - myClient, err := New(context.TODO(), "sqlite::", OptSqliteByMem(nil)) - if err != nil { - t.Fatalf("TestOpen: New err = %v", err) - } - - type Start struct { - Id int `json:"id" gorm:"column:id;primaryKey"` - Name string `json:"name" gorm:"column:name"` - Dis float64 `json:"dis" gorm:"column:dis"` - } - - if err = myClient.Session().AutoMigrate(&Start{}); err != nil { - t.Fatalf("TestOpen: AutoMigrate err = %v", err) - } - - if err = myClient.Session().Create(&Start{Name: "sun", Dis: 6631.76}).Error; err != nil { - t.Fatalf("TestOpen: Create err = %v", err) - } - - if err = myClient.Session().Create(&Start{Name: "mar", Dis: 786.35}).Error; err != nil { - t.Fatalf("TestOpen: Create err = %v", err) - } - - if reader, ok := myClient.Dump(); ok { - bs, err := io.ReadAll(reader) - if err != nil { - t.Fatalf("TestOpen: ReadAll err = %v", err) - } - - os.WriteFile("dump.db", bs, 0o644) - } - - myClient.Close() -} diff --git a/internal/database/db/new.go b/internal/database/db/new.go index 0be1ace..54b4165 100644 --- a/internal/database/db/new.go +++ b/internal/database/db/new.go @@ -5,22 +5,30 @@ import ( "fmt" "strings" + "github.com/glebarez/sqlite" "gorm.io/driver/mysql" "gorm.io/driver/postgres" "gorm.io/gorm" ) -func New(ctx context.Context, uri string, opts ...Option) (*Client, error) { +const tip = `example: +for sqlite -> sqlite:: + sqlite::data.sqlite + sqlite::/data/data.db +for mysql -> mysql:: + mysql::user:pass@tcp(127.0.0.1:3306)/dbname?charset=utf8mb4&parseTime=True&loc=Local +for postgres -> postgres:: + postgres::host=localhost user=gorm password=gorm dbname=gorm port=9920 sslmode=disable TimeZone=Asia/Shanghai +` + +func New(ctx context.Context, uri string) (*Client, error) { parts := strings.SplitN(uri, "::", 2) if len(parts) != 2 { - return nil, fmt.Errorf("db.Init: opt db uri invalid: %s", uri) + return nil, fmt.Errorf("db.Init: db uri invalid\n%s", tip) } - c := &Client{cfgSqlite: &cfgSqlite{fsType: "file"}} - for _, f := range opts { - f(c) - } + c := &Client{} var ( err error @@ -30,7 +38,7 @@ func New(ctx context.Context, uri string, opts ...Option) (*Client, error) { switch parts[0] { case "sqlite": c.dbType = DBTypeSqlite - err = openSqlite(c, dsn) + c.cli, err = gorm.Open(sqlite.Open(dsn)) case "mysql": c.dbType = DBTypeMysql c.cli, err = gorm.Open(mysql.Open(dsn)) @@ -48,8 +56,8 @@ func New(ctx context.Context, uri string, opts ...Option) (*Client, error) { return c, nil } -func Init(ctx context.Context, uri string, opts ...Option) (err error) { - if Default, err = New(ctx, uri, opts...); err != nil { +func Init(ctx context.Context, uri string) (err error) { + if Default, err = New(ctx, uri); err != nil { return err } diff --git a/internal/database/db/option.go b/internal/database/db/option.go deleted file mode 100644 index 3fa25d8..0000000 --- a/internal/database/db/option.go +++ /dev/null @@ -1,27 +0,0 @@ -package db - -import ( - _ "github.com/loveuer/go-sqlite3/embed" - "io" -) - -type Option func(c *Client) - -func OptSqliteByUrl(address string) Option { - return func(c *Client) { - c.cfgSqlite.fsType = "url" - } -} - -type SqliteMemDumper interface { - Dump() io.ReadSeekCloser -} - -// 如果传 nil 则表示新生成一个 mem 的 sqlite -// 如果传了一个合法的 reader 则会从这个 reader 初始化 database -func OptSqliteByMem(reader io.ReadCloser) Option { - return func(c *Client) { - c.cfgSqlite.memReader = reader - c.cfgSqlite.fsType = "mem" - } -} diff --git a/internal/database/db/sqlite.go b/internal/database/db/sqlite.go deleted file mode 100644 index 1e7b342..0000000 --- a/internal/database/db/sqlite.go +++ /dev/null @@ -1,63 +0,0 @@ -package db - -import ( - "fmt" - "io" - "time" - - _ "github.com/loveuer/go-sqlite3/embed" - "github.com/loveuer/go-sqlite3/vfs/memdb" - "github.com/loveuer/go-sqlite3/vfs/readervfs" - "github.com/ncruces/go-sqlite3/gormlite" - "github.com/psanford/httpreadat" - "gorm.io/gorm" -) - -type cfgSqlite struct { - fsType string // file, mem(bytes), url - memDump *memdb.MemDB - memReader io.ReadCloser -} - -func openSqlite(c *Client, dsn string) error { - var ( - db gorm.Dialector - err error - ) - - switch c.cfgSqlite.fsType { - case "file": - db = gormlite.Open("file:" + dsn) - case "url": - name := fmt.Sprintf("%d.db", time.Now().UnixNano()) - readervfs.Create(name, httpreadat.New(dsn)) - uri := fmt.Sprintf("file:%s?vfs=reader", name) - db = gormlite.Open(uri) - case "mem": - var ( - bs []byte - name = fmt.Sprintf("%d.db", time.Now().UnixNano()) - ) - - if c.cfgSqlite.memReader == nil { - bs = make([]byte, 0) - } else { - if bs, err = io.ReadAll(c.cfgSqlite.memReader); err != nil { - return err - } - } - - memDump := memdb.Create(name, bs) - c.cfgSqlite.memDump = memDump - uri := fmt.Sprintf("file:/%s?vfs=memdb", name) - db = gormlite.Open(uri) - default: - return fmt.Errorf("unsupported sqlite fs type: %s", c.cfgSqlite.fsType) - } - - if c.cli, err = gorm.Open(db); err != nil { - return err - } - - return nil -} diff --git a/internal/invoke/client.go b/internal/invoke/client.go index ae21cc7..db63df0 100644 --- a/internal/invoke/client.go +++ b/internal/invoke/client.go @@ -2,16 +2,18 @@ package invoke import ( "fmt" + "sync" + "time" + + "ultone/internal/tool" + "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/resolver" - "sync" - "time" - "ultone/internal/tool" ) const ( - SCHEME = "sonar" + SCHEME = "ult" ) type Client[T any] struct { @@ -27,9 +29,7 @@ func (c *Client[T]) Session() T { return c.fn(c.cc) } -var ( - clients = &sync.Map{} -) +var clients = &sync.Map{} // NewClient /* @@ -44,7 +44,6 @@ func NewClient[T any]( fn func(grpc.ClientConnInterface) T, opts ...grpc.DialOption, ) (*Client[T], error) { - cached, ok := clients.Load(domain) if ok { if client, ok := cached.(*Client[T]); ok { @@ -75,7 +74,6 @@ func NewClient[T any]( fullAddress, opts..., ) - if err != nil { return nil, err } diff --git a/internal/invoke/resolve_v2.go b/internal/invoke/resolve_v2.go index a06bf54..34eeac8 100644 --- a/internal/invoke/resolve_v2.go +++ b/internal/invoke/resolve_v2.go @@ -1,7 +1,6 @@ package invoke import ( - "github.com/sirupsen/logrus" "sync" "google.golang.org/grpc/resolver" @@ -30,7 +29,6 @@ type Resolver struct { } func (r *Resolver) ResolveNow(o resolver.ResolveNowOptions) { - logrus.Tracef("resolve_v2 ResolveNow => target: %s, %v", r.target.URL.Host, ips) _ = r.cc.UpdateState(ips[r.target.URL.Host]) } diff --git a/main.go b/main.go index 9a2ac2c..8ad7e65 100644 --- a/main.go +++ b/main.go @@ -2,10 +2,12 @@ package main import ( "context" - "github.com/loveuer/nf/nft/log" "os/signal" "syscall" + "ultone/internal/cmd" + + "github.com/loveuer/nf/nft/log" ) func main() {