diff options
| author | Eric Hartmann <hartmann.eric@gmail.com> | 2017-06-19 16:41:19 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-07-05 21:02:58 +0200 |
| commit | 884e73d80752e779949284176173028f5feb0100 (patch) | |
| tree | e341f05bb80751f4056a7615d360b6fc9dd7d32e /server/sonar-db-core | |
| parent | e964104ca94fdd7b975dedbbe8b15eb578b41f53 (diff) | |
| download | sonarqube-884e73d80752e779949284176173028f5feb0100.tar.gz sonarqube-884e73d80752e779949284176173028f5feb0100.zip | |
MMF-935 experiment ES resilience of user creation
Diffstat (limited to 'server/sonar-db-core')
4 files changed, 10 insertions, 21 deletions
diff --git a/server/sonar-db-core/src/main/java/org/sonar/db/DatabaseUtils.java b/server/sonar-db-core/src/main/java/org/sonar/db/DatabaseUtils.java index 6e8f7baa74f..09482d16d00 100644 --- a/server/sonar-db-core/src/main/java/org/sonar/db/DatabaseUtils.java +++ b/server/sonar-db-core/src/main/java/org/sonar/db/DatabaseUtils.java @@ -237,21 +237,6 @@ public class DatabaseUtils { } /** - * @deprecated replaced by Commons Land {@code StringUtils.repeat(sql, separator, count) - */ - @Deprecated - public static String repeatCondition(String sql, int count, String separator) { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < count; i++) { - sb.append(sql); - if (i < count - 1) { - sb.append(" ").append(separator).append(" "); - } - } - return sb.toString(); - } - - /** * Logback does not log exceptions associated to {@link java.sql.SQLException#getNextException()}. * See http://jira.qos.ch/browse/LOGBACK-775 */ diff --git a/server/sonar-db-core/src/main/java/org/sonar/db/version/SqTables.java b/server/sonar-db-core/src/main/java/org/sonar/db/version/SqTables.java index c86a1b6a92c..bff4cb2eb80 100644 --- a/server/sonar-db-core/src/main/java/org/sonar/db/version/SqTables.java +++ b/server/sonar-db-core/src/main/java/org/sonar/db/version/SqTables.java @@ -54,6 +54,7 @@ public final class SqTables { "ce_scanner_context", "default_qprofiles", "duplications_index", + "es_queue", "events", "file_sources", "groups", diff --git a/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl b/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl index 5901161d0d1..202db3d5e1f 100644 --- a/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl +++ b/server/sonar-db-core/src/main/resources/org/sonar/db/version/schema-h2.ddl @@ -658,3 +658,12 @@ CREATE TABLE "WEBHOOK_DELIVERIES" ( CREATE UNIQUE INDEX "PK_WEBHOOK_DELIVERIES" ON "WEBHOOK_DELIVERIES" ("UUID"); CREATE INDEX "COMPONENT_UUID" ON "WEBHOOK_DELIVERIES" ("COMPONENT_UUID"); CREATE INDEX "CE_TASK_UUID" ON "WEBHOOK_DELIVERIES" ("CE_TASK_UUID"); + +CREATE TABLE "ES_QUEUE" ( + "UUID" VARCHAR(40) NOT NULL PRIMARY KEY, + "DOC_TYPE" VARCHAR(40) NOT NULL, + "DOC_UUID" VARCHAR(255) NOT NULL, + "CREATED_AT" BIGINT NOT NULL +); +CREATE UNIQUE INDEX "PK_ES_QUEUE" ON "ES_QUEUE" ("UUID"); +CREATE INDEX "ES_QUEUE_CREATED_AT" ON "ES_QUEUE" ("CREATED_AT"); diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/DatabaseUtilsTest.java b/server/sonar-db-core/src/test/java/org/sonar/db/DatabaseUtilsTest.java index 88dcd5e5a2e..49060d8bf60 100644 --- a/server/sonar-db-core/src/test/java/org/sonar/db/DatabaseUtilsTest.java +++ b/server/sonar-db-core/src/test/java/org/sonar/db/DatabaseUtilsTest.java @@ -245,12 +245,6 @@ public class DatabaseUtilsTest { } @Test - public void repeatCondition() { - assertThat(DatabaseUtils.repeatCondition("uuid=?", 1, "or")).isEqualTo("uuid=?"); - assertThat(DatabaseUtils.repeatCondition("uuid=?", 3, "or")).isEqualTo("uuid=? or uuid=? or uuid=?"); - } - - @Test public void executeLargeInputs() { List<Integer> inputs = newArrayList(); List<String> expectedOutputs = newArrayList(); |