From fd9c6d6fa6e89ad497307ed98d06cdf05325f165 Mon Sep 17 00:00:00 2001 From: Ben Brooks Date: Tue, 18 Feb 2020 22:56:11 +0000 Subject: [PATCH] CBG-667 - Backport CBG-659 to 2.7.1 (#4499) CBG-659 - Order channels query by ascending sequence (#4443) * Order channels query by ascending sequence * Update db/query.go Co-authored-by: Adam Fraser Co-authored-by: Adam Fraser --- db/query.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db/query.go b/db/query.go index 121ce7c532..75b20caa0c 100644 --- a/db/query.go +++ b/db/query.go @@ -76,7 +76,8 @@ var QueryChannels = SGQuery{ "FROM `%s` "+ "USE INDEX ($idx) "+ "UNNEST OBJECT_PAIRS($sync.channels) AS op "+ - "WHERE [op.name, LEAST($sync.sequence, op.val.seq),IFMISSING(op.val.rev,null),IFMISSING(op.val.del,null)] BETWEEN [$channelName, $startSeq] AND [$channelName, $endSeq]", + "WHERE [op.name, LEAST($sync.sequence, op.val.seq),IFMISSING(op.val.rev,null),IFMISSING(op.val.del,null)] BETWEEN [$channelName, $startSeq] AND [$channelName, $endSeq] "+ + "ORDER BY seq", base.BucketQueryToken, base.BucketQueryToken), adhoc: false, }