Merge "Allow to reindex without notifying listeners"
diff --git a/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java b/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java
index ad46483..81f1e71 100644
--- a/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java
+++ b/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java
@@ -419,7 +419,7 @@
@Nullable
private BloomFilter<K> buildBloomFilter() {
SqlHandle c = null;
- try {
+ try (TraceTimer ignored = TraceContext.newTimer("Build bloom filter", Metadata.empty())) {
c = acquire();
if (estimatedSize <= 0) {
try (PreparedStatement ps =
@@ -761,6 +761,8 @@
"ALTER TABLE data ADD COLUMN IF NOT EXISTS "
+ "space BIGINT AS OCTET_LENGTH(k) + OCTET_LENGTH(v)");
stmt.addBatch("ALTER TABLE data ADD COLUMN IF NOT EXISTS version INT DEFAULT 0 NOT NULL");
+ stmt.addBatch("CREATE INDEX IF NOT EXISTS version_key ON data(version, k)");
+ stmt.addBatch("CREATE INDEX IF NOT EXISTS accessed ON data(accessed)");
stmt.executeBatch();
}
}
diff --git a/plugins/replication b/plugins/replication
index cc47d53..012f042 160000
--- a/plugins/replication
+++ b/plugins/replication
@@ -1 +1 @@
-Subproject commit cc47d53d4870e2c285c3b72202ebe6f3fdd67b57
+Subproject commit 012f04240eafe6dfa21fd94e012e97498881c621