commit be911167d6a0aa6b8b568ae06a60221e24d945f5
author David Pursehouse <dpursehouse@collab.net> Tue Sep 12 08:56:06 2017 +0900
committer David Pursehouse <dpursehouse@collab.net> Tue Sep 12 08:56:12 2017 +0900
tree f3cbc1eafff5bf61be3a55131a87f21dc453531a
parent 9a9d1ab0cd921b72574a1f29aeeeae8abdb4c707
parent 328b3f5db771e0f027f25d51621a8d6c0cb04ad1

Merge branch 'stable-2.14'

* stable-2.14:
  Fix link to ConsoleMetricReporter in documentation
  Fix perfomance issue when clearing reviewed flag for a patchset

Change-Id: Ibfc3aa186fa9edbb853d26a0988b3406179a2504

gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java
index c27a096..c274e56 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java
@@ -189,7 +189,7 @@
             + "patch_set_id INTEGER DEFAULT 0 NOT NULL, "
             + "file_name VARCHAR(4096) DEFAULT '' NOT NULL, "
             + "CONSTRAINT primary_key_account_patch_reviews "
-            + "PRIMARY KEY (account_id, change_id, patch_set_id, file_name)"
+            + "PRIMARY KEY (change_id, patch_set_id, account_id, file_name)"
             + ")");
   }