From a8c652f96c5e1ecdf8cf7128d538eb54921306cd Mon Sep 17 00:00:00 2001 From: Manuel Imperiale Date: Wed, 13 Jan 2021 10:23:05 +0100 Subject: [PATCH] MF-1061 - Fix cassandra-reader count for json format (#1327) Signed-off-by: Manuel Imperiale --- readers/cassandra/messages.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/readers/cassandra/messages.go b/readers/cassandra/messages.go index b47b04a09d..3d5de2615c 100644 --- a/readers/cassandra/messages.go +++ b/readers/cassandra/messages.go @@ -50,13 +50,14 @@ func (cr cassandraRepository) ReadAll(chanID string, offset, limit uint64, query value, string_value, bool_value, data_value, sum, time, update_time FROM messages WHERE channel = ? %s LIMIT ? ALLOW FILTERING`, q) + countCQL := fmt.Sprintf(`SELECT COUNT(*) FROM %s WHERE channel = ? %s ALLOW FILTERING`, defTable, q) + if table != defTable { selectCQL = fmt.Sprintf(`SELECT channel, subtopic, publisher, protocol, created, payload FROM %s WHERE channel = ? %s LIMIT ? ALLOW FILTERING`, table, q) + countCQL = fmt.Sprintf(`SELECT COUNT(*) FROM %s WHERE channel = ? %s ALLOW FILTERING`, table, q) } - countCQL := fmt.Sprintf(`SELECT COUNT(*) FROM %s WHERE channel = ? %s ALLOW FILTERING`, defTable, q) - iter := cr.session.Query(selectCQL, vals...).Iter() defer iter.Close() scanner := iter.Scanner()