opendev/gerrit
Code Issues Proposed changes

Merge changes from topic "remove-misc-gwtorm"

Browse Source 
* changes:
  Replace InMemoryAccountPatchReviewStore with a config option
  Return ImmutableList from ResultSet
  Copy ResultSet from gwtorm into index.query package
  Move IndexedQuery to query subpackage
This commit is contained in:
David Pursehouse
2018-12-21 05:29:50 +00:00
committed by Gerrit Code Review
parent e3baf7aebe 969f336a78
commit ac459b4537
24 changed files with 159 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
java/com/google/gerrit/server/schema/InMemoryAccountPatchReviewStore.java
View File

@@ -1,58 +0,0 @@
// Copyright (C) 2017 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.server.schema;
import com.google.common.annotations.VisibleForTesting;
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.lifecycle.LifecycleModule;
import com.google.gerrit.server.change.AccountPatchReviewStore;
import com.google.gwtorm.jdbc.SimpleDataSource;
import java.sql.SQLException;
import java.util.Properties;
import javax.sql.DataSource;
public class InMemoryAccountPatchReviewStore extends JdbcAccountPatchReviewStore {
@VisibleForTesting
public static class Module extends LifecycleModule {
@Override
protected void configure() {
InMemoryAccountPatchReviewStore inMemoryStore = new InMemoryAccountPatchReviewStore();
DynamicItem.bind(binder(), AccountPatchReviewStore.class).toInstance(inMemoryStore);
listener().toInstance(inMemoryStore);
}
}
/**
* Creates an in-memory H2 database to store the reviewed flags. This should be used for tests
* only.
*/
@VisibleForTesting
private InMemoryAccountPatchReviewStore() {
super(newDataSource());
}
private static synchronized DataSource newDataSource() {
final Properties p = new Properties();
p.setProperty("driver", "org.h2.Driver");
// DB_CLOSE_DELAY=-1: By default the content of an in-memory H2 database is lost at the moment
// the last connection is closed. This option keeps the content as long as the vm lives.
p.setProperty("url", "jdbc:h2:mem:account_patch_reviews;DB_CLOSE_DELAY=-1");
try {
return new SimpleDataSource(p);
} catch (SQLException e) {
throw new RuntimeException("Unable to create test datasource", e);
}
}
}

11
java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java
View File

@@ -17,6 +17,7 @@ package com.google.gerrit.server.schema;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableSet;
import com.google.common.flogger.FluentLogger;
import com.google.common.primitives.Ints;
@@ -48,6 +49,12 @@ public abstract class JdbcAccountPatchReviewStore
implements AccountPatchReviewStore, LifecycleListener {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
// DB_CLOSE_DELAY=-1: By default the content of an in-memory H2 database is lost at the moment the
// last connection is closed. This option keeps the content as long as the VM lives.
@VisibleForTesting
public static final String TEST_IN_MEMORY_URL =
"jdbc:h2:mem:account_patch_reviews;DB_CLOSE_DELAY=-1";
private static final String ACCOUNT_PATCH_REVIEW_DB = "accountPatchReviewDb";
private static final String H2_DB = "h2";
private static final String MARIADB = "mariadb";
@@ -109,10 +116,6 @@ public abstract class JdbcAccountPatchReviewStore
this.ds = createDataSource(cfg, sitePaths, threadSettingsConfig);
}
protected JdbcAccountPatchReviewStore(DataSource ds) {
this.ds = ds;
}
private static String getUrl(@GerritServerConfig Config cfg, SitePaths sitePaths) {
String url = cfg.getString(ACCOUNT_PATCH_REVIEW_DB, null, URL);
if (url == null) {