Repository: aurora Updated Branches: refs/heads/master 62a432a67 -> 144cf60b1
DB task store: Remove invalid constraint on task_config_metadata. Bugs closed: AURORA-1383 Reviewed at https://reviews.apache.org/r/36319/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/144cf60b Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/144cf60b Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/144cf60b Branch: refs/heads/master Commit: 144cf60b16feed9b9fafcdc13d228d132a8e8abd Parents: 62a432a Author: Bill Farner <[email protected]> Authored: Wed Jul 8 13:57:26 2015 -0700 Committer: Bill Farner <[email protected]> Committed: Wed Jul 8 13:57:26 2015 -0700 ---------------------------------------------------------------------- .../org/apache/aurora/scheduler/storage/db/schema.sql | 4 +--- .../scheduler/storage/AbstractTaskStoreTest.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/144cf60b/src/main/resources/org/apache/aurora/scheduler/storage/db/schema.sql ---------------------------------------------------------------------- diff --git a/src/main/resources/org/apache/aurora/scheduler/storage/db/schema.sql b/src/main/resources/org/apache/aurora/scheduler/storage/db/schema.sql index 687010e..52494af 100644 --- a/src/main/resources/org/apache/aurora/scheduler/storage/db/schema.sql +++ b/src/main/resources/org/apache/aurora/scheduler/storage/db/schema.sql @@ -243,9 +243,7 @@ CREATE TABLE task_config_metadata( id IDENTITY, task_config_id INT NOT NULL REFERENCES task_configs(id) ON DELETE CASCADE, key VARCHAR NOT NULL, - value VARCHAR NOT NULL, - - UNIQUE(task_config_id) + value VARCHAR NOT NULL ); CREATE TABLE task_config_docker_containers( http://git-wip-us.apache.org/repos/asf/aurora/blob/144cf60b/src/test/java/org/apache/aurora/scheduler/storage/AbstractTaskStoreTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/AbstractTaskStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/AbstractTaskStoreTest.java index edfeb09..c8a2d81 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/AbstractTaskStoreTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/AbstractTaskStoreTest.java @@ -38,6 +38,7 @@ import org.apache.aurora.gen.ExecutorConfig; import org.apache.aurora.gen.HostAttributes; import org.apache.aurora.gen.MaintenanceMode; import org.apache.aurora.gen.MesosContainer; +import org.apache.aurora.gen.Metadata; import org.apache.aurora.gen.ScheduleStatus; import org.apache.aurora.gen.ScheduledTask; import org.apache.aurora.gen.TaskQuery; @@ -180,6 +181,18 @@ public abstract class AbstractTaskStoreTest { } @Test + public void testSaveWithMetadata() { + ScheduledTask builder = TASK_A.newBuilder(); + builder.getAssignedTask().getTask().setMetadata( + ImmutableSet.of( + new Metadata("package", "a"), + new Metadata("package", "b"))); + IScheduledTask task = IScheduledTask.build(builder); + saveTasks(task); + assertStoreContents(task); + } + + @Test public void testQuery() { assertStoreContents(); saveTasks(TASK_A, TASK_B, TASK_C, TASK_D);
