Add support for Apache Derby database

In the current gwtorm implementation, column renames for columns
with a check constraint are not supported by Apache Derby.
To rename a column with a check constraint the column constraint
must be dropped manualy. After that the column can be renamed by
the gwtorm implementation. After the renaming the constraint can
be added again.

Test plan:

* Replace H2 with Apache Derby, add derby to Buck tests rules as
  new dependency and run the tests with `buck test`
* Set up new site with Apache Derby database and perform the tests

Bug: Issue 3441
Change-Id: I46e719ed54ea633c127c7bcd381b882e3a9b37ba
This commit is contained in:
David Ostrovsky 2015-09-26 14:17:50 +02:00
parent b0019cdcbb
commit 793d8697e6
8 changed files with 127 additions and 4 deletions

View File

@ -18,6 +18,20 @@ and it's not possible to set up H2 in a load balanced/hotswap configuration.
If this option interests you, you might want to consider link:install-quick.html[the quick guide].
[[createdb_debry]]
=== Apache Derby
If Derby is selected, Gerrit will automatically set up the embedded Derby
database as backend so no set up or configuration is necessary.
Currently only support for embedded mode is added. There are two other
deployment options for Apache Derby that can be added later [1]:
+
* Derby Network Server (standalone mode)
* Embedded Server (hybrid mode)
+
[1] http://db.apache.org/derby/papers/DerbyTut/ns_intro.html#ns
[[createdb_postgres]]
=== PostgreSQL

View File

@ -45,6 +45,7 @@ java_library(
'//gerrit-common:annotations',
'//gerrit-lucene:lucene',
'//lib:args4j',
'//lib:derby',
'//lib:gwtjsonrpc',
'//lib:gwtorm',
'//lib:h2',

View File

@ -31,6 +31,8 @@ public class DatabaseConfigModule extends AbstractModule {
bind(SitePaths.class).toInstance(site);
bind(DatabaseConfigInitializer.class).annotatedWith(
Names.named("db2")).to(DB2Initializer.class);
bind(DatabaseConfigInitializer.class).annotatedWith(
Names.named("derby")).to(DerbyInitializer.class);
bind(DatabaseConfigInitializer.class).annotatedWith(
Names.named("h2")).to(H2Initializer.class);
bind(DatabaseConfigInitializer.class).annotatedWith(

View File

@ -0,0 +1,51 @@
// Copyright (C) 2015 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.pgm.init;
import static com.google.gerrit.pgm.init.api.InitUtil.die;
import com.google.gerrit.common.FileUtil;
import com.google.gerrit.pgm.init.api.Section;
import com.google.gerrit.server.config.SitePaths;
import com.google.inject.Inject;
import java.nio.file.Path;
class DerbyInitializer implements DatabaseConfigInitializer {
private final SitePaths site;
@Inject
DerbyInitializer(final SitePaths site) {
this.site = site;
}
@Override
public void initConfig(Section databaseSection) {
String path = databaseSection.get("database");
Path db;
if (path == null) {
db = site.resolve("db").resolve("ReviewDB");
databaseSection.set("database", db.toString());
} else {
db = site.resolve(path);
}
if (db == null) {
throw die("database.database must be supplied for Derby");
}
db = db.getParent();
FileUtil.mkdirsOrDie(db, "cannot create database.database");
}
}

View File

@ -33,7 +33,9 @@ class JDBCInitializer implements DatabaseConfigInitializer {
private void guessDriver(Section database) {
String url = Strings.emptyToNull(database.get("url"));
if (url != null && Strings.isNullOrEmpty(database.get("driver"))) {
if (url.startsWith("jdbc:h2:")) {
if (url.startsWith("jdbc:derby:")) {
database.set("driver", "org.apache.derby.jdbc.EmbeddedDriver");
} else if (url.startsWith("jdbc:h2:")) {
database.set("driver", "org.h2.Driver");
} else if (url.startsWith("jdbc:mysql:")) {
database.set("driver", "com.mysql.jdbc.Driver");

View File

@ -22,6 +22,7 @@ public class DataSourceModule extends AbstractModule {
@Override
protected void configure() {
bind(DataSourceType.class).annotatedWith(Names.named("db2")).to(DB2.class);
bind(DataSourceType.class).annotatedWith(Names.named("derby")).to(Derby.class);
bind(DataSourceType.class).annotatedWith(Names.named("h2")).to(H2.class);
bind(DataSourceType.class).annotatedWith(Names.named("jdbc")).to(JDBC.class);
bind(DataSourceType.class).annotatedWith(Names.named("mysql")).to(MySql.class);

View File

@ -0,0 +1,44 @@
// Copyright (C) 2015 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.inject.Inject;
import org.eclipse.jgit.lib.Config;
class Derby extends BaseDataSourceType {
protected final Config cfg;
private final SitePaths site;
@Inject
Derby(@GerritServerConfig Config cfg,
SitePaths site) {
super("org.apache.derby.jdbc.EmbeddedDriver");
this.cfg = cfg;
this.site = site;
}
@Override
public String getUrl() {
String database = cfg.getString("database", null, "database");
if (database == null || database.isEmpty()) {
database = "db/ReviewDB";
}
return "jdbc:derby:" + site.resolve(database).toString() + ";create=true";
}
}

View File

@ -26,9 +26,9 @@ define_license(name = 'DO_NOT_DISTRIBUTE')
maven_jar(
name = 'gwtorm_client',
id = 'com.google.gerrit:gwtorm:1.14-16-gc4e356a',
bin_sha1 = '01225468065812bbe5f27972df6dafa9d796d833',
src_sha1 = '3622460ed58684cb33f786e3748637c8eea324f9',
id = 'com.google.gerrit:gwtorm:1.14-20-gec13fdc',
bin_sha1 = '60c2f2a5584959343ad1b21c3c79ba0fe825ceac',
src_sha1 = '4c562a3aafd1c3828217ee178568ed3d34ec86eb',
license = 'Apache2.0',
repository = GERRIT,
)
@ -151,6 +151,14 @@ maven_jar(
visibility = ['//lib:grappa'],
)
maven_jar(
name = 'derby',
id = 'org.apache.derby:derby:10.11.1.1',
sha1 = 'df4b50061e8e4c348ce243b921f53ee63ba9bbe1',
license = 'Apache2.0',
attach_source = False,
)
maven_jar(
name = 'h2',
id = 'com.h2database:h2:1.3.176',