Support mariadb db in AccountPatchReviewStore
Change-Id: I6cff97c12938a8eab7f6448b96b6e39a1b0fb981
This commit is contained in:
committed by
David Pursehouse
parent
efc835dc29
commit
e3a9dd7ec9
@@ -24,9 +24,9 @@ Sample `etc/gerrit.config`:
|
|||||||
|
|
||||||
[[accountPatchReviewDb.url]]accountPatchReviewDb.url::
|
[[accountPatchReviewDb.url]]accountPatchReviewDb.url::
|
||||||
+
|
+
|
||||||
The url of accountPatchReviewDb. Supported types are `H2`, `POSTGRESQL`, and
|
The url of accountPatchReviewDb. Supported types are `H2`, `POSTGRESQL`,
|
||||||
`MYSQL`. Drop the driver jar in the lib folder of the site path if the Jdbc
|
`MARIADB`, and `MYSQL`. Drop the driver jar in the lib folder of the site path
|
||||||
driver of the corresponding Database is not yet in the class path.
|
if the Jdbc driver of the corresponding Database is not yet in the class path.
|
||||||
+
|
+
|
||||||
Default is to create H2 database in the db folder of the site path.
|
Default is to create H2 database in the db folder of the site path.
|
||||||
+
|
+
|
||||||
|
|||||||
@@ -65,6 +65,10 @@ public abstract class JdbcAccountPatchReviewStore
|
|||||||
DynamicItem.bind(binder(), AccountPatchReviewStore.class)
|
DynamicItem.bind(binder(), AccountPatchReviewStore.class)
|
||||||
.to(MysqlAccountPatchReviewStore.class);
|
.to(MysqlAccountPatchReviewStore.class);
|
||||||
listener().to(MysqlAccountPatchReviewStore.class);
|
listener().to(MysqlAccountPatchReviewStore.class);
|
||||||
|
} else if (url.contains("mariadb")) {
|
||||||
|
DynamicItem.bind(binder(), AccountPatchReviewStore.class)
|
||||||
|
.to(MariaDBAccountPatchReviewStore.class);
|
||||||
|
listener().to(MariaDBAccountPatchReviewStore.class);
|
||||||
} else {
|
} else {
|
||||||
throw new IllegalArgumentException(
|
throw new IllegalArgumentException(
|
||||||
"unsupported driver type for account patch reviews db: " + url);
|
"unsupported driver type for account patch reviews db: " + url);
|
||||||
@@ -83,6 +87,8 @@ public abstract class JdbcAccountPatchReviewStore
|
|||||||
return new PostgresqlAccountPatchReviewStore(cfg, sitePaths);
|
return new PostgresqlAccountPatchReviewStore(cfg, sitePaths);
|
||||||
} else if (url.contains("mysql")) {
|
} else if (url.contains("mysql")) {
|
||||||
return new MysqlAccountPatchReviewStore(cfg, sitePaths);
|
return new MysqlAccountPatchReviewStore(cfg, sitePaths);
|
||||||
|
} else if (url.contains("mariadb")) {
|
||||||
|
return new MariaDBAccountPatchReviewStore(cfg, sitePaths);
|
||||||
} else {
|
} else {
|
||||||
throw new IllegalArgumentException(
|
throw new IllegalArgumentException(
|
||||||
"unsupported driver type for account patch reviews db: " + url);
|
"unsupported driver type for account patch reviews db: " + url);
|
||||||
@@ -113,6 +119,8 @@ public abstract class JdbcAccountPatchReviewStore
|
|||||||
datasource.setDriverClassName("org.h2.Driver");
|
datasource.setDriverClassName("org.h2.Driver");
|
||||||
} else if (url.contains("mysql")) {
|
} else if (url.contains("mysql")) {
|
||||||
datasource.setDriverClassName("com.mysql.jdbc.Driver");
|
datasource.setDriverClassName("com.mysql.jdbc.Driver");
|
||||||
|
} else if (url.contains("mariadb")) {
|
||||||
|
datasource.setDriverClassName("org.mariadb.jdbc.Driver");
|
||||||
}
|
}
|
||||||
datasource.setUrl(url);
|
datasource.setUrl(url);
|
||||||
datasource.setMaxActive(50);
|
datasource.setMaxActive(50);
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
// 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.gerrit.server.config.GerritServerConfig;
|
||||||
|
import com.google.gerrit.server.config.SitePaths;
|
||||||
|
import com.google.gwtorm.server.OrmDuplicateKeyException;
|
||||||
|
import com.google.gwtorm.server.OrmException;
|
||||||
|
import com.google.inject.Inject;
|
||||||
|
import com.google.inject.Singleton;
|
||||||
|
import java.sql.SQLException;
|
||||||
|
import org.eclipse.jgit.lib.Config;
|
||||||
|
|
||||||
|
@Singleton
|
||||||
|
public class MariaDBAccountPatchReviewStore extends JdbcAccountPatchReviewStore {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
MariaDBAccountPatchReviewStore(@GerritServerConfig Config cfg, SitePaths sitePaths) {
|
||||||
|
super(cfg, sitePaths);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public OrmException convertError(String op, SQLException err) {
|
||||||
|
switch (getSQLStateInt(err)) {
|
||||||
|
case 1022: // ER_DUP_KEY
|
||||||
|
case 1062: // ER_DUP_ENTRY
|
||||||
|
case 1169: // ER_DUP_UNIQUE;
|
||||||
|
return new OrmDuplicateKeyException("ACCOUNT_PATCH_REVIEWS", err);
|
||||||
|
|
||||||
|
default:
|
||||||
|
if (err.getCause() == null && err.getNextException() != null) {
|
||||||
|
err.initCause(err.getNextException());
|
||||||
|
}
|
||||||
|
return new OrmException(op + " failure on ACCOUNT_PATCH_REVIEWS", err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user