diff options
| author | Eric Hartmann <hartmann.eric@gmail.com> | 2017-07-03 12:15:00 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-07-06 12:32:00 +0200 |
| commit | bf1ca1cbcd17a623ec9c53f5069ade9f792f2b3f (patch) | |
| tree | 41de1b71a14ecdfe8852ebb3e4ce981d9879fe6e /server/sonar-db-migration | |
| parent | 4b08d04bb8db93c40fa7cffe05ed51dbdac4b81d (diff) | |
| download | sonarqube-bf1ca1cbcd17a623ec9c53f5069ade9f792f2b3f.tar.gz sonarqube-bf1ca1cbcd17a623ec9c53f5069ade9f792f2b3f.zip | |
SONAR-9481 Make operations on QProfiles resilient to ES errors
Diffstat (limited to 'server/sonar-db-migration')
3 files changed, 15 insertions, 1 deletions
diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v65/CreateEsQueueTable.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v65/CreateEsQueueTable.java index 78eaf82f6f5..2f0ec9feeb5 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v65/CreateEsQueueTable.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v65/CreateEsQueueTable.java @@ -53,6 +53,16 @@ public class CreateEsQueueTable extends DdlChange { .setIsNullable(false) .setLimit(4000) .build()) + .addColumn(VarcharColumnDef.newVarcharColumnDefBuilder() + .setColumnName("doc_id_type") + .setIsNullable(true) + .setLimit(20) + .build()) + .addColumn(VarcharColumnDef.newVarcharColumnDefBuilder() + .setColumnName("doc_routing") + .setIsNullable(true) + .setLimit(4000) + .build()) .addColumn(BigIntegerColumnDef.newBigIntegerColumnDefBuilder() .setColumnName("created_at") .setIsNullable(false) diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v65/CreateEsQueueTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v65/CreateEsQueueTableTest.java index aa8603a17e1..de6e762983e 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v65/CreateEsQueueTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v65/CreateEsQueueTableTest.java @@ -49,6 +49,8 @@ public class CreateEsQueueTableTest { db.assertColumnDefinition(TABLE, "uuid", Types.VARCHAR, 40, false); db.assertColumnDefinition(TABLE, "doc_type", Types.VARCHAR, 40, false); db.assertColumnDefinition(TABLE, "doc_id", Types.VARCHAR, 4000, false); + db.assertColumnDefinition(TABLE, "doc_id_type", Types.VARCHAR, 20, true); + db.assertColumnDefinition(TABLE, "doc_routing", Types.VARCHAR, 4000, true); db.assertColumnDefinition(TABLE, "created_at", Types.BIGINT, null, false); } } diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v65/AddIndexOnEsQueueCreatedAtTest/initial.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v65/AddIndexOnEsQueueCreatedAtTest/initial.sql index a6a15d71fa2..4c0d2b532b2 100644 --- a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v65/AddIndexOnEsQueueCreatedAtTest/initial.sql +++ b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v65/AddIndexOnEsQueueCreatedAtTest/initial.sql @@ -1,7 +1,9 @@ CREATE TABLE "ES_QUEUE" ( "UUID" VARCHAR(40) NOT NULL PRIMARY KEY, "DOC_TYPE" VARCHAR(40) NOT NULL, - "DOC_UUID" VARCHAR(255) NOT NULL, + "DOC_ID" VARCHAR(4000) NOT NULL, + "DOC_ID_TYPE" VARCHAR(20), + "DOC_ROUTING" VARCHAR(4000), "CREATED_AT" BIGINT NOT NULL ); CREATE UNIQUE INDEX "PK_ES_QUEUE" ON "ES_QUEUE" ("UUID"); |