Remove mysql_nextval script
This function does not work on binary logging enabled servers,
as MySQL is unable to execute the function on slaves without
causing possible corruption. Drop the function since it was only
created to help administrators, and is unsafe.
Change-Id: I986ac9aee5479d3c1d2ed629eeba284e940704eb
diff --git a/gerrit-reviewdb/src/main/resources/com/google/gerrit/reviewdb/server/mysql_nextval.sql b/gerrit-reviewdb/src/main/resources/com/google/gerrit/reviewdb/server/mysql_nextval.sql
deleted file mode 100644
index 2479010..0000000
--- a/gerrit-reviewdb/src/main/resources/com/google/gerrit/reviewdb/server/mysql_nextval.sql
+++ /dev/null
@@ -1,14 +0,0 @@
--- Gerrit 2 : MySQL
---
-delimiter //
-
-CREATE FUNCTION nextval_account_id ()
- RETURNS BIGINT
- LANGUAGE SQL
- NOT DETERMINISTIC
- MODIFIES SQL DATA
-BEGIN
- INSERT INTO account_id (s) VALUES (NULL);
- RETURN LAST_INSERT_ID();
-END;
-//
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/BaseDataSourceType.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/BaseDataSourceType.java
index 1d12fea..e72c3e9 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/BaseDataSourceType.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/BaseDataSourceType.java
@@ -42,11 +42,6 @@
return getScriptRunner("index_generic.sql");
}
- @Override
- public ScriptRunner getNextValScript() throws IOException {
- return ScriptRunner.NOOP;
- }
-
protected static final ScriptRunner getScriptRunner(String path) throws IOException {
if (path == null) {
return ScriptRunner.NOOP;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceType.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceType.java
index 513ef67..14cb780 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceType.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceType.java
@@ -33,12 +33,4 @@
* @throws IOException
*/
public ScriptRunner getIndexScript() throws IOException;
-
- /**
- * Return a ScriptRunner that runs the nextVal script. Must not return
- * <code>null</code>, but may return a ScriptRunner that does nothing.
- *
- * @throws IOException
- */
- public ScriptRunner getNextValScript() throws IOException;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java
index ed7aadf..8c46732 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java
@@ -23,8 +23,6 @@
import org.eclipse.jgit.lib.Config;
-import java.io.IOException;
-
class MySql extends BaseDataSourceType {
private Config cfg;
@@ -51,9 +49,4 @@
public boolean usePool() {
return false;
}
-
- @Override
- public ScriptRunner getNextValScript() throws IOException {
- return getScriptRunner("mysql_nextval.sql");
- }
}
\ No newline at end of file
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java
index 0ca5d90..1742f48 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java
@@ -119,7 +119,6 @@
}
dataSourceType.getIndexScript().run(db);
- dataSourceType.getNextValScript().run(db);
}
private AccountGroup newGroup(ReviewDb c, String name, AccountGroup.UUID uuid)
