libf há 1 ano atrás
pai
commit
53958ebaaf
3 ficheiros alterados com 11 adições e 55 exclusões
  1. 2 3
      go.mod
  2. 8 46
      go.sum
  3. 1 6
      odbc/subscribe.go

+ 2 - 3
go.mod

@@ -10,11 +10,10 @@ require (
 	github.com/fatih/color v1.9.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.7 // indirect
 	github.com/mattn/go-isatty v0.0.12 // indirect
 	github.com/redis/go-redis/v9 v9.0.5 // indirect
-	github.com/spf13/cast v1.3.1 // indirect
+	github.com/spf13/cast v1.5.1 // indirect
 	github.com/tidwall/uhatools v0.4.1 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
 	go.etcd.io/etcd/api/v3 v3.5.8 // indirect
@@ -35,7 +34,7 @@ require (
 
 require (
 	git.wecise.com/wecise/common v0.0.0-20230614163235-0dc2eb7c9aad
-	git.wecise.com/wecise/odb-go v0.0.0-20230628123346-dccc08180677
+	git.wecise.com/wecise/odb-go v0.0.0-20230628160821-479d003aa3e7
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/gomodule/redigo v1.8.5 // indirect

+ 8 - 46
go.sum

@@ -2,44 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 git.wecise.com/wecise/common v0.0.0-20230614163235-0dc2eb7c9aad h1:fdnnu3PO6v7VQsLxIlYcQVQdRKAfKBGjtLKzOpCC6pA=
 git.wecise.com/wecise/common v0.0.0-20230614163235-0dc2eb7c9aad/go.mod h1:VDERBLdm5+B3J/y4HpSLMobmFzRbL1f/2m1+pm68jWI=
-git.wecise.com/wecise/odb-go v0.0.0-20230626070254-ebbbd95408b4 h1:OROAvnnhaup259G0aravPV7MEWVCUugApKkM3VLMjwI=
-git.wecise.com/wecise/odb-go v0.0.0-20230626070254-ebbbd95408b4/go.mod h1:IwKuJPFQl4C3TK3Qyoo+qppM82f/5xJFwMHW2hKV4uA=
-git.wecise.com/wecise/odb-go v0.0.0-20230627124907-407af65fba96 h1:fpOvvZeKKQgOU7EyMYeJr9JS9f94cGcy1c8a96n8OcA=
-git.wecise.com/wecise/odb-go v0.0.0-20230627124907-407af65fba96/go.mod h1:IwKuJPFQl4C3TK3Qyoo+qppM82f/5xJFwMHW2hKV4uA=
-git.wecise.com/wecise/odb-go v0.0.0-20230627130330-91aa59d544cc h1:V4OUvQUs0bcwGKWKbilFCgMmx6uuTNokzdDc2KCiXD0=
-git.wecise.com/wecise/odb-go v0.0.0-20230627130330-91aa59d544cc/go.mod h1:IwKuJPFQl4C3TK3Qyoo+qppM82f/5xJFwMHW2hKV4uA=
-git.wecise.com/wecise/odb-go v0.0.0-20230627132242-9e5f6810a6be h1:oFRxKE5/V7qaWrnuLpa3HJ+ZiEF7JQLlVj9vYiBwrAo=
-git.wecise.com/wecise/odb-go v0.0.0-20230627132242-9e5f6810a6be/go.mod h1:IwKuJPFQl4C3TK3Qyoo+qppM82f/5xJFwMHW2hKV4uA=
-git.wecise.com/wecise/odb-go v0.0.0-20230628022926-9de27a1bd59b h1:94qa1cXXdEPcLk75JwGr8ZC6PUFSxhej2LmSdfFmSmw=
-git.wecise.com/wecise/odb-go v0.0.0-20230628022926-9de27a1bd59b/go.mod h1:IwKuJPFQl4C3TK3Qyoo+qppM82f/5xJFwMHW2hKV4uA=
-git.wecise.com/wecise/odb-go v0.0.0-20230628023658-4768c00407a3 h1:XSfPbVgYVjWSiMAHgmGRXRpPAwBDtzecnQyBc5/fD4g=
-git.wecise.com/wecise/odb-go v0.0.0-20230628023658-4768c00407a3/go.mod h1:IwKuJPFQl4C3TK3Qyoo+qppM82f/5xJFwMHW2hKV4uA=
-git.wecise.com/wecise/odb-go v0.0.0-20230628024231-87c8ec7c2c80 h1:qsXD5o9jap+gMN9bgAcdtmBMMEu/OOlphe4l7KVtyuk=
-git.wecise.com/wecise/odb-go v0.0.0-20230628024231-87c8ec7c2c80/go.mod h1:Ug7qgUkXxI4SoVqR4ASMCvzLWzqHVQDFk5vUE023Eyg=
-git.wecise.com/wecise/odb-go v0.0.0-20230628025243-17caa0b2f0da h1:xa8vn6MgVYyUuRd9mQXzyWybaP1yILFMOydDSpP91gQ=
-git.wecise.com/wecise/odb-go v0.0.0-20230628025243-17caa0b2f0da/go.mod h1:Ug7qgUkXxI4SoVqR4ASMCvzLWzqHVQDFk5vUE023Eyg=
-git.wecise.com/wecise/odb-go v0.0.0-20230628030850-8ad29ba97092 h1:yqPEE8LP8z/fd3msriI5b7QQseeuvj51BtixVVNYfso=
-git.wecise.com/wecise/odb-go v0.0.0-20230628030850-8ad29ba97092/go.mod h1:Ug7qgUkXxI4SoVqR4ASMCvzLWzqHVQDFk5vUE023Eyg=
-git.wecise.com/wecise/odb-go v0.0.0-20230628032205-f9a96280ac1f h1:OYhICUZghtVZj8XvhKEumhPYx7DE/lH8x89u2ibMj+g=
-git.wecise.com/wecise/odb-go v0.0.0-20230628032205-f9a96280ac1f/go.mod h1:Ug7qgUkXxI4SoVqR4ASMCvzLWzqHVQDFk5vUE023Eyg=
-git.wecise.com/wecise/odb-go v0.0.0-20230628032820-3d4eb2add92b h1:/Z3bAnSN7hZHm9Shesl+skBF0OpWs/nGA3VyDFi68JI=
-git.wecise.com/wecise/odb-go v0.0.0-20230628032820-3d4eb2add92b/go.mod h1:Ug7qgUkXxI4SoVqR4ASMCvzLWzqHVQDFk5vUE023Eyg=
-git.wecise.com/wecise/odb-go v0.0.0-20230628033508-15ba21092097 h1:2ebK9qU3s8nZ32zOfFVdiOni4Bq3biPPyjwze+tIbX4=
-git.wecise.com/wecise/odb-go v0.0.0-20230628033508-15ba21092097/go.mod h1:Ug7qgUkXxI4SoVqR4ASMCvzLWzqHVQDFk5vUE023Eyg=
-git.wecise.com/wecise/odb-go v0.0.0-20230628034133-369b9b19df8b h1:W0czaRsEoAcJzQ8pM7iu9x/1qmx1apW/mTO4VLsLxAk=
-git.wecise.com/wecise/odb-go v0.0.0-20230628034133-369b9b19df8b/go.mod h1:Ug7qgUkXxI4SoVqR4ASMCvzLWzqHVQDFk5vUE023Eyg=
-git.wecise.com/wecise/odb-go v0.0.0-20230628040047-b942de103f8f h1:MQd/O+dZo/ZJ5oK3up5Xc/Yi6WyfQMTLhjpvxtejoC8=
-git.wecise.com/wecise/odb-go v0.0.0-20230628040047-b942de103f8f/go.mod h1:Ug7qgUkXxI4SoVqR4ASMCvzLWzqHVQDFk5vUE023Eyg=
-git.wecise.com/wecise/odb-go v0.0.0-20230628042251-a87af912204f h1:yiR86ke4W2xRZsUrO25Kf0pRb+7CjfVzks6NQ329tp0=
-git.wecise.com/wecise/odb-go v0.0.0-20230628042251-a87af912204f/go.mod h1:Ug7qgUkXxI4SoVqR4ASMCvzLWzqHVQDFk5vUE023Eyg=
-git.wecise.com/wecise/odb-go v0.0.0-20230628063438-83809fd75a3f h1:f3Kv/ht+w3DU2pPNPIRGZxZOxG/ByCLV3isNAfJWnfI=
-git.wecise.com/wecise/odb-go v0.0.0-20230628063438-83809fd75a3f/go.mod h1:Ug7qgUkXxI4SoVqR4ASMCvzLWzqHVQDFk5vUE023Eyg=
-git.wecise.com/wecise/odb-go v0.0.0-20230628070448-ce59fdc458c1 h1:XVJ7TApbUpVCAnLut2KMj6j3fIUVA+S4C9X+quNwRO4=
-git.wecise.com/wecise/odb-go v0.0.0-20230628070448-ce59fdc458c1/go.mod h1:Ug7qgUkXxI4SoVqR4ASMCvzLWzqHVQDFk5vUE023Eyg=
-git.wecise.com/wecise/odb-go v0.0.0-20230628074400-771e6bcd95fd h1:yJSzDkDUOhKUuCIRxpsim4X+MfSfwAo2RyM9LMzW6z0=
-git.wecise.com/wecise/odb-go v0.0.0-20230628074400-771e6bcd95fd/go.mod h1:Ug7qgUkXxI4SoVqR4ASMCvzLWzqHVQDFk5vUE023Eyg=
-git.wecise.com/wecise/odb-go v0.0.0-20230628123346-dccc08180677 h1:5jXJ5Hv+hpwl+cxuxF33F1YNFFWp496+BfdQG8rNVxQ=
-git.wecise.com/wecise/odb-go v0.0.0-20230628123346-dccc08180677/go.mod h1:Ug7qgUkXxI4SoVqR4ASMCvzLWzqHVQDFk5vUE023Eyg=
+git.wecise.com/wecise/odb-go v0.0.0-20230628160821-479d003aa3e7 h1:da+phX+k2d//JybgOVmdozLgFQ4YYeeE8mw3KU+J7xM=
+git.wecise.com/wecise/odb-go v0.0.0-20230628160821-479d003aa3e7/go.mod h1:9IywG9g2s5AgPiTT2Z5lvfzJ829Z3BxYvQKv4Wyxw2w=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao=
@@ -56,7 +20,6 @@ github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmf
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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=
@@ -73,6 +36,7 @@ github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/set v0.2.1 h1:nn2CaJyknWE/6txyUDGwysr3G5QC6xWB/PtVjPBbeaA=
 github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI=
+github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -102,16 +66,15 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw=
 github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -127,12 +90,12 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/redis/go-redis/v9 v9.0.5 h1:CuQcn5HIEeK7BgElubPP8CGtE0KakrnbBSTLjathl5o=
 github.com/redis/go-redis/v9 v9.0.5/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/scylladb/go-set v1.0.2 h1:SkvlMCKhP0wyyct6j+0IHJkBkSZL+TDzZ4E7f7BCcRE=
 github.com/scylladb/go-set v1.0.2/go.mod h1:DkpGd78rljTxKAnTDPFqXSGxvETQnJyuSOQwsHycqfs=
-github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
-github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
+github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -227,7 +190,6 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=

+ 1 - 6
odbc/subscribe.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"git.wecise.com/wecise/odb-go/odb"
-	"git.wecise.com/wecise/odb-go/odb/eventmsg"
 )
 
 func SubscribeDataChangeTest(client odb.Client) {
@@ -22,11 +21,7 @@ func SubscribeTest(client odb.Client, topic string) {
 			}
 		}()
 		for m := range sub.Channel() {
-			oem, err := eventmsg.FromMsgpack([]byte(m.Payload))
-			if err != nil {
-				log.Error(err)
-			}
-			string_message := oem.Data.String()
+			string_message := m.EventData().String()
 			log.Info(topic + " received " + topic + " message " + "\n" + string_message)
 		}
 	}()