From 74a977504ea4ed5b2290f8e26166ff871f7c7333 Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Fri, 14 Dec 2012 17:06:03 -0800 Subject: [PATCH 01/43] bug fix for dropping segments in master --- .../query/timeboundary/TimeBoundaryQuery.java | 4 +- .../com/metamx/druid/master/ServerHolder.java | 7 +- .../metamx/druid/master/rules/LoadRule.java | 26 +-- .../master/DruidMasterRuleRunnerTest.java | 149 ++++++++++++++++-- 4 files changed, 162 insertions(+), 24 deletions(-) diff --git a/client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQuery.java b/client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQuery.java index 541d5342c73..9c7340595c5 100644 --- a/client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQuery.java +++ b/client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQuery.java @@ -43,8 +43,8 @@ import java.util.Map; public class TimeBoundaryQuery extends BaseQuery> { public static final Interval MY_Y2K_INTERVAL = new Interval( - new DateTime(Long.MIN_VALUE), - new DateTime(Long.MAX_VALUE) + new DateTime("0000-01-01"), + new DateTime("9000-01-01") ); public static final String MAX_TIME = "maxTime"; public static final String MIN_TIME = "minTime"; diff --git a/server/src/main/java/com/metamx/druid/master/ServerHolder.java b/server/src/main/java/com/metamx/druid/master/ServerHolder.java index 6cf4d65ce3f..82c31fd7337 100644 --- a/server/src/main/java/com/metamx/druid/master/ServerHolder.java +++ b/server/src/main/java/com/metamx/druid/master/ServerHolder.java @@ -94,9 +94,14 @@ public class ServerHolder implements Comparable return availableSize; } + public boolean isServingSegment(DataSegment segment) + { + return (server.getSegment(segment.getIdentifier()) != null); + } + public boolean containsSegment(DataSegment segment) { - return (server.getSegment(segment.getIdentifier()) != null || peon.getSegmentsToLoad().contains(segment)); + return isServingSegment(segment) || peon.getSegmentsToLoad().contains(segment); } @Override diff --git a/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java b/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java index b3d256d2066..f3b5de84bf9 100644 --- a/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java +++ b/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java @@ -163,23 +163,25 @@ public abstract class LoadRule implements Rule while (actualNumReplicantsForType > expectedNumReplicantsForType) { ServerHolder holder = serverQueue.pollLast(); if (holder == null) { - log.warn("Wtf, holder was null? Do I have no servers[%s]?", serverQueue); - continue; + log.warn("Wtf, holder was null? I have no servers serving [%s]?", segment.getIdentifier()); + break; } - holder.getPeon().dropSegment( - segment, - new LoadPeonCallback() - { - @Override - protected void execute() + if (holder.isServingSegment(segment)) { + holder.getPeon().dropSegment( + segment, + new LoadPeonCallback() { + @Override + protected void execute() + { + } } - } - ); + ); + --actualNumReplicantsForType; + stats.addToTieredStat("droppedCount", tier, 1); + } droppedServers.add(holder); - --actualNumReplicantsForType; - stats.addToTieredStat("droppedCount", tier, 1); } serverQueue.addAll(droppedServers); } diff --git a/server/src/test/java/com/metamx/druid/master/DruidMasterRuleRunnerTest.java b/server/src/test/java/com/metamx/druid/master/DruidMasterRuleRunnerTest.java index c31dc670b82..acde8a14707 100644 --- a/server/src/test/java/com/metamx/druid/master/DruidMasterRuleRunnerTest.java +++ b/server/src/test/java/com/metamx/druid/master/DruidMasterRuleRunnerTest.java @@ -31,7 +31,6 @@ import com.metamx.druid.db.DatabaseRuleManager; import com.metamx.druid.master.rules.IntervalDropRule; import com.metamx.druid.master.rules.IntervalLoadRule; import com.metamx.druid.master.rules.Rule; -import com.metamx.druid.master.rules.RuleMap; import com.metamx.druid.shard.NoneShardSpec; import com.metamx.emitter.EmittingLogger; import com.metamx.emitter.service.ServiceEmitter; @@ -86,14 +85,6 @@ public class DruidMasterRuleRunnerTest } ruleRunner = new DruidMasterRuleRunner(master); - - mockPeon.loadSegment(EasyMock.anyObject(), EasyMock.anyObject()); - EasyMock.expectLastCall().anyTimes(); - mockPeon.dropSegment(EasyMock.anyObject(), EasyMock.anyObject()); - EasyMock.expectLastCall().anyTimes(); - EasyMock.expect(mockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).anyTimes(); - EasyMock.expect(mockPeon.getLoadQueueSize()).andReturn(0L).atLeastOnce(); - EasyMock.replay(mockPeon); } @After @@ -113,6 +104,12 @@ public class DruidMasterRuleRunnerTest @Test public void testRunThreeTiersOneReplicant() throws Exception { + mockPeon.loadSegment(EasyMock.anyObject(), EasyMock.anyObject()); + EasyMock.expectLastCall().atLeastOnce(); + EasyMock.expect(mockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); + EasyMock.expect(mockPeon.getLoadQueueSize()).andReturn(0L).atLeastOnce(); + EasyMock.replay(mockPeon); + EasyMock.expect(databaseRuleManager.getRulesWithDefault(EasyMock.anyObject())).andReturn( Lists.newArrayList( new IntervalLoadRule(new Interval("2012-01-01T00:00:00.000Z/2012-01-01T06:00:00.000Z"), 1, "hot"), @@ -202,6 +199,12 @@ public class DruidMasterRuleRunnerTest @Test public void testRunTwoTiersTwoReplicants() throws Exception { + mockPeon.loadSegment(EasyMock.anyObject(), EasyMock.anyObject()); + EasyMock.expectLastCall().atLeastOnce(); + EasyMock.expect(mockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); + EasyMock.expect(mockPeon.getLoadQueueSize()).andReturn(0L).atLeastOnce(); + EasyMock.replay(mockPeon); + EasyMock.expect(databaseRuleManager.getRulesWithDefault(EasyMock.anyObject())).andReturn( Lists.newArrayList( new IntervalLoadRule(new Interval("2012-01-01T00:00:00.000Z/2012-01-01T06:00:00.000Z"), 2, "hot"), @@ -284,6 +287,12 @@ public class DruidMasterRuleRunnerTest @Test public void testRunTwoTiersWithExistingSegments() throws Exception { + mockPeon.loadSegment(EasyMock.anyObject(), EasyMock.anyObject()); + EasyMock.expectLastCall().atLeastOnce(); + EasyMock.expect(mockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); + EasyMock.expect(mockPeon.getLoadQueueSize()).andReturn(0L).atLeastOnce(); + EasyMock.replay(mockPeon); + EasyMock.expect(databaseRuleManager.getRulesWithDefault(EasyMock.anyObject())).andReturn( Lists.newArrayList( new IntervalLoadRule(new Interval("2012-01-01T00:00:00.000Z/2012-01-01T12:00:00.000Z"), 1, "hot"), @@ -356,6 +365,12 @@ public class DruidMasterRuleRunnerTest @Test public void testRunTwoTiersTierDoesNotExist() throws Exception { + mockPeon.loadSegment(EasyMock.anyObject(), EasyMock.anyObject()); + EasyMock.expectLastCall().atLeastOnce(); + EasyMock.expect(mockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); + EasyMock.expect(mockPeon.getLoadQueueSize()).andReturn(0L).atLeastOnce(); + EasyMock.replay(mockPeon); + emitter.emit(EasyMock.anyObject()); EasyMock.expectLastCall().times(12); EasyMock.replay(emitter); @@ -455,6 +470,12 @@ public class DruidMasterRuleRunnerTest @Test public void testDropRemove() throws Exception { + mockPeon.dropSegment(EasyMock.anyObject(), EasyMock.anyObject()); + EasyMock.expectLastCall().atLeastOnce(); + EasyMock.expect(mockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); + EasyMock.expect(mockPeon.getLoadQueueSize()).andReturn(0L).atLeastOnce(); + EasyMock.replay(mockPeon); + master.removeSegment(EasyMock.anyObject()); EasyMock.expectLastCall().atLeastOnce(); EasyMock.replay(master); @@ -513,6 +534,12 @@ public class DruidMasterRuleRunnerTest @Test public void testDropTooManyInSameTier() throws Exception { + mockPeon.dropSegment(EasyMock.anyObject(), EasyMock.anyObject()); + EasyMock.expectLastCall().atLeastOnce(); + EasyMock.expect(mockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); + EasyMock.expect(mockPeon.getLoadQueueSize()).andReturn(0L).atLeastOnce(); + EasyMock.replay(mockPeon); + EasyMock.expect(databaseRuleManager.getRulesWithDefault(EasyMock.anyObject())).andReturn( Lists.newArrayList( new IntervalLoadRule(new Interval("2012-01-01T00:00:00.000Z/2012-01-01T12:00:00.000Z"), 1, "normal"), @@ -581,6 +608,14 @@ public class DruidMasterRuleRunnerTest @Test public void testDropTooManyInDifferentTiers() throws Exception { + mockPeon.loadSegment(EasyMock.anyObject(), EasyMock.anyObject()); + EasyMock.expectLastCall().atLeastOnce(); + mockPeon.dropSegment(EasyMock.anyObject(), EasyMock.anyObject()); + EasyMock.expectLastCall().atLeastOnce(); + EasyMock.expect(mockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); + EasyMock.expect(mockPeon.getLoadQueueSize()).andReturn(0L).atLeastOnce(); + EasyMock.replay(mockPeon); + EasyMock.expect(databaseRuleManager.getRulesWithDefault(EasyMock.anyObject())).andReturn( Lists.newArrayList( new IntervalLoadRule(new Interval("2012-01-01T00:00:00.000Z/2012-01-01T12:00:00.000Z"), 1, "hot"), @@ -653,6 +688,14 @@ public class DruidMasterRuleRunnerTest @Test public void testDontDropInDifferentTiers() throws Exception { + mockPeon.loadSegment(EasyMock.anyObject(), EasyMock.anyObject()); + EasyMock.expectLastCall().atLeastOnce(); + mockPeon.dropSegment(EasyMock.anyObject(), EasyMock.anyObject()); + EasyMock.expectLastCall().atLeastOnce(); + EasyMock.expect(mockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); + EasyMock.expect(mockPeon.getLoadQueueSize()).andReturn(0L).atLeastOnce(); + EasyMock.replay(mockPeon); + EasyMock.expect(databaseRuleManager.getRulesWithDefault(EasyMock.anyObject())).andReturn( Lists.newArrayList( new IntervalLoadRule(new Interval("2012-01-01T00:00:00.000Z/2012-01-01T12:00:00.000Z"), 1, "hot"), @@ -717,4 +760,92 @@ public class DruidMasterRuleRunnerTest Assert.assertTrue(stats.getPerTierStats().get("droppedCount") == null); Assert.assertTrue(stats.getGlobalStats().get("deletedCount").get() == 12); } + + @Test + public void testDropServerActuallyServesSegment() throws Exception + { + EasyMock.expect(databaseRuleManager.getRulesWithDefault(EasyMock.anyObject())).andReturn( + Lists.newArrayList( + new IntervalLoadRule(new Interval("2012-01-01T00:00:00.000Z/2012-01-01T01:00:00.000Z"), 0, "normal") + ) + ).atLeastOnce(); + EasyMock.replay(databaseRuleManager); + + DruidServer server1 = new DruidServer( + "server1", + "host1", + 1000, + "historical", + "normal" + ); + server1.addDataSegment(availableSegments.get(0).getIdentifier(), availableSegments.get(0)); + DruidServer server2 = new DruidServer( + "serverNorm2", + "hostNorm2", + 1000, + "historical", + "normal" + ); + server2.addDataSegment(availableSegments.get(1).getIdentifier(), availableSegments.get(1)); + DruidServer server3 = new DruidServer( + "serverNorm3", + "hostNorm3", + 1000, + "historical", + "normal" + ); + server3.addDataSegment(availableSegments.get(1).getIdentifier(), availableSegments.get(1)); + server3.addDataSegment(availableSegments.get(2).getIdentifier(), availableSegments.get(2)); + + mockPeon.dropSegment(EasyMock.anyObject(), EasyMock.anyObject()); + EasyMock.expectLastCall().atLeastOnce(); + EasyMock.expect(mockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); + EasyMock.expect(mockPeon.getLoadQueueSize()).andReturn(0L).atLeastOnce(); + EasyMock.replay(mockPeon); + + LoadQueuePeon anotherMockPeon = EasyMock.createMock(LoadQueuePeon.class); + EasyMock.expect(anotherMockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); + EasyMock.expect(anotherMockPeon.getLoadQueueSize()).andReturn(10L).atLeastOnce(); + EasyMock.replay(anotherMockPeon); + + DruidCluster druidCluster = new DruidCluster( + ImmutableMap.of( + "normal", + MinMaxPriorityQueue.orderedBy(Ordering.natural().reverse()).create( + Arrays.asList( + new ServerHolder( + server1, + mockPeon + ), + new ServerHolder( + server2, + anotherMockPeon + ), + new ServerHolder( + server3, + anotherMockPeon + ) + ) + ) + ) + ); + + SegmentReplicantLookup segmentReplicantLookup = SegmentReplicantLookup.make(druidCluster); + + DruidMasterRuntimeParams params = new DruidMasterRuntimeParams.Builder() + .withDruidCluster(druidCluster) + .withMillisToWaitBeforeDeleting(0L) + .withAvailableSegments(availableSegments) + .withDatabaseRuleManager(databaseRuleManager) + .withSegmentReplicantLookup(segmentReplicantLookup) + .build(); + + DruidMasterRuntimeParams afterParams = ruleRunner.run(params); + MasterStats stats = afterParams.getMasterStats(); + + Assert.assertTrue(stats.getPerTierStats().get("droppedCount").get("normal").get() == 1); + + EasyMock.verify(mockPeon); + EasyMock.verify(anotherMockPeon); + } } From 4e78d8e73472274679e2771a59ad118ef8518fae Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Fri, 14 Dec 2012 17:19:53 -0800 Subject: [PATCH 02/43] [maven-release-plugin] prepare release druid-0.1.15 --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index a9a2efedf89..c0a809e41bb 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.15-SNAPSHOT + 0.1.15 diff --git a/common/pom.xml b/common/pom.xml index 344e709443b..03463d9be7b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.15-SNAPSHOT + 0.1.15 diff --git a/druid-services/pom.xml b/druid-services/pom.xml index 5a1ad70fb57..41d693b2128 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.15-SNAPSHOT + 0.1.15 com.metamx druid - 0.1.15-SNAPSHOT + 0.1.15 diff --git a/examples/pom.xml b/examples/pom.xml index 16f4976302c..692f4b6f475 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.15-SNAPSHOT + 0.1.15 diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 6cf3453b17e..a7bcc8bd1ba 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.15-SNAPSHOT + 0.1.15 diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index f0e1e9d4276..67405ffcb31 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.15-SNAPSHOT + 0.1.15 diff --git a/index-common/pom.xml b/index-common/pom.xml index 767e0e14685..838e95e12c5 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.15-SNAPSHOT + 0.1.15 diff --git a/indexer/pom.xml b/indexer/pom.xml index 8e6ff353a2e..98582b7b6e9 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.15-SNAPSHOT + 0.1.15 diff --git a/merger/pom.xml b/merger/pom.xml index f605d10111f..3f2a4472919 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.15-SNAPSHOT + 0.1.15 diff --git a/pom.xml b/pom.xml index 9d33d272966..d29c7c312c4 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.15-SNAPSHOT + 0.1.15 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 71ae520036c..3999fc99858 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.15-SNAPSHOT + 0.1.15 diff --git a/server/pom.xml b/server/pom.xml index 62e2784f636..e6016e86ab7 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.15-SNAPSHOT + 0.1.15 From e37e24cc2576736774169a11cb3226f7bb8b3c7e Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Fri, 14 Dec 2012 17:19:59 -0800 Subject: [PATCH 03/43] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index c0a809e41bb..38f71cb3e85 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.15 + 0.1.16-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 03463d9be7b..76c5a96bc10 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.15 + 0.1.16-SNAPSHOT diff --git a/druid-services/pom.xml b/druid-services/pom.xml index 41d693b2128..82aab92863c 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.15 + 0.1.16-SNAPSHOT com.metamx druid - 0.1.15 + 0.1.16-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 692f4b6f475..18f1cb8a322 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.15 + 0.1.16-SNAPSHOT diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index a7bcc8bd1ba..5713ac2fa33 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.15 + 0.1.16-SNAPSHOT diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index 67405ffcb31..34360cd1347 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.15 + 0.1.16-SNAPSHOT diff --git a/index-common/pom.xml b/index-common/pom.xml index 838e95e12c5..88581e97026 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.15 + 0.1.16-SNAPSHOT diff --git a/indexer/pom.xml b/indexer/pom.xml index 98582b7b6e9..39465d1c441 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.15 + 0.1.16-SNAPSHOT diff --git a/merger/pom.xml b/merger/pom.xml index 3f2a4472919..0df1c7c4ae1 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.15 + 0.1.16-SNAPSHOT diff --git a/pom.xml b/pom.xml index d29c7c312c4..48bc919fe22 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.15 + 0.1.16-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 3999fc99858..4f6214111fc 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.15 + 0.1.16-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index e6016e86ab7..77c2e9291f9 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.15 + 0.1.16-SNAPSHOT From 61afd0a46a141a2ce405d598d64d4464e6405612 Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Fri, 14 Dec 2012 18:13:57 -0800 Subject: [PATCH 04/43] Merger: De-parameterize alert messages --- .../merger/coordinator/RemoteTaskRunner.java | 20 +++++++++-------- .../merger/coordinator/exec/TaskConsumer.java | 22 +++++-------------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java index 35fe72db968..2a235b88d86 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java @@ -211,10 +211,10 @@ public class RemoteTaskRunner implements TaskRunner } else { Duration durSinceLastTerminate = new Duration(new DateTime(), lastTerminateTime); if (durSinceLastTerminate.isLongerThan(config.getMaxScalingDuration())) { - log.makeAlert( - "It has been %d millis since last scheduled termination but nodes remain", - durSinceLastTerminate.getMillis() - ).emit(); + log.makeAlert("Worker node termination taking too long") + .addData("millisSinceLastTerminate", durSinceLastTerminate.getMillis()) + .addData("terminatingCount", currentlyTerminating.size()) + .emit(); } log.info( @@ -330,7 +330,9 @@ public class RemoteTaskRunner implements TaskRunner log.info("Registering retry for failed task[%s]", task.getId()); if (retryPolicy.hasExceededRetryThreshold()) { - log.makeAlert("Task [%s] has failed[%d] times, giving up!", task.getId(), retryPolicy.getNumRetries()) + log.makeAlert("Task exceeded maximum retry count") + .addData("task", task.getId()) + .addData("retryCount", retryPolicy.getNumRetries()) .emit(); return; } @@ -542,10 +544,10 @@ public class RemoteTaskRunner implements TaskRunner } else { Duration durSinceLastProvision = new Duration(new DateTime(), lastProvisionTime); if (durSinceLastProvision.isLongerThan(config.getMaxScalingDuration())) { - log.makeAlert( - "It has been %d millis since last scheduled provision but nodes remain", - durSinceLastProvision.getMillis() - ).emit(); + log.makeAlert("Worker node provisioning taking too long") + .addData("millisSinceLastProvision", durSinceLastProvision.getMillis()) + .addData("provisioningCount", currentlyProvisioning.size()) + .emit(); } log.info( diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/exec/TaskConsumer.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/exec/TaskConsumer.java index 201bfdf338d..ed7ac9f3f25 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/exec/TaskConsumer.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/exec/TaskConsumer.java @@ -20,11 +20,9 @@ package com.metamx.druid.merger.coordinator.exec; import com.google.common.base.Throwables; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.metamx.common.lifecycle.LifecycleStart; import com.metamx.common.lifecycle.LifecycleStop; -import com.metamx.common.logger.Logger; import com.metamx.druid.client.DataSegment; import com.metamx.druid.merger.common.TaskStatus; import com.metamx.druid.merger.common.task.Task; @@ -35,12 +33,9 @@ import com.metamx.druid.merger.coordinator.TaskQueue; import com.metamx.druid.merger.coordinator.TaskRunner; import com.metamx.druid.merger.coordinator.VersionedTaskWrapper; import com.metamx.emitter.EmittingLogger; -import com.metamx.emitter.service.AlertEvent; import com.metamx.emitter.service.ServiceEmitter; import com.metamx.emitter.service.ServiceMetricEvent; -import java.util.concurrent.ExecutorService; - public class TaskConsumer implements Runnable { private final TaskQueue queue; @@ -242,17 +237,12 @@ public class TaskConsumer implements Runnable emitter.emit(builder.build("indexer/segment/bytes", bytes)); if (status.isFailure()) { - emitter.emit( - new AlertEvent.Builder().build( - String.format("Failed to index: %s", task.getDataSource()), - ImmutableMap.builder() - .put("task", task.getId()) - .put("type", task.getType().toString()) - .put("dataSource", task.getDataSource()) - .put("interval", task.getInterval()) - .build() - ) - ); + log.makeAlert("Failed to index") + .addData("task", task.getId()) + .addData("type", task.getType().toString()) + .addData("dataSource", task.getDataSource()) + .addData("interval", task.getInterval()) + .emit(); } log.info( From 6a11e99681d68103766157f29fc01fcfb231d728 Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Fri, 14 Dec 2012 21:27:18 -0800 Subject: [PATCH 05/43] bug fixes for dropping segments and logging --- .../metamx/druid/master/SegmentReplicantLookup.java | 13 +------------ .../com/metamx/druid/master/rules/LoadRule.java | 1 + .../druid/master/DruidMasterRuleRunnerTest.java | 7 ++----- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/server/src/main/java/com/metamx/druid/master/SegmentReplicantLookup.java b/server/src/main/java/com/metamx/druid/master/SegmentReplicantLookup.java index 5c5d3bee655..3ba778ababe 100644 --- a/server/src/main/java/com/metamx/druid/master/SegmentReplicantLookup.java +++ b/server/src/main/java/com/metamx/druid/master/SegmentReplicantLookup.java @@ -42,18 +42,7 @@ public class SegmentReplicantLookup for (ServerHolder serverHolder : serversByType) { DruidServer server = serverHolder.getServer(); - for (DruidDataSource dataSource : server.getDataSources()) { - for (DataSegment segment : dataSource.getSegments()) { - Integer numReplicants = segmentsInCluster.get(segment.getIdentifier(), server.getTier()); - if (numReplicants == null) { - numReplicants = 0; - } - segmentsInCluster.put(segment.getIdentifier(), server.getTier(), ++numReplicants); - } - } - - // Also account for queued segments - for (DataSegment segment : serverHolder.getPeon().getSegmentsToLoad()) { + for (DataSegment segment : server.getSegments().values()) { Integer numReplicants = segmentsInCluster.get(segment.getIdentifier(), server.getTier()); if (numReplicants == null) { numReplicants = 0; diff --git a/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java b/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java index f3b5de84bf9..ab093f4e070 100644 --- a/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java +++ b/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java @@ -84,6 +84,7 @@ public abstract class LoadRule implements Rule break; } if (holder.containsSegment(segment)) { + serverQueue.add(holder); continue; } diff --git a/server/src/test/java/com/metamx/druid/master/DruidMasterRuleRunnerTest.java b/server/src/test/java/com/metamx/druid/master/DruidMasterRuleRunnerTest.java index acde8a14707..3d0e28b640c 100644 --- a/server/src/test/java/com/metamx/druid/master/DruidMasterRuleRunnerTest.java +++ b/server/src/test/java/com/metamx/druid/master/DruidMasterRuleRunnerTest.java @@ -536,7 +536,6 @@ public class DruidMasterRuleRunnerTest { mockPeon.dropSegment(EasyMock.anyObject(), EasyMock.anyObject()); EasyMock.expectLastCall().atLeastOnce(); - EasyMock.expect(mockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); EasyMock.expect(mockPeon.getLoadQueueSize()).andReturn(0L).atLeastOnce(); EasyMock.replay(mockPeon); @@ -690,8 +689,6 @@ public class DruidMasterRuleRunnerTest { mockPeon.loadSegment(EasyMock.anyObject(), EasyMock.anyObject()); EasyMock.expectLastCall().atLeastOnce(); - mockPeon.dropSegment(EasyMock.anyObject(), EasyMock.anyObject()); - EasyMock.expectLastCall().atLeastOnce(); EasyMock.expect(mockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); EasyMock.expect(mockPeon.getLoadQueueSize()).andReturn(0L).atLeastOnce(); EasyMock.replay(mockPeon); @@ -759,6 +756,8 @@ public class DruidMasterRuleRunnerTest Assert.assertTrue(stats.getPerTierStats().get("droppedCount") == null); Assert.assertTrue(stats.getGlobalStats().get("deletedCount").get() == 12); + + EasyMock.verify(mockPeon); } @Test @@ -799,12 +798,10 @@ public class DruidMasterRuleRunnerTest mockPeon.dropSegment(EasyMock.anyObject(), EasyMock.anyObject()); EasyMock.expectLastCall().atLeastOnce(); - EasyMock.expect(mockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); EasyMock.expect(mockPeon.getLoadQueueSize()).andReturn(0L).atLeastOnce(); EasyMock.replay(mockPeon); LoadQueuePeon anotherMockPeon = EasyMock.createMock(LoadQueuePeon.class); - EasyMock.expect(anotherMockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); EasyMock.expect(anotherMockPeon.getLoadQueueSize()).andReturn(10L).atLeastOnce(); EasyMock.replay(anotherMockPeon); From a0d22a66469aa9a0296fb88118e1df31338afd35 Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Fri, 14 Dec 2012 21:29:14 -0800 Subject: [PATCH 06/43] [maven-release-plugin] prepare release druid-0.1.16 --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 38f71cb3e85..456090f6017 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.16-SNAPSHOT + 0.1.16 diff --git a/common/pom.xml b/common/pom.xml index 76c5a96bc10..bd3a490377f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.16-SNAPSHOT + 0.1.16 diff --git a/druid-services/pom.xml b/druid-services/pom.xml index 82aab92863c..f323bc175a0 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.16-SNAPSHOT + 0.1.16 com.metamx druid - 0.1.16-SNAPSHOT + 0.1.16 diff --git a/examples/pom.xml b/examples/pom.xml index 18f1cb8a322..c6ec4f60c07 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.16-SNAPSHOT + 0.1.16 diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 5713ac2fa33..921040d522d 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.16-SNAPSHOT + 0.1.16 diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index 34360cd1347..d3c30576bdb 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.16-SNAPSHOT + 0.1.16 diff --git a/index-common/pom.xml b/index-common/pom.xml index 88581e97026..35fa75e6210 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.16-SNAPSHOT + 0.1.16 diff --git a/indexer/pom.xml b/indexer/pom.xml index 39465d1c441..5d85220a879 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.16-SNAPSHOT + 0.1.16 diff --git a/merger/pom.xml b/merger/pom.xml index 0df1c7c4ae1..7079e21efa0 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.16-SNAPSHOT + 0.1.16 diff --git a/pom.xml b/pom.xml index 48bc919fe22..f7a434aa6b4 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.16-SNAPSHOT + 0.1.16 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 4f6214111fc..d4e3af3dbc2 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.16-SNAPSHOT + 0.1.16 diff --git a/server/pom.xml b/server/pom.xml index 77c2e9291f9..a142014d2e8 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.16-SNAPSHOT + 0.1.16 From 0821dce8c134b87bb9fbab0c04d858bde17e546e Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Fri, 14 Dec 2012 21:29:20 -0800 Subject: [PATCH 07/43] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 456090f6017..587c7804b20 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.16 + 0.1.17-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index bd3a490377f..34c04ad3321 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.16 + 0.1.17-SNAPSHOT diff --git a/druid-services/pom.xml b/druid-services/pom.xml index f323bc175a0..5abea496c3c 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.16 + 0.1.17-SNAPSHOT com.metamx druid - 0.1.16 + 0.1.17-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index c6ec4f60c07..3eb69704827 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.16 + 0.1.17-SNAPSHOT diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 921040d522d..6a9d20ee362 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.16 + 0.1.17-SNAPSHOT diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index d3c30576bdb..5294ea9094b 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.16 + 0.1.17-SNAPSHOT diff --git a/index-common/pom.xml b/index-common/pom.xml index 35fa75e6210..3fa38318ecf 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.16 + 0.1.17-SNAPSHOT diff --git a/indexer/pom.xml b/indexer/pom.xml index 5d85220a879..745966c9a6d 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.16 + 0.1.17-SNAPSHOT diff --git a/merger/pom.xml b/merger/pom.xml index 7079e21efa0..767fb0eb6b1 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.16 + 0.1.17-SNAPSHOT diff --git a/pom.xml b/pom.xml index f7a434aa6b4..d1038105640 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.16 + 0.1.17-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index d4e3af3dbc2..850865c738e 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.16 + 0.1.17-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index a142014d2e8..ff1e51639fc 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.16 + 0.1.17-SNAPSHOT From 884da334b2b75ff063dabcbd6470938697ae7ff8 Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Fri, 14 Dec 2012 22:06:19 -0800 Subject: [PATCH 08/43] fix for master getting stuck when assigning --- .../src/main/java/com/metamx/druid/master/rules/LoadRule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java b/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java index ab093f4e070..fea94f882a1 100644 --- a/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java +++ b/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java @@ -84,7 +84,7 @@ public abstract class LoadRule implements Rule break; } if (holder.containsSegment(segment)) { - serverQueue.add(holder); + assignedServers.add(holder); continue; } From ce8e02b5a323d7a9cc766e04f028d89068c4e028 Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Fri, 14 Dec 2012 22:07:50 -0800 Subject: [PATCH 09/43] [maven-release-plugin] prepare release druid-0.1.17 --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 587c7804b20..14b2d50c066 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.17-SNAPSHOT + 0.1.17 diff --git a/common/pom.xml b/common/pom.xml index 34c04ad3321..5f93c78eddd 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.17-SNAPSHOT + 0.1.17 diff --git a/druid-services/pom.xml b/druid-services/pom.xml index 5abea496c3c..3a33869176b 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.17-SNAPSHOT + 0.1.17 com.metamx druid - 0.1.17-SNAPSHOT + 0.1.17 diff --git a/examples/pom.xml b/examples/pom.xml index 3eb69704827..6df460f6601 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.17-SNAPSHOT + 0.1.17 diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 6a9d20ee362..65b45d264b0 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.17-SNAPSHOT + 0.1.17 diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index 5294ea9094b..0fbcab516b0 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.17-SNAPSHOT + 0.1.17 diff --git a/index-common/pom.xml b/index-common/pom.xml index 3fa38318ecf..3d4b40c000e 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.17-SNAPSHOT + 0.1.17 diff --git a/indexer/pom.xml b/indexer/pom.xml index 745966c9a6d..bffdac809c6 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.17-SNAPSHOT + 0.1.17 diff --git a/merger/pom.xml b/merger/pom.xml index 767fb0eb6b1..2bc873293a2 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.17-SNAPSHOT + 0.1.17 diff --git a/pom.xml b/pom.xml index d1038105640..7f5fe42e0ef 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.17-SNAPSHOT + 0.1.17 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 850865c738e..59075fd1ac6 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.17-SNAPSHOT + 0.1.17 diff --git a/server/pom.xml b/server/pom.xml index ff1e51639fc..1fc057dee43 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.17-SNAPSHOT + 0.1.17 From b0e1f90e3542320cc0bfc17c187c603da185646c Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Fri, 14 Dec 2012 22:07:57 -0800 Subject: [PATCH 10/43] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 14b2d50c066..123c3891226 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.17 + 0.1.18-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 5f93c78eddd..129f2f12866 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.17 + 0.1.18-SNAPSHOT diff --git a/druid-services/pom.xml b/druid-services/pom.xml index 3a33869176b..88be31f7c8b 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.17 + 0.1.18-SNAPSHOT com.metamx druid - 0.1.17 + 0.1.18-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 6df460f6601..20a30ae0549 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.17 + 0.1.18-SNAPSHOT diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 65b45d264b0..7d989a5e086 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.17 + 0.1.18-SNAPSHOT diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index 0fbcab516b0..4a2302f936f 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.17 + 0.1.18-SNAPSHOT diff --git a/index-common/pom.xml b/index-common/pom.xml index 3d4b40c000e..5ebe8090aa5 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.17 + 0.1.18-SNAPSHOT diff --git a/indexer/pom.xml b/indexer/pom.xml index bffdac809c6..fa67a05b464 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.17 + 0.1.18-SNAPSHOT diff --git a/merger/pom.xml b/merger/pom.xml index 2bc873293a2..9dd0f3e6f7e 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.17 + 0.1.18-SNAPSHOT diff --git a/pom.xml b/pom.xml index 7f5fe42e0ef..9a76dee49a2 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.17 + 0.1.18-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 59075fd1ac6..6de60811b6a 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.17 + 0.1.18-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 1fc057dee43..7bbd25df628 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.17 + 0.1.18-SNAPSHOT From 76807ae00e2308ab0b9ad2aaf61098ede7c0bd03 Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Fri, 14 Dec 2012 22:55:12 -0800 Subject: [PATCH 11/43] fix overloading of segments --- .../main/java/com/metamx/druid/master/ServerHolder.java | 4 ++-- .../main/java/com/metamx/druid/master/rules/LoadRule.java | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/com/metamx/druid/master/ServerHolder.java b/server/src/main/java/com/metamx/druid/master/ServerHolder.java index 82c31fd7337..5fba424f429 100644 --- a/server/src/main/java/com/metamx/druid/master/ServerHolder.java +++ b/server/src/main/java/com/metamx/druid/master/ServerHolder.java @@ -99,9 +99,9 @@ public class ServerHolder implements Comparable return (server.getSegment(segment.getIdentifier()) != null); } - public boolean containsSegment(DataSegment segment) + public boolean isLoadingSegment(DataSegment segment) { - return isServingSegment(segment) || peon.getSegmentsToLoad().contains(segment); + return peon.getSegmentsToLoad().contains(segment); } @Override diff --git a/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java b/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java index fea94f882a1..bc1af64ba69 100644 --- a/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java +++ b/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java @@ -83,7 +83,12 @@ public abstract class LoadRule implements Rule ); break; } - if (holder.containsSegment(segment)) { + if (holder.isServingSegment(segment)) { + assignedServers.add(holder); + continue; + } + if (holder.isLoadingSegment(segment)) { + ++actualReplicants; assignedServers.add(holder); continue; } From 2b2818dbaf9b39f59a0ea1a0f95eafd26a40bd0e Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Fri, 14 Dec 2012 22:56:43 -0800 Subject: [PATCH 12/43] [maven-release-plugin] prepare release druid-0.1.18 --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 123c3891226..b1b5d0ff1c7 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.18-SNAPSHOT + 0.1.18 diff --git a/common/pom.xml b/common/pom.xml index 129f2f12866..eb3619ce85d 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.18-SNAPSHOT + 0.1.18 diff --git a/druid-services/pom.xml b/druid-services/pom.xml index 88be31f7c8b..5c786f7bc3e 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.18-SNAPSHOT + 0.1.18 com.metamx druid - 0.1.18-SNAPSHOT + 0.1.18 diff --git a/examples/pom.xml b/examples/pom.xml index 20a30ae0549..cae26efd1ca 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.18-SNAPSHOT + 0.1.18 diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 7d989a5e086..60fc96c0e08 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.18-SNAPSHOT + 0.1.18 diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index 4a2302f936f..3bcbc3521d9 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.18-SNAPSHOT + 0.1.18 diff --git a/index-common/pom.xml b/index-common/pom.xml index 5ebe8090aa5..df64e2f17db 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.18-SNAPSHOT + 0.1.18 diff --git a/indexer/pom.xml b/indexer/pom.xml index fa67a05b464..bb6dea10f0f 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.18-SNAPSHOT + 0.1.18 diff --git a/merger/pom.xml b/merger/pom.xml index 9dd0f3e6f7e..3a0f7b08112 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.18-SNAPSHOT + 0.1.18 diff --git a/pom.xml b/pom.xml index 9a76dee49a2..e3dcb6341a0 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.18-SNAPSHOT + 0.1.18 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 6de60811b6a..58ddb55e303 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.18-SNAPSHOT + 0.1.18 diff --git a/server/pom.xml b/server/pom.xml index 7bbd25df628..596e706ad84 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.18-SNAPSHOT + 0.1.18 From 5fff07a8b0e75c3fa31a0410d10f9ca933de2c00 Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Fri, 14 Dec 2012 22:56:49 -0800 Subject: [PATCH 13/43] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index b1b5d0ff1c7..c05fe9fe5da 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.18 + 0.1.19-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index eb3619ce85d..fec69fc109c 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.18 + 0.1.19-SNAPSHOT diff --git a/druid-services/pom.xml b/druid-services/pom.xml index 5c786f7bc3e..69e74584a61 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.18 + 0.1.19-SNAPSHOT com.metamx druid - 0.1.18 + 0.1.19-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index cae26efd1ca..24660c2b4cf 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.18 + 0.1.19-SNAPSHOT diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 60fc96c0e08..ff40097db5d 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.18 + 0.1.19-SNAPSHOT diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index 3bcbc3521d9..df5f855f2cd 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.18 + 0.1.19-SNAPSHOT diff --git a/index-common/pom.xml b/index-common/pom.xml index df64e2f17db..501c684d000 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.18 + 0.1.19-SNAPSHOT diff --git a/indexer/pom.xml b/indexer/pom.xml index bb6dea10f0f..6f2e42a5184 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.18 + 0.1.19-SNAPSHOT diff --git a/merger/pom.xml b/merger/pom.xml index 3a0f7b08112..ee0789abdcf 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.18 + 0.1.19-SNAPSHOT diff --git a/pom.xml b/pom.xml index e3dcb6341a0..162b0c58b10 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.18 + 0.1.19-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 58ddb55e303..aa57f422b7e 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.18 + 0.1.19-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 596e706ad84..adcbf1a13e5 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.18 + 0.1.19-SNAPSHOT From 585a812f6e26ecb83376d80c36bf8205b926c012 Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Sat, 15 Dec 2012 00:43:16 -0800 Subject: [PATCH 14/43] bug fixes again in load and drop --- .../druid/master/SegmentReplicantLookup.java | 49 +++++++++++++++---- .../metamx/druid/master/rules/LoadRule.java | 27 +++++----- .../master/DruidMasterRuleRunnerTest.java | 3 ++ 3 files changed, 54 insertions(+), 25 deletions(-) diff --git a/server/src/main/java/com/metamx/druid/master/SegmentReplicantLookup.java b/server/src/main/java/com/metamx/druid/master/SegmentReplicantLookup.java index 3ba778ababe..41553b4f7cf 100644 --- a/server/src/main/java/com/metamx/druid/master/SegmentReplicantLookup.java +++ b/server/src/main/java/com/metamx/druid/master/SegmentReplicantLookup.java @@ -24,7 +24,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.MinMaxPriorityQueue; import com.google.common.collect.Table; import com.metamx.druid.client.DataSegment; -import com.metamx.druid.client.DruidDataSource; import com.metamx.druid.client.DruidServer; import java.util.Map; @@ -37,6 +36,7 @@ public class SegmentReplicantLookup public static SegmentReplicantLookup make(DruidCluster cluster) { final Table segmentsInCluster = HashBasedTable.create(); + final Table loadingSegments = HashBasedTable.create(); for (MinMaxPriorityQueue serversByType : cluster.getSortedServersByTier()) { for (ServerHolder serverHolder : serversByType) { @@ -49,28 +49,59 @@ public class SegmentReplicantLookup } segmentsInCluster.put(segment.getIdentifier(), server.getTier(), ++numReplicants); } + + // Also account for queued segments + for (DataSegment segment : serverHolder.getPeon().getSegmentsToLoad()) { + Integer numReplicants = segmentsInCluster.get(segment.getIdentifier(), server.getTier()); + if (numReplicants == null) { + numReplicants = 0; + } + loadingSegments.put(segment.getIdentifier(), server.getTier(), ++numReplicants); + } } } - return new SegmentReplicantLookup(segmentsInCluster); + return new SegmentReplicantLookup(segmentsInCluster, loadingSegments); } - private final Table table; + private final Table segmentsInCluster; + private final Table loadingSegments; - private SegmentReplicantLookup(Table table) + private SegmentReplicantLookup( + Table segmentsInCluster, + Table loadingSegments + ) { - this.table = table; + this.segmentsInCluster = segmentsInCluster; + this.loadingSegments = loadingSegments; } - public Map getTiers(String segmentId) + public Map getClusterTiers(String segmentId) { - Map retVal = table.row(segmentId); + Map retVal = segmentsInCluster.row(segmentId); return (retVal == null) ? Maps.newHashMap() : retVal; } - public int lookup(String segmentId, String tier) + public Map getLoadingTiers(String segmentId) + { + Map retVal = loadingSegments.row(segmentId); + return (retVal == null) ? Maps.newHashMap() : retVal; + } + + public int getClusterReplicants(String segmentId, String tier) { - Integer retVal = table.get(segmentId, tier); + Integer retVal = segmentsInCluster.get(segmentId, tier); return (retVal == null) ? 0 : retVal; } + + public int getLoadingReplicants(String segmentId, String tier) + { + Integer retVal = loadingSegments.get(segmentId, tier); + return (retVal == null) ? 0 : retVal; + } + + public int getTotalReplicants(String segmentId, String tier) + { + return getClusterReplicants(segmentId, tier) + getLoadingReplicants(segmentId, tier); + } } diff --git a/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java b/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java index bc1af64ba69..5bf232c9474 100644 --- a/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java +++ b/server/src/main/java/com/metamx/druid/master/rules/LoadRule.java @@ -22,7 +22,6 @@ package com.metamx.druid.master.rules; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.MinMaxPriorityQueue; -import com.metamx.common.ISE; import com.metamx.druid.client.DataSegment; import com.metamx.druid.master.DruidMaster; import com.metamx.druid.master.DruidMasterRuntimeParams; @@ -47,7 +46,8 @@ public abstract class LoadRule implements Rule MasterStats stats = new MasterStats(); int expectedReplicants = getReplicants(); - int actualReplicants = params.getSegmentReplicantLookup().lookup(segment.getIdentifier(), getTier()); + int totalReplicants = params.getSegmentReplicantLookup().getTotalReplicants(segment.getIdentifier(), getTier()); + int clusterReplicants = params.getSegmentReplicantLookup().getClusterReplicants(segment.getIdentifier(), getTier()); MinMaxPriorityQueue serverQueue = params.getDruidCluster().getServersByTier(getTier()); if (serverQueue == null) { @@ -55,15 +55,15 @@ public abstract class LoadRule implements Rule return stats; } - stats.accumulate(assign(expectedReplicants, actualReplicants, serverQueue, segment)); - stats.accumulate(drop(expectedReplicants, actualReplicants, segment, params)); + stats.accumulate(assign(expectedReplicants, totalReplicants, serverQueue, segment)); + stats.accumulate(drop(expectedReplicants, clusterReplicants, segment, params)); return stats; } private MasterStats assign( int expectedReplicants, - int actualReplicants, + int totalReplicants, MinMaxPriorityQueue serverQueue, DataSegment segment ) @@ -71,7 +71,7 @@ public abstract class LoadRule implements Rule MasterStats stats = new MasterStats(); List assignedServers = Lists.newArrayList(); - while (actualReplicants < expectedReplicants) { + while (totalReplicants < expectedReplicants) { ServerHolder holder = serverQueue.pollFirst(); if (holder == null) { log.warn( @@ -83,12 +83,7 @@ public abstract class LoadRule implements Rule ); break; } - if (holder.isServingSegment(segment)) { - assignedServers.add(holder); - continue; - } - if (holder.isLoadingSegment(segment)) { - ++actualReplicants; + if (holder.isServingSegment(segment) || holder.isLoadingSegment(segment)) { assignedServers.add(holder); continue; } @@ -127,7 +122,7 @@ public abstract class LoadRule implements Rule assignedServers.add(holder); stats.addToTieredStat("assignedCount", getTier(), 1); - ++actualReplicants; + ++totalReplicants; } serverQueue.addAll(assignedServers); @@ -136,7 +131,7 @@ public abstract class LoadRule implements Rule private MasterStats drop( int expectedReplicants, - int actualReplicants, + int clusterReplicants, DataSegment segment, DruidMasterRuntimeParams params ) @@ -148,11 +143,11 @@ public abstract class LoadRule implements Rule } // Make sure we have enough actual replicants in the cluster before doing anything - if (actualReplicants < expectedReplicants) { + if (clusterReplicants < expectedReplicants) { return stats; } - Map replicantsByType = params.getSegmentReplicantLookup().getTiers(segment.getIdentifier()); + Map replicantsByType = params.getSegmentReplicantLookup().getClusterTiers(segment.getIdentifier()); for (Map.Entry entry : replicantsByType.entrySet()) { String tier = entry.getKey(); diff --git a/server/src/test/java/com/metamx/druid/master/DruidMasterRuleRunnerTest.java b/server/src/test/java/com/metamx/druid/master/DruidMasterRuleRunnerTest.java index 3d0e28b640c..2ac32578cbf 100644 --- a/server/src/test/java/com/metamx/druid/master/DruidMasterRuleRunnerTest.java +++ b/server/src/test/java/com/metamx/druid/master/DruidMasterRuleRunnerTest.java @@ -536,6 +536,7 @@ public class DruidMasterRuleRunnerTest { mockPeon.dropSegment(EasyMock.anyObject(), EasyMock.anyObject()); EasyMock.expectLastCall().atLeastOnce(); + EasyMock.expect(mockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); EasyMock.expect(mockPeon.getLoadQueueSize()).andReturn(0L).atLeastOnce(); EasyMock.replay(mockPeon); @@ -798,10 +799,12 @@ public class DruidMasterRuleRunnerTest mockPeon.dropSegment(EasyMock.anyObject(), EasyMock.anyObject()); EasyMock.expectLastCall().atLeastOnce(); + EasyMock.expect(mockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); EasyMock.expect(mockPeon.getLoadQueueSize()).andReturn(0L).atLeastOnce(); EasyMock.replay(mockPeon); LoadQueuePeon anotherMockPeon = EasyMock.createMock(LoadQueuePeon.class); + EasyMock.expect(anotherMockPeon.getSegmentsToLoad()).andReturn(Sets.newHashSet()).atLeastOnce(); EasyMock.expect(anotherMockPeon.getLoadQueueSize()).andReturn(10L).atLeastOnce(); EasyMock.replay(anotherMockPeon); From 4bcc8d27fa65dd09ba5324287473d33ca574540d Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Sat, 15 Dec 2012 00:44:50 -0800 Subject: [PATCH 15/43] [maven-release-plugin] prepare release druid-0.1.19 --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index c05fe9fe5da..70f75852f7b 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.19-SNAPSHOT + 0.1.19 diff --git a/common/pom.xml b/common/pom.xml index fec69fc109c..f56ff781c63 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.19-SNAPSHOT + 0.1.19 diff --git a/druid-services/pom.xml b/druid-services/pom.xml index 69e74584a61..735a9ad6316 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.19-SNAPSHOT + 0.1.19 com.metamx druid - 0.1.19-SNAPSHOT + 0.1.19 diff --git a/examples/pom.xml b/examples/pom.xml index 24660c2b4cf..9d1ed62dba1 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.19-SNAPSHOT + 0.1.19 diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index ff40097db5d..2c69dccfef9 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.19-SNAPSHOT + 0.1.19 diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index df5f855f2cd..9b96af19a70 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.19-SNAPSHOT + 0.1.19 diff --git a/index-common/pom.xml b/index-common/pom.xml index 501c684d000..9aab04e3949 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.19-SNAPSHOT + 0.1.19 diff --git a/indexer/pom.xml b/indexer/pom.xml index 6f2e42a5184..7f8ae55a2eb 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.19-SNAPSHOT + 0.1.19 diff --git a/merger/pom.xml b/merger/pom.xml index ee0789abdcf..6f51a3cd834 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.19-SNAPSHOT + 0.1.19 diff --git a/pom.xml b/pom.xml index 162b0c58b10..57629d2f787 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.19-SNAPSHOT + 0.1.19 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index aa57f422b7e..1bfcc320f4f 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.19-SNAPSHOT + 0.1.19 diff --git a/server/pom.xml b/server/pom.xml index adcbf1a13e5..b1d9499bd46 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.19-SNAPSHOT + 0.1.19 From f9386c36231f158e62731bc09f3182f1e6e6aa47 Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Sat, 15 Dec 2012 00:44:58 -0800 Subject: [PATCH 16/43] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 70f75852f7b..212c450139a 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.19 + 0.1.20-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index f56ff781c63..ca79a5d5d3c 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.19 + 0.1.20-SNAPSHOT diff --git a/druid-services/pom.xml b/druid-services/pom.xml index 735a9ad6316..dc8b9f2563e 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.19 + 0.1.20-SNAPSHOT com.metamx druid - 0.1.19 + 0.1.20-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 9d1ed62dba1..767aecbbf8d 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.19 + 0.1.20-SNAPSHOT diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 2c69dccfef9..d62ac99d80f 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.19 + 0.1.20-SNAPSHOT diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index 9b96af19a70..60d20e581ac 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.19 + 0.1.20-SNAPSHOT diff --git a/index-common/pom.xml b/index-common/pom.xml index 9aab04e3949..beae6c3f381 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.19 + 0.1.20-SNAPSHOT diff --git a/indexer/pom.xml b/indexer/pom.xml index 7f8ae55a2eb..8ad727c896a 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.19 + 0.1.20-SNAPSHOT diff --git a/merger/pom.xml b/merger/pom.xml index 6f51a3cd834..ade1d220570 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.19 + 0.1.20-SNAPSHOT diff --git a/pom.xml b/pom.xml index 57629d2f787..3ab555826a1 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.19 + 0.1.20-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 1bfcc320f4f..f51506550dc 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.19 + 0.1.20-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index b1d9499bd46..68b62a863da 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.19 + 0.1.20-SNAPSHOT From db556102db1b01327240df5c6265df1912104ec3 Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Sat, 15 Dec 2012 00:50:28 -0800 Subject: [PATCH 17/43] fix typo --- .../java/com/metamx/druid/master/SegmentReplicantLookup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/metamx/druid/master/SegmentReplicantLookup.java b/server/src/main/java/com/metamx/druid/master/SegmentReplicantLookup.java index 41553b4f7cf..560787247f5 100644 --- a/server/src/main/java/com/metamx/druid/master/SegmentReplicantLookup.java +++ b/server/src/main/java/com/metamx/druid/master/SegmentReplicantLookup.java @@ -52,7 +52,7 @@ public class SegmentReplicantLookup // Also account for queued segments for (DataSegment segment : serverHolder.getPeon().getSegmentsToLoad()) { - Integer numReplicants = segmentsInCluster.get(segment.getIdentifier(), server.getTier()); + Integer numReplicants = loadingSegments.get(segment.getIdentifier(), server.getTier()); if (numReplicants == null) { numReplicants = 0; } From 24f0207fd8608004fdc48e9cbdd4f26db229c645 Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Sat, 15 Dec 2012 00:51:54 -0800 Subject: [PATCH 18/43] [maven-release-plugin] prepare release druid-0.1.20 --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 212c450139a..07e5e272b52 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.20-SNAPSHOT + 0.1.20 diff --git a/common/pom.xml b/common/pom.xml index ca79a5d5d3c..e2f93a0a96d 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.20-SNAPSHOT + 0.1.20 diff --git a/druid-services/pom.xml b/druid-services/pom.xml index dc8b9f2563e..ac931da56b2 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.20-SNAPSHOT + 0.1.20 com.metamx druid - 0.1.20-SNAPSHOT + 0.1.20 diff --git a/examples/pom.xml b/examples/pom.xml index 767aecbbf8d..6c83f73d8b5 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.20-SNAPSHOT + 0.1.20 diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index d62ac99d80f..b565b7b5181 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.20-SNAPSHOT + 0.1.20 diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index 60d20e581ac..afae8728643 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.20-SNAPSHOT + 0.1.20 diff --git a/index-common/pom.xml b/index-common/pom.xml index beae6c3f381..6b87f5bca72 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.20-SNAPSHOT + 0.1.20 diff --git a/indexer/pom.xml b/indexer/pom.xml index 8ad727c896a..8f305e6b95b 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.20-SNAPSHOT + 0.1.20 diff --git a/merger/pom.xml b/merger/pom.xml index ade1d220570..abf28cb4af5 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.20-SNAPSHOT + 0.1.20 diff --git a/pom.xml b/pom.xml index 3ab555826a1..07755aff89e 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.20-SNAPSHOT + 0.1.20 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index f51506550dc..eb173e66f41 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.20-SNAPSHOT + 0.1.20 diff --git a/server/pom.xml b/server/pom.xml index 68b62a863da..678a14e1777 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.20-SNAPSHOT + 0.1.20 From e34944b1c525a48126b3f5d5520f7dec0b4ef923 Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Sat, 15 Dec 2012 00:52:01 -0800 Subject: [PATCH 19/43] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 07e5e272b52..92052ca0bd1 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.20 + 0.1.21-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index e2f93a0a96d..5df3053a4c4 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.20 + 0.1.21-SNAPSHOT diff --git a/druid-services/pom.xml b/druid-services/pom.xml index ac931da56b2..dd7f803b5b2 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.20 + 0.1.21-SNAPSHOT com.metamx druid - 0.1.20 + 0.1.21-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 6c83f73d8b5..68d72d5b467 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.20 + 0.1.21-SNAPSHOT diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index b565b7b5181..845f4166894 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.20 + 0.1.21-SNAPSHOT diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index afae8728643..fabb251149b 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.20 + 0.1.21-SNAPSHOT diff --git a/index-common/pom.xml b/index-common/pom.xml index 6b87f5bca72..709c7c1cab8 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.20 + 0.1.21-SNAPSHOT diff --git a/indexer/pom.xml b/indexer/pom.xml index 8f305e6b95b..5aed0fd205b 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.20 + 0.1.21-SNAPSHOT diff --git a/merger/pom.xml b/merger/pom.xml index abf28cb4af5..f4340b63c15 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.20 + 0.1.21-SNAPSHOT diff --git a/pom.xml b/pom.xml index 07755aff89e..b85d34f4e7d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.20 + 0.1.21-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index eb173e66f41..95f8fed2ff6 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.20 + 0.1.21-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 678a14e1777..ac5f07495fa 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.20 + 0.1.21-SNAPSHOT From 2118252ef236489dbc580f217328b7d304278b2b Mon Sep 17 00:00:00 2001 From: xvrl Date: Thu, 13 Dec 2012 12:15:30 -0800 Subject: [PATCH 20/43] make memcached host configurable for benchmarking --- .../druid/client/cache/MemcachedCacheBrokerBenchmark.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBrokerBenchmark.java b/client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBrokerBenchmark.java index 702bf7a2a56..72a1d0da932 100644 --- a/client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBrokerBenchmark.java +++ b/client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBrokerBenchmark.java @@ -46,7 +46,7 @@ public class MemcachedCacheBrokerBenchmark extends SimpleBenchmark .setTranscoder(transcoder) .setShouldOptimize(true) .build(), - AddrUtil.getAddresses("localhost:11211") + AddrUtil.getAddresses(System.getProperty("druid.bard.cache.hosts", "localhost:11211")) ); broker = new MemcachedCacheBroker( From 54d8aff4d50a1635d76a801886c011b522867291 Mon Sep 17 00:00:00 2001 From: xvrl Date: Mon, 17 Dec 2012 16:44:02 -0800 Subject: [PATCH 21/43] add parameter for benchmarking host --- .../druid/client/cache/MemcachedCacheBrokerBenchmark.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBrokerBenchmark.java b/client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBrokerBenchmark.java index 72a1d0da932..2fa7d3b4193 100644 --- a/client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBrokerBenchmark.java +++ b/client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBrokerBenchmark.java @@ -24,6 +24,8 @@ public class MemcachedCacheBrokerBenchmark extends SimpleBenchmark private Cache cache; private static byte[] randBytes; + @Param({"localhost:11211"}) String hosts; + // object size in kB @Param({"1", "5", "10", "40"}) int objectSize; @Param({"100", "1000"}) int objectCount; @@ -37,6 +39,8 @@ public class MemcachedCacheBrokerBenchmark extends SimpleBenchmark // disable compression transcoder.setCompressionThreshold(Integer.MAX_VALUE); + System.out.println(String.format("Using memcached hosts [%s]", hosts)); + client = new MemcachedClient( new ConnectionFactoryBuilder().setProtocol(ConnectionFactoryBuilder.Protocol.BINARY) .setHashAlg(DefaultHashAlgorithm.FNV1A_64_HASH) @@ -46,7 +50,7 @@ public class MemcachedCacheBrokerBenchmark extends SimpleBenchmark .setTranscoder(transcoder) .setShouldOptimize(true) .build(), - AddrUtil.getAddresses(System.getProperty("druid.bard.cache.hosts", "localhost:11211")) + AddrUtil.getAddresses(hosts) ); broker = new MemcachedCacheBroker( From 8b55790900cfa4940a0be63efed2412dd0329e09 Mon Sep 17 00:00:00 2001 From: xvrl Date: Tue, 18 Dec 2012 10:15:23 -0800 Subject: [PATCH 22/43] add segmentMetadata query type --- client/src/main/java/com/metamx/druid/Query.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/src/main/java/com/metamx/druid/Query.java b/client/src/main/java/com/metamx/druid/Query.java index b553dd46855..bd1dc49702a 100644 --- a/client/src/main/java/com/metamx/druid/Query.java +++ b/client/src/main/java/com/metamx/druid/Query.java @@ -21,6 +21,7 @@ package com.metamx.druid; import com.metamx.common.guava.Sequence; import com.metamx.druid.query.group.GroupByQuery; +import com.metamx.druid.query.metadata.SegmentMetadataQuery; import com.metamx.druid.query.search.SearchQuery; import com.metamx.druid.query.segment.QuerySegmentSpec; import com.metamx.druid.query.segment.QuerySegmentWalker; @@ -39,7 +40,8 @@ import java.util.Map; @JsonSubTypes.Type(name = Query.TIMESERIES, value = TimeseriesQuery.class), @JsonSubTypes.Type(name = Query.SEARCH, value = SearchQuery.class), @JsonSubTypes.Type(name = Query.TIME_BOUNDARY, value = TimeBoundaryQuery.class), - @JsonSubTypes.Type(name = "groupBy", value= GroupByQuery.class) + @JsonSubTypes.Type(name = "groupBy", value= GroupByQuery.class), + @JsonSubTypes.Type(name = "segmentMetadata", value= SegmentMetadataQuery.class) }) public interface Query { From decc4e4c0ee3821a53e5f90875028be9f14fec9e Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Tue, 18 Dec 2012 10:37:08 -0800 Subject: [PATCH 23/43] [maven-release-plugin] prepare release druid-0.1.21 --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 92052ca0bd1..275cf8c3c65 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.21-SNAPSHOT + 0.1.21 diff --git a/common/pom.xml b/common/pom.xml index 5df3053a4c4..17eaf62e650 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.21-SNAPSHOT + 0.1.21 diff --git a/druid-services/pom.xml b/druid-services/pom.xml index dd7f803b5b2..23f4387b235 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.21-SNAPSHOT + 0.1.21 com.metamx druid - 0.1.21-SNAPSHOT + 0.1.21 diff --git a/examples/pom.xml b/examples/pom.xml index 68d72d5b467..c09865fc164 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.21-SNAPSHOT + 0.1.21 diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 845f4166894..4e95d04b79d 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.21-SNAPSHOT + 0.1.21 diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index fabb251149b..988715f9f21 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.21-SNAPSHOT + 0.1.21 diff --git a/index-common/pom.xml b/index-common/pom.xml index 709c7c1cab8..059c1284513 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.21-SNAPSHOT + 0.1.21 diff --git a/indexer/pom.xml b/indexer/pom.xml index 5aed0fd205b..bd7752f60e5 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.21-SNAPSHOT + 0.1.21 diff --git a/merger/pom.xml b/merger/pom.xml index f4340b63c15..28c4ebd1abd 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.21-SNAPSHOT + 0.1.21 diff --git a/pom.xml b/pom.xml index b85d34f4e7d..e596d8cbfa9 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.21-SNAPSHOT + 0.1.21 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 95f8fed2ff6..37ea14b36c0 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.21-SNAPSHOT + 0.1.21 diff --git a/server/pom.xml b/server/pom.xml index ac5f07495fa..625a51b036e 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.21-SNAPSHOT + 0.1.21 From 75d465aed05945b6bf3636901f353f407e164952 Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Tue, 18 Dec 2012 10:37:16 -0800 Subject: [PATCH 24/43] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 275cf8c3c65..71338656af4 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.21 + 0.1.22-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 17eaf62e650..01b1a62cf7f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.21 + 0.1.22-SNAPSHOT diff --git a/druid-services/pom.xml b/druid-services/pom.xml index 23f4387b235..13f3d4acdf4 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.21 + 0.1.22-SNAPSHOT com.metamx druid - 0.1.21 + 0.1.22-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index c09865fc164..ca1c487b3b9 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.21 + 0.1.22-SNAPSHOT diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 4e95d04b79d..9cd59411dc2 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.21 + 0.1.22-SNAPSHOT diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index 988715f9f21..f1fce07ea55 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.21 + 0.1.22-SNAPSHOT diff --git a/index-common/pom.xml b/index-common/pom.xml index 059c1284513..c5180df8eb5 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.21 + 0.1.22-SNAPSHOT diff --git a/indexer/pom.xml b/indexer/pom.xml index bd7752f60e5..377f59a0722 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.21 + 0.1.22-SNAPSHOT diff --git a/merger/pom.xml b/merger/pom.xml index 28c4ebd1abd..19b5609f91a 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.21 + 0.1.22-SNAPSHOT diff --git a/pom.xml b/pom.xml index e596d8cbfa9..7e00be2b67a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.21 + 0.1.22-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 37ea14b36c0..da0b9ecf754 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.21 + 0.1.22-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 625a51b036e..0aec6ec61f2 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.21 + 0.1.22-SNAPSHOT From 2a7214089e10fb7e895825be2d531a8fd9e62424 Mon Sep 17 00:00:00 2001 From: xvrl Date: Tue, 18 Dec 2012 14:09:54 -0800 Subject: [PATCH 25/43] fix NPE in segmentMetadata query for null dimension values --- .../metamx/druid/query/metadata/SegmentMetadataQueryEngine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/metamx/druid/query/metadata/SegmentMetadataQueryEngine.java b/server/src/main/java/com/metamx/druid/query/metadata/SegmentMetadataQueryEngine.java index edc4ea3eda8..7522b4b4750 100644 --- a/server/src/main/java/com/metamx/druid/query/metadata/SegmentMetadataQueryEngine.java +++ b/server/src/main/java/com/metamx/druid/query/metadata/SegmentMetadataQueryEngine.java @@ -72,7 +72,7 @@ public class SegmentMetadataQueryEngine final Indexed lookup = adapter.getDimValueLookup(input); for (String dimVal : lookup) { ImmutableConciseSet index = adapter.getInvertedIndex(input, dimVal); - size += index.size() * Charsets.UTF_8.encode(dimVal).capacity(); + size += (dimVal == null) ? 0 : index.size() * Charsets.UTF_8.encode(dimVal).capacity(); } return new SegmentMetadataResultValue.Dimension( size, From fb8f4f1f41117cc14e0a95862a17c3f75a2605ad Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Tue, 18 Dec 2012 14:19:02 -0800 Subject: [PATCH 26/43] [maven-release-plugin] prepare release druid-0.1.22 --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 71338656af4..035e357cb65 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.22-SNAPSHOT + 0.1.22 diff --git a/common/pom.xml b/common/pom.xml index 01b1a62cf7f..d8e37f8338e 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.22-SNAPSHOT + 0.1.22 diff --git a/druid-services/pom.xml b/druid-services/pom.xml index 13f3d4acdf4..273dd82d194 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.22-SNAPSHOT + 0.1.22 com.metamx druid - 0.1.22-SNAPSHOT + 0.1.22 diff --git a/examples/pom.xml b/examples/pom.xml index ca1c487b3b9..4c1109f61e5 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.22-SNAPSHOT + 0.1.22 diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 9cd59411dc2..d5ca57c443f 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.22-SNAPSHOT + 0.1.22 diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index f1fce07ea55..cddc02ff6bb 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.22-SNAPSHOT + 0.1.22 diff --git a/index-common/pom.xml b/index-common/pom.xml index c5180df8eb5..c7a892df826 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.22-SNAPSHOT + 0.1.22 diff --git a/indexer/pom.xml b/indexer/pom.xml index 377f59a0722..4d3c55ccc58 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.22-SNAPSHOT + 0.1.22 diff --git a/merger/pom.xml b/merger/pom.xml index 19b5609f91a..bf7c077f787 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.22-SNAPSHOT + 0.1.22 diff --git a/pom.xml b/pom.xml index 7e00be2b67a..de277701ea9 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.22-SNAPSHOT + 0.1.22 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index da0b9ecf754..0e6c575caae 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.22-SNAPSHOT + 0.1.22 diff --git a/server/pom.xml b/server/pom.xml index 0aec6ec61f2..2d4a287b983 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.22-SNAPSHOT + 0.1.22 From 090a5a105dcdf68bc84f3a91c457b492048cdd27 Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Tue, 18 Dec 2012 14:19:09 -0800 Subject: [PATCH 27/43] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 035e357cb65..10e921c1367 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.22 + 0.1.23-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index d8e37f8338e..559f845cc58 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.22 + 0.1.23-SNAPSHOT diff --git a/druid-services/pom.xml b/druid-services/pom.xml index 273dd82d194..fbc935852f6 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.22 + 0.1.23-SNAPSHOT com.metamx druid - 0.1.22 + 0.1.23-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 4c1109f61e5..babe5b6caa1 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.22 + 0.1.23-SNAPSHOT diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index d5ca57c443f..f71edb15d24 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.22 + 0.1.23-SNAPSHOT diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index cddc02ff6bb..49df7b97248 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.22 + 0.1.23-SNAPSHOT diff --git a/index-common/pom.xml b/index-common/pom.xml index c7a892df826..851f708c118 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.22 + 0.1.23-SNAPSHOT diff --git a/indexer/pom.xml b/indexer/pom.xml index 4d3c55ccc58..8351b59e1af 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.22 + 0.1.23-SNAPSHOT diff --git a/merger/pom.xml b/merger/pom.xml index bf7c077f787..f66450f81f5 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.22 + 0.1.23-SNAPSHOT diff --git a/pom.xml b/pom.xml index de277701ea9..7a725bee45b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.22 + 0.1.23-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 0e6c575caae..d5dd06d8134 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.22 + 0.1.23-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 2d4a287b983..69ed2d2c2de 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.22 + 0.1.23-SNAPSHOT From 00ecf9d02822a5c9dbf666cd4ec5da15977c1beb Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Tue, 18 Dec 2012 16:16:03 -0800 Subject: [PATCH 28/43] sorted db datasources for rules; smaller time boundary range --- .../druid/query/timeboundary/TimeBoundaryQuery.java | 2 +- .../main/java/com/metamx/druid/http/InfoResource.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQuery.java b/client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQuery.java index 9c7340595c5..071d7695c0f 100644 --- a/client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQuery.java +++ b/client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQuery.java @@ -44,7 +44,7 @@ public class TimeBoundaryQuery extends BaseQuery { public static final Interval MY_Y2K_INTERVAL = new Interval( new DateTime("0000-01-01"), - new DateTime("9000-01-01") + new DateTime("3000-01-01") ); public static final String MAX_TIME = "maxTime"; public static final String MIN_TIME = "minTime"; diff --git a/server/src/main/java/com/metamx/druid/http/InfoResource.java b/server/src/main/java/com/metamx/druid/http/InfoResource.java index 315acdf8ce8..800e3a93e46 100644 --- a/server/src/main/java/com/metamx/druid/http/InfoResource.java +++ b/server/src/main/java/com/metamx/druid/http/InfoResource.java @@ -33,7 +33,6 @@ import com.metamx.druid.client.ServerInventoryManager; import com.metamx.druid.coordination.DruidClusterInfo; import com.metamx.druid.db.DatabaseRuleManager; import com.metamx.druid.db.DatabaseSegmentManager; -import com.metamx.druid.jackson.DefaultObjectMapper; import com.metamx.druid.master.rules.Rule; import javax.annotation.Nullable; @@ -47,6 +46,7 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Response; +import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -556,7 +556,7 @@ public class InfoResource return builder.entity(databaseSegmentManager.getInventory()).build(); } - return builder.entity( + List dataSourceNames = Lists.newArrayList( Iterables.transform( databaseSegmentManager.getInventory(), new Function() @@ -568,7 +568,11 @@ public class InfoResource } } ) - ).build(); + ); + + Collections.sort(dataSourceNames); + + return builder.entity(dataSourceNames).build(); } @GET From c579ba5a4210777e4e989eb3dfd7011b0fd6c504 Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Tue, 18 Dec 2012 16:17:38 -0800 Subject: [PATCH 29/43] [maven-release-plugin] prepare release druid-0.1.23 --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 10e921c1367..0d9f5508a88 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.23-SNAPSHOT + 0.1.23 diff --git a/common/pom.xml b/common/pom.xml index 559f845cc58..636c0ba40a8 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.23-SNAPSHOT + 0.1.23 diff --git a/druid-services/pom.xml b/druid-services/pom.xml index fbc935852f6..4c2e7474863 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.23-SNAPSHOT + 0.1.23 com.metamx druid - 0.1.23-SNAPSHOT + 0.1.23 diff --git a/examples/pom.xml b/examples/pom.xml index babe5b6caa1..d145ef0be2d 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.23-SNAPSHOT + 0.1.23 diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index f71edb15d24..e7afda71598 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.23-SNAPSHOT + 0.1.23 diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index 49df7b97248..1bd965d4dd3 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.23-SNAPSHOT + 0.1.23 diff --git a/index-common/pom.xml b/index-common/pom.xml index 851f708c118..a54f4e3eef8 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.23-SNAPSHOT + 0.1.23 diff --git a/indexer/pom.xml b/indexer/pom.xml index 8351b59e1af..a876cc2452f 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.23-SNAPSHOT + 0.1.23 diff --git a/merger/pom.xml b/merger/pom.xml index f66450f81f5..75156eb8910 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.23-SNAPSHOT + 0.1.23 diff --git a/pom.xml b/pom.xml index 7a725bee45b..825479f861a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.23-SNAPSHOT + 0.1.23 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index d5dd06d8134..ae1a1e0b784 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.23-SNAPSHOT + 0.1.23 diff --git a/server/pom.xml b/server/pom.xml index 69ed2d2c2de..7e5f61f797b 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.23-SNAPSHOT + 0.1.23 From 5137af075003e09f85d788c0962b138b9b84751d Mon Sep 17 00:00:00 2001 From: Fangjin Yang Date: Tue, 18 Dec 2012 16:17:44 -0800 Subject: [PATCH 30/43] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 0d9f5508a88..22b06a2779f 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.23 + 0.1.24-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 636c0ba40a8..99bee67819b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.23 + 0.1.24-SNAPSHOT diff --git a/druid-services/pom.xml b/druid-services/pom.xml index 4c2e7474863..d0643d9c8dd 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.23 + 0.1.24-SNAPSHOT com.metamx druid - 0.1.23 + 0.1.24-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index d145ef0be2d..c32c74281c2 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.23 + 0.1.24-SNAPSHOT diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index e7afda71598..f2dcbaa798e 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.23 + 0.1.24-SNAPSHOT diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index 1bd965d4dd3..f238925d333 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.23 + 0.1.24-SNAPSHOT diff --git a/index-common/pom.xml b/index-common/pom.xml index a54f4e3eef8..798aae82b52 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.23 + 0.1.24-SNAPSHOT diff --git a/indexer/pom.xml b/indexer/pom.xml index a876cc2452f..e0741ae7339 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.23 + 0.1.24-SNAPSHOT diff --git a/merger/pom.xml b/merger/pom.xml index 75156eb8910..536e6640199 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.23 + 0.1.24-SNAPSHOT diff --git a/pom.xml b/pom.xml index 825479f861a..e16d60c25a1 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.23 + 0.1.24-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index ae1a1e0b784..e270a9a4280 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.23 + 0.1.24-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 7e5f61f797b..f98e592e8d6 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.23 + 0.1.24-SNAPSHOT From 5c1b2360d63aefc501ac65c478e766bcf483e620 Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Thu, 20 Dec 2012 16:11:08 -0800 Subject: [PATCH 31/43] - Add optional query/wait metric to MetricsEmittingQueryRunner - Add MetricsEmittingExecutorService decorator, and use it on compute nodes --- .../druid/http/ClientQuerySegmentWalker.java | 2 +- .../query/MetricsEmittingExecutorService.java | 72 +++++++++++++++++++ .../query/MetricsEmittingQueryRunner.java | 25 +++++++ .../druid/coordination/ServerManager.java | 2 +- .../com/metamx/druid/http/ComputeNode.java | 17 +++-- 5 files changed, 110 insertions(+), 8 deletions(-) create mode 100644 client/src/main/java/com/metamx/druid/query/MetricsEmittingExecutorService.java diff --git a/client/src/main/java/com/metamx/druid/http/ClientQuerySegmentWalker.java b/client/src/main/java/com/metamx/druid/http/ClientQuerySegmentWalker.java index d316e8fcab5..d053d6507a2 100644 --- a/client/src/main/java/com/metamx/druid/http/ClientQuerySegmentWalker.java +++ b/client/src/main/java/com/metamx/druid/http/ClientQuerySegmentWalker.java @@ -83,7 +83,7 @@ public class ClientQuerySegmentWalker implements QuerySegmentWalker } }, toolChest.preMergeQueryDecoration(baseClient) - ) + ).withWaitMeasuredFromNow() ) ), toolChest diff --git a/client/src/main/java/com/metamx/druid/query/MetricsEmittingExecutorService.java b/client/src/main/java/com/metamx/druid/query/MetricsEmittingExecutorService.java new file mode 100644 index 00000000000..2e453ddbe0b --- /dev/null +++ b/client/src/main/java/com/metamx/druid/query/MetricsEmittingExecutorService.java @@ -0,0 +1,72 @@ +package com.metamx.druid.query; + +import com.metamx.emitter.service.ServiceEmitter; +import com.metamx.emitter.service.ServiceMetricEvent; + +import java.util.List; +import java.util.concurrent.AbstractExecutorService; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +public class MetricsEmittingExecutorService extends AbstractExecutorService +{ + private final ExecutorService base; + private final ServiceEmitter emitter; + private final ServiceMetricEvent.Builder metricBuilder; + + public MetricsEmittingExecutorService( + ExecutorService base, + ServiceEmitter emitter, + ServiceMetricEvent.Builder metricBuilder + ) + { + this.base = base; + this.emitter = emitter; + this.metricBuilder = metricBuilder; + } + + @Override + public void shutdown() + { + base.shutdown(); + } + + @Override + public List shutdownNow() + { + return base.shutdownNow(); + } + + @Override + public boolean isShutdown() + { + return base.isShutdown(); + } + + @Override + public boolean isTerminated() + { + return base.isTerminated(); + } + + @Override + public boolean awaitTermination(long l, TimeUnit timeUnit) throws InterruptedException + { + return base.awaitTermination(l, timeUnit); + } + + @Override + public void execute(Runnable runnable) + { + emitMetrics(); + base.execute(runnable); + } + + private void emitMetrics() + { + if (base instanceof ThreadPoolExecutor) { + emitter.emit(metricBuilder.build("exec/backlog", ((ThreadPoolExecutor) base).getQueue().size())); + } + } +} diff --git a/client/src/main/java/com/metamx/druid/query/MetricsEmittingQueryRunner.java b/client/src/main/java/com/metamx/druid/query/MetricsEmittingQueryRunner.java index 44db0ac3893..9a7111526de 100644 --- a/client/src/main/java/com/metamx/druid/query/MetricsEmittingQueryRunner.java +++ b/client/src/main/java/com/metamx/druid/query/MetricsEmittingQueryRunner.java @@ -37,16 +37,33 @@ public class MetricsEmittingQueryRunner implements QueryRunner private final ServiceEmitter emitter; private final Function, ServiceMetricEvent.Builder> builderFn; private final QueryRunner queryRunner; + private final long creationTime; public MetricsEmittingQueryRunner( ServiceEmitter emitter, Function, ServiceMetricEvent.Builder> builderFn, QueryRunner queryRunner ) + { + this(emitter, builderFn, queryRunner, -1); + } + + public MetricsEmittingQueryRunner( + ServiceEmitter emitter, + Function, ServiceMetricEvent.Builder> builderFn, + QueryRunner queryRunner, + long creationTime + ) { this.emitter = emitter; this.builderFn = builderFn; this.queryRunner = queryRunner; + this.creationTime = creationTime; + } + + public MetricsEmittingQueryRunner withWaitMeasuredFromNow() + { + return new MetricsEmittingQueryRunner(emitter, builderFn, queryRunner, System.currentTimeMillis()); } @Override @@ -77,6 +94,10 @@ public class MetricsEmittingQueryRunner implements QueryRunner long timeTaken = System.currentTimeMillis() - startTime; emitter.emit(builder.build("query/time", timeTaken)); + + if(creationTime > 0) { + emitter.emit(builder.build("query/wait", startTime - creationTime)); + } } return retVal; @@ -149,6 +170,10 @@ public class MetricsEmittingQueryRunner implements QueryRunner long timeTaken = System.currentTimeMillis() - startTime; emitter.emit(builder.build("query/time", timeTaken)); + if(creationTime > 0) { + emitter.emit(builder.build("query/wait", startTime - creationTime)); + } + yielder.close(); } }; diff --git a/server/src/main/java/com/metamx/druid/coordination/ServerManager.java b/server/src/main/java/com/metamx/druid/coordination/ServerManager.java index 1d3675e570d..9d0e8bbdfa2 100644 --- a/server/src/main/java/com/metamx/druid/coordination/ServerManager.java +++ b/server/src/main/java/com/metamx/druid/coordination/ServerManager.java @@ -336,7 +336,7 @@ public class ServerManager implements QuerySegmentWalker adapter.getInterval().getStart(), factory.createRunner(adapter) ) - ), + ).withWaitMeasuredFromNow(), segmentSpec ); } diff --git a/server/src/main/java/com/metamx/druid/http/ComputeNode.java b/server/src/main/java/com/metamx/druid/http/ComputeNode.java index 021ad751ad6..39f43bfcde2 100644 --- a/server/src/main/java/com/metamx/druid/http/ComputeNode.java +++ b/server/src/main/java/com/metamx/druid/http/ComputeNode.java @@ -40,9 +40,11 @@ import com.metamx.druid.jackson.DefaultObjectMapper; import com.metamx.druid.loading.QueryableLoaderConfig; import com.metamx.druid.loading.StorageAdapterLoader; import com.metamx.druid.metrics.ServerMonitor; +import com.metamx.druid.query.MetricsEmittingExecutorService; import com.metamx.druid.query.QueryRunnerFactoryConglomerate; import com.metamx.druid.utils.PropUtils; import com.metamx.emitter.service.ServiceEmitter; +import com.metamx.emitter.service.ServiceMetricEvent; import com.metamx.metrics.Monitor; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.smile.SmileFactory; @@ -118,13 +120,16 @@ public class ComputeNode extends BaseServerNode final List monitors = getMonitors(); final QueryRunnerFactoryConglomerate conglomerate = getConglomerate(); - final ExecutorService executorService = ExecutorServices.create( - getLifecycle(), - getConfigFactory().buildWithReplacements( - ExecutorServiceConfig.class, ImmutableMap.of("base_path", "druid.processing") - ) + final ExecutorService executorService = new MetricsEmittingExecutorService( + ExecutorServices.create( + getLifecycle(), + getConfigFactory().buildWithReplacements( + ExecutorServiceConfig.class, ImmutableMap.of("base_path", "druid.processing") + ) + ), emitter, new ServiceMetricEvent.Builder() ); - ServerManager serverManager = new ServerManager(adapterLoader, conglomerate, emitter, executorService); + + final ServerManager serverManager = new ServerManager(adapterLoader, conglomerate, emitter, executorService); final ZkCoordinator coordinator = new ZkCoordinator( getJsonMapper(), From db08640efc4fab1e90d96e2328beafdcf84e998e Mon Sep 17 00:00:00 2001 From: xvrl Date: Mon, 31 Dec 2012 14:10:43 -0800 Subject: [PATCH 32/43] reenable daylight saving test, now that we use joda-time 2 --- common/src/test/java/com/metamx/druid/QueryGranularityTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/test/java/com/metamx/druid/QueryGranularityTest.java b/common/src/test/java/com/metamx/druid/QueryGranularityTest.java index 18f39ef3a1b..de0a297c569 100644 --- a/common/src/test/java/com/metamx/druid/QueryGranularityTest.java +++ b/common/src/test/java/com/metamx/druid/QueryGranularityTest.java @@ -181,7 +181,7 @@ public class QueryGranularityTest ); } - //@Test + @Test public void testPeriodDaylightSaving() throws Exception { final DateTimeZone tz = DateTimeZone.forID("America/Los_Angeles"); From d0290b1975c07adeffa2501fec425ed8634af0b6 Mon Sep 17 00:00:00 2001 From: xvrl Date: Mon, 31 Dec 2012 14:52:34 -0800 Subject: [PATCH 33/43] fix flawed interval overlap rule test fails around month end --- .../main/java/com/metamx/druid/master/rules/PeriodLoadRule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/metamx/druid/master/rules/PeriodLoadRule.java b/server/src/main/java/com/metamx/druid/master/rules/PeriodLoadRule.java index 84128e4a74d..60d27eb01cd 100644 --- a/server/src/main/java/com/metamx/druid/master/rules/PeriodLoadRule.java +++ b/server/src/main/java/com/metamx/druid/master/rules/PeriodLoadRule.java @@ -83,7 +83,7 @@ public class PeriodLoadRule extends LoadRule @Override public boolean appliesTo(DataSegment segment) { - final Interval currInterval = new Interval(new DateTime().minus(period), period); + final Interval currInterval = new Interval(period, new DateTime()); return currInterval.overlaps(segment.getInterval()); } } From 6cdcc2becc692183af5a1250c1bf9646507e09d7 Mon Sep 17 00:00:00 2001 From: xvrl Date: Mon, 31 Dec 2012 14:56:03 -0800 Subject: [PATCH 34/43] [maven-release-plugin] prepare release druid-0.1.24 --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 22b06a2779f..5e5054a687c 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.24-SNAPSHOT + 0.1.24 diff --git a/common/pom.xml b/common/pom.xml index 99bee67819b..be18510c636 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.24-SNAPSHOT + 0.1.24 diff --git a/druid-services/pom.xml b/druid-services/pom.xml index d0643d9c8dd..0eb0d1367a6 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.24-SNAPSHOT + 0.1.24 com.metamx druid - 0.1.24-SNAPSHOT + 0.1.24 diff --git a/examples/pom.xml b/examples/pom.xml index c32c74281c2..4873aa304af 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.24-SNAPSHOT + 0.1.24 diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index f2dcbaa798e..e8887afe474 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.24-SNAPSHOT + 0.1.24 diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index f238925d333..a522478438e 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.24-SNAPSHOT + 0.1.24 diff --git a/index-common/pom.xml b/index-common/pom.xml index 798aae82b52..a742b12da00 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.24-SNAPSHOT + 0.1.24 diff --git a/indexer/pom.xml b/indexer/pom.xml index e0741ae7339..325ff328885 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.24-SNAPSHOT + 0.1.24 diff --git a/merger/pom.xml b/merger/pom.xml index 536e6640199..99828ab27dc 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.24-SNAPSHOT + 0.1.24 diff --git a/pom.xml b/pom.xml index e16d60c25a1..bccc3299aa7 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.24-SNAPSHOT + 0.1.24 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index e270a9a4280..d10cba0676f 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.24-SNAPSHOT + 0.1.24 diff --git a/server/pom.xml b/server/pom.xml index f98e592e8d6..be5f0985fcb 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.24-SNAPSHOT + 0.1.24 From 2a188996cd658a3e0a20f04d2567e8b2cc4b0b89 Mon Sep 17 00:00:00 2001 From: xvrl Date: Mon, 31 Dec 2012 14:56:10 -0800 Subject: [PATCH 35/43] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 5e5054a687c..55358d59bab 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.24 + 0.1.25-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index be18510c636..cfdbf4782d8 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.24 + 0.1.25-SNAPSHOT diff --git a/druid-services/pom.xml b/druid-services/pom.xml index 0eb0d1367a6..cba7eec5f3b 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.24 + 0.1.25-SNAPSHOT com.metamx druid - 0.1.24 + 0.1.25-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 4873aa304af..489d4481371 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.24 + 0.1.25-SNAPSHOT diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index e8887afe474..995d649ff0c 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.24 + 0.1.25-SNAPSHOT diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index a522478438e..a5e7d242f1a 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.24 + 0.1.25-SNAPSHOT diff --git a/index-common/pom.xml b/index-common/pom.xml index a742b12da00..4cb30db8b05 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.24 + 0.1.25-SNAPSHOT diff --git a/indexer/pom.xml b/indexer/pom.xml index 325ff328885..ff29c24a67c 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.24 + 0.1.25-SNAPSHOT diff --git a/merger/pom.xml b/merger/pom.xml index 99828ab27dc..eb191b90701 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.24 + 0.1.25-SNAPSHOT diff --git a/pom.xml b/pom.xml index bccc3299aa7..83a963f1c38 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.24 + 0.1.25-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index d10cba0676f..5da5645f35c 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.24 + 0.1.25-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index be5f0985fcb..4a1f2065059 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.24 + 0.1.25-SNAPSHOT From 19c3fd336350eac29e8c7e6114aab1d6c4dd8cbc Mon Sep 17 00:00:00 2001 From: xvrl Date: Wed, 2 Jan 2013 14:27:34 -0800 Subject: [PATCH 36/43] make reference timestamp explicit for time based rules --- .../druid/master/DruidMasterRuleRunner.java | 4 +++- .../druid/master/rules/IntervalDropRule.java | 3 ++- .../druid/master/rules/IntervalLoadRule.java | 3 ++- .../druid/master/rules/PeriodDropRule.java | 4 ++-- .../druid/master/rules/PeriodLoadRule.java | 4 ++-- .../com/metamx/druid/master/rules/Rule.java | 3 ++- .../druid/master/rules/PeriodDropRuleTest.java | 15 ++++++++++----- .../druid/master/rules/PeriodLoadRuleTest.java | 17 ++++++++++------- 8 files changed, 33 insertions(+), 20 deletions(-) diff --git a/server/src/main/java/com/metamx/druid/master/DruidMasterRuleRunner.java b/server/src/main/java/com/metamx/druid/master/DruidMasterRuleRunner.java index 56d27f47544..5c33a257f26 100644 --- a/server/src/main/java/com/metamx/druid/master/DruidMasterRuleRunner.java +++ b/server/src/main/java/com/metamx/druid/master/DruidMasterRuleRunner.java @@ -23,6 +23,7 @@ import com.metamx.druid.client.DataSegment; import com.metamx.druid.db.DatabaseRuleManager; import com.metamx.druid.master.rules.Rule; import com.metamx.emitter.EmittingLogger; +import org.joda.time.DateTime; import java.util.List; @@ -51,13 +52,14 @@ public class DruidMasterRuleRunner implements DruidMasterHelper } // Run through all matched rules for available segments + DateTime now = new DateTime(); DatabaseRuleManager databaseRuleManager = params.getDatabaseRuleManager(); for (DataSegment segment : params.getAvailableSegments()) { List rules = databaseRuleManager.getRulesWithDefault(segment.getDataSource()); boolean foundMatchingRule = false; for (Rule rule : rules) { - if (rule.appliesTo(segment)) { + if (rule.appliesTo(segment, now)) { stats.accumulate(rule.run(master, params, segment)); foundMatchingRule = true; break; diff --git a/server/src/main/java/com/metamx/druid/master/rules/IntervalDropRule.java b/server/src/main/java/com/metamx/druid/master/rules/IntervalDropRule.java index 6546fce40b3..0acdd8bc2f8 100644 --- a/server/src/main/java/com/metamx/druid/master/rules/IntervalDropRule.java +++ b/server/src/main/java/com/metamx/druid/master/rules/IntervalDropRule.java @@ -22,6 +22,7 @@ package com.metamx.druid.master.rules; import com.metamx.druid.client.DataSegment; import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; +import org.joda.time.DateTime; import org.joda.time.Interval; /** @@ -52,7 +53,7 @@ public class IntervalDropRule extends DropRule } @Override - public boolean appliesTo(DataSegment segment) + public boolean appliesTo(DataSegment segment, DateTime referenceTimestamp) { return interval.contains(segment.getInterval()); } diff --git a/server/src/main/java/com/metamx/druid/master/rules/IntervalLoadRule.java b/server/src/main/java/com/metamx/druid/master/rules/IntervalLoadRule.java index 8c77594a177..5aa984ccba8 100644 --- a/server/src/main/java/com/metamx/druid/master/rules/IntervalLoadRule.java +++ b/server/src/main/java/com/metamx/druid/master/rules/IntervalLoadRule.java @@ -23,6 +23,7 @@ import com.metamx.common.logger.Logger; import com.metamx.druid.client.DataSegment; import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; +import org.joda.time.DateTime; import org.joda.time.Interval; /** @@ -81,7 +82,7 @@ public class IntervalLoadRule extends LoadRule } @Override - public boolean appliesTo(DataSegment segment) + public boolean appliesTo(DataSegment segment, DateTime referenceTimestamp) { return interval.contains(segment.getInterval()); } diff --git a/server/src/main/java/com/metamx/druid/master/rules/PeriodDropRule.java b/server/src/main/java/com/metamx/druid/master/rules/PeriodDropRule.java index ce3c472a28f..83194dcc9de 100644 --- a/server/src/main/java/com/metamx/druid/master/rules/PeriodDropRule.java +++ b/server/src/main/java/com/metamx/druid/master/rules/PeriodDropRule.java @@ -54,9 +54,9 @@ public class PeriodDropRule extends DropRule } @Override - public boolean appliesTo(DataSegment segment) + public boolean appliesTo(DataSegment segment, DateTime referenceTimestamp) { - final Interval currInterval = new Interval(new DateTime().minus(period), period); + final Interval currInterval = new Interval(referenceTimestamp.minus(period), period); return currInterval.contains(segment.getInterval()); } } diff --git a/server/src/main/java/com/metamx/druid/master/rules/PeriodLoadRule.java b/server/src/main/java/com/metamx/druid/master/rules/PeriodLoadRule.java index 60d27eb01cd..051967e65ab 100644 --- a/server/src/main/java/com/metamx/druid/master/rules/PeriodLoadRule.java +++ b/server/src/main/java/com/metamx/druid/master/rules/PeriodLoadRule.java @@ -81,9 +81,9 @@ public class PeriodLoadRule extends LoadRule } @Override - public boolean appliesTo(DataSegment segment) + public boolean appliesTo(DataSegment segment, DateTime referenceTimestamp) { - final Interval currInterval = new Interval(period, new DateTime()); + final Interval currInterval = new Interval(period, referenceTimestamp); return currInterval.overlaps(segment.getInterval()); } } diff --git a/server/src/main/java/com/metamx/druid/master/rules/Rule.java b/server/src/main/java/com/metamx/druid/master/rules/Rule.java index a6fbfa358cc..a6eced93c68 100644 --- a/server/src/main/java/com/metamx/druid/master/rules/Rule.java +++ b/server/src/main/java/com/metamx/druid/master/rules/Rule.java @@ -25,6 +25,7 @@ import com.metamx.druid.master.DruidMasterRuntimeParams; import com.metamx.druid.master.MasterStats; import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; +import org.joda.time.DateTime; /** */ @@ -40,7 +41,7 @@ public interface Rule { public String getType(); - public boolean appliesTo(DataSegment segment); + public boolean appliesTo(DataSegment segment, DateTime referenceTimestamp); public MasterStats run(DruidMaster master, DruidMasterRuntimeParams params, DataSegment segment); } diff --git a/server/src/test/java/com/metamx/druid/master/rules/PeriodDropRuleTest.java b/server/src/test/java/com/metamx/druid/master/rules/PeriodDropRuleTest.java index ae0c7cedd2e..2f00c85ed6c 100644 --- a/server/src/test/java/com/metamx/druid/master/rules/PeriodDropRuleTest.java +++ b/server/src/test/java/com/metamx/druid/master/rules/PeriodDropRuleTest.java @@ -51,13 +51,15 @@ public class PeriodDropRuleTest now.minusDays(2), now.minusDays(1) ) - ).build() + ).build(), + now ) ); Assert.assertTrue( rule.appliesTo( builder.interval(new Interval(now.minusYears(100), now.minusDays(1))) - .build() + .build(), + now ) ); } @@ -73,19 +75,22 @@ public class PeriodDropRuleTest Assert.assertTrue( rule.appliesTo( builder.interval(new Interval(now.minusWeeks(1), now.minusDays(1))) - .build() + .build(), + now ) ); Assert.assertFalse( rule.appliesTo( builder.interval(new Interval(now.minusYears(1), now.minusDays(1))) - .build() + .build(), + now ) ); Assert.assertFalse( rule.appliesTo( builder.interval(new Interval(now.minusMonths(2), now.minusDays(1))) - .build() + .build(), + now ) ); } diff --git a/server/src/test/java/com/metamx/druid/master/rules/PeriodLoadRuleTest.java b/server/src/test/java/com/metamx/druid/master/rules/PeriodLoadRuleTest.java index 283d684cb07..3944d96ecb9 100644 --- a/server/src/test/java/com/metamx/druid/master/rules/PeriodLoadRuleTest.java +++ b/server/src/test/java/com/metamx/druid/master/rules/PeriodLoadRuleTest.java @@ -39,38 +39,41 @@ public class PeriodLoadRuleTest @Test public void testAppliesToAll() { + DateTime now = new DateTime("2013-01-01"); PeriodLoadRule rule = new PeriodLoadRule( new Period("P5000Y"), 0, "" ); - Assert.assertTrue(rule.appliesTo(builder.interval(new Interval("2012-01-01/2012-12-31")).build())); - Assert.assertTrue(rule.appliesTo(builder.interval(new Interval("1000-01-01/2012-12-31")).build())); - Assert.assertTrue(rule.appliesTo(builder.interval(new Interval("0500-01-01/2100-12-31")).build())); + Assert.assertTrue(rule.appliesTo(builder.interval(new Interval("2012-01-01/2012-12-31")).build(), now)); + Assert.assertTrue(rule.appliesTo(builder.interval(new Interval("1000-01-01/2012-12-31")).build(), now)); + Assert.assertTrue(rule.appliesTo(builder.interval(new Interval("0500-01-01/2100-12-31")).build(), now)); } @Test public void testAppliesToPeriod() { - DateTime now = new DateTime(); + DateTime now = new DateTime("2012-12-31T01:00:00"); PeriodLoadRule rule = new PeriodLoadRule( new Period("P1M"), 0, "" ); - Assert.assertTrue(rule.appliesTo(builder.interval(new Interval(now.minusWeeks(1), now)).build())); + Assert.assertTrue(rule.appliesTo(builder.interval(new Interval(now.minusWeeks(1), now)).build(), now)); Assert.assertTrue( rule.appliesTo( builder.interval(new Interval(now.minusDays(1), now.plusDays(1))) - .build() + .build(), + now ) ); Assert.assertFalse( rule.appliesTo( builder.interval(new Interval(now.plusDays(1), now.plusDays(2))) - .build() + .build(), + now ) ); } From 0543322c5694712d5b649a0d83e8a8b5089e53cd Mon Sep 17 00:00:00 2001 From: xvrl Date: Wed, 2 Jan 2013 14:31:51 -0800 Subject: [PATCH 37/43] tested timestamps should be deterministic --- .../com/metamx/druid/master/rules/PeriodDropRuleTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/test/java/com/metamx/druid/master/rules/PeriodDropRuleTest.java b/server/src/test/java/com/metamx/druid/master/rules/PeriodDropRuleTest.java index 2f00c85ed6c..cd0fbc85505 100644 --- a/server/src/test/java/com/metamx/druid/master/rules/PeriodDropRuleTest.java +++ b/server/src/test/java/com/metamx/druid/master/rules/PeriodDropRuleTest.java @@ -33,13 +33,13 @@ public class PeriodDropRuleTest { private final static DataSegment.Builder builder = DataSegment.builder() .dataSource("test") - .version(new DateTime().toString()) + .version(new DateTime("2012-12-31T01:00:00").toString()) .shardSpec(new NoneShardSpec()); @Test public void testAppliesToAll() { - DateTime now = new DateTime(); + DateTime now = new DateTime("2012-12-31T01:00:00"); PeriodDropRule rule = new PeriodDropRule( new Period("P5000Y") ); @@ -67,7 +67,7 @@ public class PeriodDropRuleTest @Test public void testAppliesToPeriod() { - DateTime now = new DateTime(); + DateTime now = new DateTime("2012-12-31T01:00:00"); PeriodDropRule rule = new PeriodDropRule( new Period("P1M") ); From a9b8d8f1cef2f7bb47734514006fbbd3311da920 Mon Sep 17 00:00:00 2001 From: xvrl Date: Wed, 2 Jan 2013 15:44:14 -0800 Subject: [PATCH 38/43] fix end of month bug in PeriodDropRule as well --- .../java/com/metamx/druid/master/rules/PeriodDropRule.java | 2 +- .../com/metamx/druid/master/rules/PeriodDropRuleTest.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/com/metamx/druid/master/rules/PeriodDropRule.java b/server/src/main/java/com/metamx/druid/master/rules/PeriodDropRule.java index 83194dcc9de..152f074dc3a 100644 --- a/server/src/main/java/com/metamx/druid/master/rules/PeriodDropRule.java +++ b/server/src/main/java/com/metamx/druid/master/rules/PeriodDropRule.java @@ -56,7 +56,7 @@ public class PeriodDropRule extends DropRule @Override public boolean appliesTo(DataSegment segment, DateTime referenceTimestamp) { - final Interval currInterval = new Interval(referenceTimestamp.minus(period), period); + final Interval currInterval = new Interval(period, referenceTimestamp); return currInterval.contains(segment.getInterval()); } } diff --git a/server/src/test/java/com/metamx/druid/master/rules/PeriodDropRuleTest.java b/server/src/test/java/com/metamx/druid/master/rules/PeriodDropRuleTest.java index cd0fbc85505..c6bceb08e5e 100644 --- a/server/src/test/java/com/metamx/druid/master/rules/PeriodDropRuleTest.java +++ b/server/src/test/java/com/metamx/druid/master/rules/PeriodDropRuleTest.java @@ -79,6 +79,13 @@ public class PeriodDropRuleTest now ) ); + Assert.assertTrue( + rule.appliesTo( + builder.interval(new Interval(now.minusDays(1), now)) + .build(), + now + ) + ); Assert.assertFalse( rule.appliesTo( builder.interval(new Interval(now.minusYears(1), now.minusDays(1))) From 6525d818adf8d5ddb1aa433a81f36cd71203eb89 Mon Sep 17 00:00:00 2001 From: xvrl Date: Wed, 2 Jan 2013 18:14:00 -0800 Subject: [PATCH 39/43] postAggregators now return field dependencies --- .../src/main/java/com/metamx/druid/query/Queries.java | 9 +++++++-- .../aggregation/post/ArithmeticPostAggregator.java | 10 +++++----- .../druid/aggregation/post/ConstantPostAggregator.java | 5 +++-- .../aggregation/post/FieldAccessPostAggregator.java | 5 +++-- .../metamx/druid/aggregation/post/PostAggregator.java | 2 +- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/client/src/main/java/com/metamx/druid/query/Queries.java b/client/src/main/java/com/metamx/druid/query/Queries.java index 9d8e052c0c0..d55a5da0ea8 100644 --- a/client/src/main/java/com/metamx/druid/query/Queries.java +++ b/client/src/main/java/com/metamx/druid/query/Queries.java @@ -20,6 +20,7 @@ package com.metamx.druid.query; import com.google.common.base.Function; +import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -27,6 +28,7 @@ import com.metamx.druid.aggregation.AggregatorFactory; import com.metamx.druid.aggregation.post.PostAggregator; import javax.annotation.Nullable; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -58,9 +60,12 @@ public class Queries ); for (PostAggregator postAgg : postAggs) { + Set dependencies = postAgg.getDependentFields(); + Set missing = Sets.difference(dependencies, combinedAggNames); + Preconditions.checkArgument( - postAgg.verifyFields(combinedAggNames), - String.format("Missing field[%s]", postAgg.getName()) + missing.isEmpty(), + String.format("Missing fields [%s] for postAggregator [%s]", Joiner.on(",").join(missing), postAgg.getName()) ); combinedAggNames.add(postAgg.getName()); } diff --git a/common/src/main/java/com/metamx/druid/aggregation/post/ArithmeticPostAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/post/ArithmeticPostAggregator.java index 035d0fa6652..cec19d80d78 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/post/ArithmeticPostAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/post/ArithmeticPostAggregator.java @@ -20,6 +20,7 @@ package com.metamx.druid.aggregation.post; import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.metamx.common.IAE; import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; @@ -69,14 +70,13 @@ public class ArithmeticPostAggregator implements PostAggregator } @Override - public boolean verifyFields(Set fieldNames) + public Set getDependentFields() { + Set dependentFields = Sets.newHashSet(); for (PostAggregator field : fields) { - if (!field.verifyFields(fieldNames)) { - return false; - } + dependentFields.addAll(field.getDependentFields()); } - return true; + return dependentFields; } @Override diff --git a/common/src/main/java/com/metamx/druid/aggregation/post/ConstantPostAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/post/ConstantPostAggregator.java index 645de6c9b80..f1bbb0d8392 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/post/ConstantPostAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/post/ConstantPostAggregator.java @@ -19,6 +19,7 @@ package com.metamx.druid.aggregation.post; +import com.google.common.collect.Sets; import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; @@ -44,9 +45,9 @@ public class ConstantPostAggregator implements PostAggregator } @Override - public boolean verifyFields(Set fields) + public Set getDependentFields() { - return true; + return Sets.newHashSet(); } @Override diff --git a/common/src/main/java/com/metamx/druid/aggregation/post/FieldAccessPostAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/post/FieldAccessPostAggregator.java index 0a1c866d044..780c720103d 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/post/FieldAccessPostAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/post/FieldAccessPostAggregator.java @@ -19,6 +19,7 @@ package com.metamx.druid.aggregation.post; +import com.google.common.collect.Sets; import com.metamx.common.ISE; import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; @@ -45,9 +46,9 @@ public class FieldAccessPostAggregator implements PostAggregator } @Override - public boolean verifyFields(Set fieldNames) + public Set getDependentFields() { - return fieldNames.contains(fieldName); + return Sets.newHashSet(fieldName); } @Override diff --git a/common/src/main/java/com/metamx/druid/aggregation/post/PostAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/post/PostAggregator.java index 487ac30efb3..5b1ebc60528 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/post/PostAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/post/PostAggregator.java @@ -37,7 +37,7 @@ import java.util.Set; }) public interface PostAggregator { - public boolean verifyFields(Set fieldNames); + public Set getDependentFields(); public Comparator getComparator(); From 41edec62ce893482d759f04b89247f72b69b01ec Mon Sep 17 00:00:00 2001 From: xvrl Date: Wed, 2 Jan 2013 18:46:07 -0800 Subject: [PATCH 40/43] remove unused imports --- client/src/main/java/com/metamx/druid/query/Queries.java | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/main/java/com/metamx/druid/query/Queries.java b/client/src/main/java/com/metamx/druid/query/Queries.java index d55a5da0ea8..fc33a0c2b74 100644 --- a/client/src/main/java/com/metamx/druid/query/Queries.java +++ b/client/src/main/java/com/metamx/druid/query/Queries.java @@ -28,7 +28,6 @@ import com.metamx.druid.aggregation.AggregatorFactory; import com.metamx.druid.aggregation.post.PostAggregator; import javax.annotation.Nullable; -import java.util.HashSet; import java.util.List; import java.util.Set; From 824997eb43e99d0dcb76da7dc997731ea348bb5f Mon Sep 17 00:00:00 2001 From: xvrl Date: Thu, 3 Jan 2013 10:01:42 -0800 Subject: [PATCH 41/43] simplify code --- client/src/main/java/com/metamx/druid/query/Queries.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/main/java/com/metamx/druid/query/Queries.java b/client/src/main/java/com/metamx/druid/query/Queries.java index fc33a0c2b74..ae5f958b563 100644 --- a/client/src/main/java/com/metamx/druid/query/Queries.java +++ b/client/src/main/java/com/metamx/druid/query/Queries.java @@ -64,7 +64,7 @@ public class Queries Preconditions.checkArgument( missing.isEmpty(), - String.format("Missing fields [%s] for postAggregator [%s]", Joiner.on(",").join(missing), postAgg.getName()) + "Missing fields [%s] for postAggregator [%s]", missing, postAgg.getName() ); combinedAggNames.add(postAgg.getName()); } From f2c2d3f4cfe97100251a46273986d5a3879c7d6f Mon Sep 17 00:00:00 2001 From: xvrl Date: Thu, 3 Jan 2013 10:09:43 -0800 Subject: [PATCH 42/43] [maven-release-plugin] prepare release druid-0.1.25 --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 55358d59bab..d43158bee42 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.25-SNAPSHOT + 0.1.25 diff --git a/common/pom.xml b/common/pom.xml index cfdbf4782d8..1a121c5292a 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.25-SNAPSHOT + 0.1.25 diff --git a/druid-services/pom.xml b/druid-services/pom.xml index cba7eec5f3b..56b8d990bf8 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.25-SNAPSHOT + 0.1.25 com.metamx druid - 0.1.25-SNAPSHOT + 0.1.25 diff --git a/examples/pom.xml b/examples/pom.xml index 489d4481371..c4971269cea 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.25-SNAPSHOT + 0.1.25 diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 995d649ff0c..7a27749277e 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.25-SNAPSHOT + 0.1.25 diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index a5e7d242f1a..1886e27d49c 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.25-SNAPSHOT + 0.1.25 diff --git a/index-common/pom.xml b/index-common/pom.xml index 4cb30db8b05..cc141a27425 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.25-SNAPSHOT + 0.1.25 diff --git a/indexer/pom.xml b/indexer/pom.xml index ff29c24a67c..0f698f85757 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.25-SNAPSHOT + 0.1.25 diff --git a/merger/pom.xml b/merger/pom.xml index eb191b90701..019e17e4618 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.25-SNAPSHOT + 0.1.25 diff --git a/pom.xml b/pom.xml index 83a963f1c38..6a74b13d617 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.25-SNAPSHOT + 0.1.25 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 5da5645f35c..650842a4baf 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.25-SNAPSHOT + 0.1.25 diff --git a/server/pom.xml b/server/pom.xml index 4a1f2065059..8c9c05012e1 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.25-SNAPSHOT + 0.1.25 From 9627fdcd1cf13c25554c89c407743cb67b16e554 Mon Sep 17 00:00:00 2001 From: xvrl Date: Thu, 3 Jan 2013 10:09:52 -0800 Subject: [PATCH 43/43] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- druid-services/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/rand/pom.xml | 2 +- examples/twitter/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index d43158bee42..e737c55bc20 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.25 + 0.1.26-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 1a121c5292a..ec21eb37008 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.25 + 0.1.26-SNAPSHOT diff --git a/druid-services/pom.xml b/druid-services/pom.xml index 56b8d990bf8..81af25085e9 100644 --- a/druid-services/pom.xml +++ b/druid-services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.1.25 + 0.1.26-SNAPSHOT com.metamx druid - 0.1.25 + 0.1.26-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index c4971269cea..d1aae11058e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.25 + 0.1.26-SNAPSHOT diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 7a27749277e..ae6b1282605 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.25 + 0.1.26-SNAPSHOT diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index 1886e27d49c..40420b8b2f3 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -9,7 +9,7 @@ com.metamx druid-examples - 0.1.25 + 0.1.26-SNAPSHOT diff --git a/index-common/pom.xml b/index-common/pom.xml index cc141a27425..c5ca45c1002 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.25 + 0.1.26-SNAPSHOT diff --git a/indexer/pom.xml b/indexer/pom.xml index 0f698f85757..3ab32ed0b90 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.25 + 0.1.26-SNAPSHOT diff --git a/merger/pom.xml b/merger/pom.xml index 019e17e4618..1ea3478f7b9 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.25 + 0.1.26-SNAPSHOT diff --git a/pom.xml b/pom.xml index 6a74b13d617..b94153ac887 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.1.25 + 0.1.26-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 650842a4baf..6a0e30f2c8e 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.25 + 0.1.26-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 8c9c05012e1..88bfc7e2982 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.1.25 + 0.1.26-SNAPSHOT