Merge pull request #1577 from grafana/update-gocql-again

update gocql to 1982a06ad6b987c24beec15336019914d71b2e31

Gopkg.toml

@@ -63,7 +63,7 @@ unused-packages = true
 
 [[constraint]]
   name = "github.com/gocql/gocql"
-  revision = "d9815cdf0ff24e2efa9b8062f4f94a6dd347ae51"
+  revision = "1982a06ad6b987c24beec15336019914d71b2e31"
 
 [[constraint]]
   name = "github.com/golang/snappy"

cmd/mt-store-cp-experimental/main.go

@@ -280,8 +280,10 @@ func worker(id int, jobs <-chan string, wg *sync.WaitGroup, sourceSession, destS
 			if *verbose {
 				log.Printf("id=%d processing rownum=%d table=%q key=%q ts=%d query=%q data='%x'\n", id, atomic.LoadUint64(&doneRows)+1, tableIn, key, ts, query, data)
 			}
-
-			batch.Query(insertQuery, data, key, ts, ttl)
+			// As 'data' is re-used for each scan, we need to make a copy of the []byte slice before assigning it to a new batch.
+			safeData := make([]byte, len(data))
+			copy(safeData, data)
+			batch.Query(insertQuery, safeData, key, ts, ttl)
 
 			if batch.Size() >= *maxBatchSize {
 				if *verbose {

store/cassandra/cassandra.go

@@ -533,7 +533,10 @@ func (c *CassandraStore) SearchTable(ctx context.Context, key schema.AMKey, tabl
 		if len(b) < 2 {
 			return itgens, errChunkTooSmall
 		}
-		itgen, err := chunk.NewIterGen(uint32(t0), intervalHint, b)
+		// As 'b' is re-used for each scan, we need to make a copy of the []byte slice before assigning it to a new IterGen.
+		safeBytes := make([]byte, len(b))
+		copy(safeBytes, b)
+		itgen, err := chunk.NewIterGen(uint32(t0), intervalHint, safeBytes)
 		if err != nil {
 			return itgens, err
 		}