Ensure Cassandra bucket number is not negative (#599)

yurishkuro · web-flow · commit 05c995819ce1 · 2017-12-17T14:41:57.000-06:00
diff --git a/plugin/storage/cassandra/spanstore/writer.go b/plugin/storage/cassandra/spanstore/writer.go
@@ -198,7 +198,7 @@ func (s *SpanWriter) indexByDuration(span *dbmodel.Span, startTime time.Time) er
 }
 
 func (s *SpanWriter) indexByService(traceID model.TraceID, span *dbmodel.Span) error {
-	bucketNo := span.SpanHash % defaultNumBuckets
+	bucketNo := uint64(span.SpanHash) % defaultNumBuckets
 	query := s.session.Query(serviceNameIndex)
 	q := query.Bind(span.Process.ServiceName, bucketNo, span.StartTime, span.TraceID)
 	return s.writerMetrics.serviceNameIndex.Exec(q, s.logger)

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ func (s SpanWriter) indexByDuration(span dbmodel.Span, startTime time.Time) er`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`func (s SpanWriter) indexByService(traceID model.TraceID, span dbmodel.Span) error {`
`201`		`- bucketNo := span.SpanHash % defaultNumBuckets`
	`201`	`+ bucketNo := uint64(span.SpanHash) % defaultNumBuckets`
`202`	`202`	`query := s.session.Query(serviceNameIndex)`
`203`	`203`	`q := query.Bind(span.Process.ServiceName, bucketNo, span.StartTime, span.TraceID)`
`204`	`204`	`return s.writerMetrics.serviceNameIndex.Exec(q, s.logger)`