diff --git a/go.mod b/go.mod index 00dfa834c..56b291b73 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/go-redis/redis v6.15.9+incompatible github.com/go-stack/stack v1.8.1 github.com/golang/snappy v0.0.4 - github.com/influxdata/influxdb v1.11.2 + github.com/influxdata/influxdb v1.11.4 github.com/influxdata/influxql v1.1.1-0.20211004132434-7e7d61973256 github.com/klauspost/compress v1.17.4 github.com/prometheus/client_golang v1.17.0 diff --git a/go.sum b/go.sum index dff7a719f..02e326afa 100644 --- a/go.sum +++ b/go.sum @@ -186,8 +186,8 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/influxdata/influxdb v1.11.2 h1:qOF3uQN1mDfJNEKwbAgJsqehf8IXgKok2vlGm736oGo= -github.com/influxdata/influxdb v1.11.2/go.mod h1:eUMkLTE2vQwvSk6KGMrTBLKPaqSuczuelGbggigMPFw= +github.com/influxdata/influxdb v1.11.4 h1:H3pVW+/tWQ4lkHhZxVQ13Ov1hmhHYaAzz8L5aq3ZNtw= +github.com/influxdata/influxdb v1.11.4/go.mod h1:VO6X2zlamfmEf+Esc9dR+7UQhdE/krspWNEZPwxCrp0= github.com/influxdata/influxql v1.1.1-0.20211004132434-7e7d61973256 h1:8io3jjCJ0j9NFvq3/m/rMrDiEILpsfOqWDPItUt/078= github.com/influxdata/influxql v1.1.1-0.20211004132434-7e7d61973256/go.mod h1:gHp9y86a/pxhjJ+zMjNXiQAA197Xk9wLxaz+fGG+kWk= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= diff --git a/vendor/github.com/influxdata/influxdb/models/points.go b/vendor/github.com/influxdata/influxdb/models/points.go index 72e466eec..3db5287d6 100644 --- a/vendor/github.com/influxdata/influxdb/models/points.go +++ b/vendor/github.com/influxdata/influxdb/models/points.go @@ -1647,7 +1647,7 @@ func AppendMakeKey(dst []byte, name []byte, tags Tags) []byte { // unescape the name and then re-escape it to avoid double escaping. // The key should always be stored in escaped form. dst = append(dst, EscapeMeasurement(unescapeMeasurement(name))...) - dst = tags.AppendHashKey(dst) + dst = tags.AppendHashKey(dst, true) return dst } @@ -2208,8 +2208,8 @@ func (a Tags) Merge(other map[string]string) Tags { } // HashKey hashes all of a tag's keys. -func (a Tags) HashKey() []byte { - return a.AppendHashKey(nil) +func (a Tags) HashKey(escapeTags bool) []byte { + return a.AppendHashKey(nil, escapeTags) } func (a Tags) needsEscape() bool { @@ -2226,7 +2226,7 @@ func (a Tags) needsEscape() bool { } // AppendHashKey appends the result of hashing all of a tag's keys and values to dst and returns the extended buffer. -func (a Tags) AppendHashKey(dst []byte) []byte { +func (a Tags) AppendHashKey(dst []byte, escapeTags bool) []byte { // Empty maps marshal to empty bytes. if len(a) == 0 { return dst @@ -2236,7 +2236,7 @@ func (a Tags) AppendHashKey(dst []byte) []byte { sz := 0 var escaped Tags - if a.needsEscape() { + if escapeTags && a.needsEscape() { var tmp [20]Tag if len(a) < len(tmp) { escaped = tmp[:len(a)] diff --git a/vendor/modules.txt b/vendor/modules.txt index d236aac14..09f0b6156 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -120,8 +120,8 @@ github.com/golang/snappy # github.com/gomodule/redigo v1.8.9 ## explicit; go 1.16 github.com/gomodule/redigo/redis -# github.com/influxdata/influxdb v1.11.2 -## explicit; go 1.19 +# github.com/influxdata/influxdb v1.11.4 +## explicit; go 1.20 github.com/influxdata/influxdb/models github.com/influxdata/influxdb/pkg/escape # github.com/influxdata/influxql v1.1.1-0.20211004132434-7e7d61973256