WIP: change mysql query

temporalio · Oct 18, 2022 · 15be080 · 15be080
1 parent 5f1dc72
commit 15be080
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/common/persistence/sql/sqlplugin/mysql/events.go b/common/persistence/sql/sqlplugin/mysql/events.go
@@ -63,10 +63,10 @@ const (
 	getHistoryTreeQuery = `SELECT branch_id, data, data_encoding FROM history_tree WHERE shard_id = ? AND tree_id = ? `
 
 	paginateBranchesQuery = `SELECT shard_id, tree_id, branch_id, data, data_encoding
-        FROM history_tree
-        WHERE (shard_id, tree_id, branch_id) > (?, ?, ?)
-        ORDER BY shard_id, tree_id, branch_id
-        LIMIT ?`
+		FROM history_tree
+		WHERE shard_id = ? AND ((tree_id = ? AND branch_id > ?) OR tree_id > ?) OR shard_id > ?
+		ORDER BY shard_id, tree_id, branch_id
+		LIMIT ?`
 
 	deleteHistoryTreeQuery = `DELETE FROM history_tree WHERE shard_id = ? AND tree_id = ? AND branch_id = ? `
 )
@@ -210,6 +210,8 @@ func (mdb *db) PaginateBranchesFromHistoryTree(
 		page.ShardID,
 		page.TreeID,
 		page.BranchID,
+		page.TreeID,
+		page.ShardID,
 		page.Limit,
 	)
 	return rows, err