pixeldrain/gocqlx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

qb: avoid data race if rendering query builder in different go routines

Browse Source
This commit is contained in:
Gabriel Nelle
2022-02-17 09:56:39 +01:00
committed by GitHub
parent cee96feae9
commit b56c610884
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
qb/using.go
View File

@@ -27,8 +27,6 @@ type using struct {
timestampName string timestampName string
timeout time.Duration timeout time.Duration
timeoutName string timeoutName string
using bool
} }
func (u *using) TTL(d time.Duration) *using { func (u *using) TTL(d time.Duration) *using {
@@ -71,34 +69,34 @@ func (u *using) TimeoutNamed(name string) *using {
} }
func (u *using) writeCql(cql *bytes.Buffer) (names []string) { func (u *using) writeCql(cql *bytes.Buffer) (names []string) {
u.using = false writePreamble := u.preambleWriter()
if u.ttl != 0 { if u.ttl != 0 {
if u.ttl == -1 { if u.ttl == -1 {
u.ttl = 0 u.ttl = 0
} }
u.writePreamble(cql) writePreamble(cql)
fmt.Fprintf(cql, "TTL %d ", u.ttl) fmt.Fprintf(cql, "TTL %d ", u.ttl)
} else if u.ttlName != "" { } else if u.ttlName != "" {
u.writePreamble(cql) writePreamble(cql)
cql.WriteString("TTL ? ") cql.WriteString("TTL ? ")
names = append(names, u.ttlName) names = append(names, u.ttlName)
} }
if u.timestamp != 0 { if u.timestamp != 0 {
u.writePreamble(cql) writePreamble(cql)
fmt.Fprintf(cql, "TIMESTAMP %d ", u.timestamp) fmt.Fprintf(cql, "TIMESTAMP %d ", u.timestamp)
} else if u.timestampName != "" { } else if u.timestampName != "" {
u.writePreamble(cql) writePreamble(cql)
cql.WriteString("TIMESTAMP ? ") cql.WriteString("TIMESTAMP ? ")
names = append(names, u.timestampName) names = append(names, u.timestampName)
} }
if u.timeout != 0 { if u.timeout != 0 {
u.writePreamble(cql) writePreamble(cql)
fmt.Fprintf(cql, "TIMEOUT %s ", u.timeout) fmt.Fprintf(cql, "TIMEOUT %s ", u.timeout)
} else if u.timeoutName != "" { } else if u.timeoutName != "" {
u.writePreamble(cql) writePreamble(cql)
cql.WriteString("TIMEOUT ? ") cql.WriteString("TIMEOUT ? ")
names = append(names, u.timeoutName) names = append(names, u.timeoutName)
} }
@@ -106,11 +104,14 @@ func (u *using) writeCql(cql *bytes.Buffer) (names []string) {
return return
} }
func (u *using) writePreamble(cql *bytes.Buffer) { func (u *using) preambleWriter() func(cql *bytes.Buffer) {
if u.using { var hasPreamble bool
return func(cql *bytes.Buffer) {
if hasPreamble {
cql.WriteString("AND ") cql.WriteString("AND ")
} else { return
}
cql.WriteString("USING ") cql.WriteString("USING ")
u.using = true hasPreamble = true
} }
} }