Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed thread stuff and made tests cleaner

This commit is contained in:
Dhruv Parthasarathy 2013-07-09 16:34:55 -07:00
parent 6d000fc4c2
commit 3250c698bb
8 changed files with 108 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
examples/src/main/java/druid/examples/webStream/InputSupplierUpdateStream.java
View File

@ -43,7 +43,7 @@ public class InputSupplierUpdateStream implements UpdateStream
private final BlockingQueue<Map<String, Object>> queue = new ArrayBlockingQueue<Map<String, Object>>(QUEUE_SIZE);
private final ObjectMapper mapper = new DefaultObjectMapper();
private final String timeDimension;
private StoppableThread addToQueueThread;
public InputSupplierUpdateStream(
InputSupplier<BufferedReader> supplier,
String timeDimension
@ -61,9 +61,11 @@ public class InputSupplierUpdateStream implements UpdateStream
return !(s.isEmpty());
}
@Override
public void run()
public void start()
{
addToQueueThread = new StoppableThread(){
public void run(){
while(!finished)
try {
BufferedReader reader = supplier.getInput();
String line;
@ -82,9 +84,17 @@ public class InputSupplierUpdateStream implements UpdateStream
catch (Exception e) {
throw Throwables.propagate(e);
}
}
};
addToQueueThread.setDaemon(true);
addToQueueThread.start();
}
public void stop(){
addToQueueThread.stopMe();
}
public Map<String, Object> pollFromQueue(long waitTime, TimeUnit unit) throws InterruptedException
{

6
examples/src/main/java/druid/examples/webStream/InputSupplierUpdateStreamTest.java
View File

@ -65,7 +65,7 @@ public class InputSupplierUpdateStreamTest
testCaseSupplier,
timeDimension
);
updateStream.run();
updateStream.start();
Map<String, Object> insertedRow = updateStream.pollFromQueue(waitTime, unit);
Assert.assertEquals(expectedAnswer, insertedRow);
}
@ -83,7 +83,7 @@ public class InputSupplierUpdateStreamTest
testCaseSupplier,
timeDimension
);
updateStream.run();
updateStream.start();
Assert.assertEquals(updateStream.getQueueSize(), 0);
}
@ -99,7 +99,7 @@ public class InputSupplierUpdateStreamTest
testCaseSupplier,
timeDimension
);
updateStream.run();
updateStream.start();
Map<String, Object> insertedRow = updateStream.pollFromQueue(waitTime, unit);
Map<String, Object> expectedAnswer = new HashMap<String, Object>();
expectedAnswer.put("item1", "value1");

10
examples/src/main/java/druid/examples/webStream/RenamingKeysUpdateStream.java
View File

@ -70,10 +70,12 @@ public class RenamingKeysUpdateStream implements UpdateStream
}
@Override
public void run()
public void start()
{
updateStream.run();
updateStream.start();
}
public void stop(){
updateStream.stop();
}
}

2
examples/src/main/java/druid/examples/webStream/RenamingKeysUpdateStreamTest.java
View File

@ -56,7 +56,7 @@ public class RenamingKeysUpdateStreamTest
renamedKeys.put("time", "t");
RenamingKeysUpdateStream renamer = new RenamingKeysUpdateStream(updateStream, renamedKeys);
renamer.run();
renamer.start();
Map<String, Object> expectedAnswer = new HashMap<String, Object>();
expectedAnswer.put("i1", "value1");
expectedAnswer.put("i2", 2);

27
examples/src/main/java/druid/examples/webStream/StoppableThread.java Normal file
View File

@ -0,0 +1,27 @@
/*
* Druid - a distributed column store.
* Copyright (C) 2012 Metamarkets Group Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package druid.examples.webStream;
public class StoppableThread extends Thread
{
volatile boolean finished=false;
public void stopMe(){
finished=true;
}
}

5
examples/src/main/java/druid/examples/webStream/UpdateStream.java
View File

@ -21,10 +21,11 @@ package druid.examples.webStream;
import java.util.Map;
import java.util.concurrent.TimeUnit;
public interface UpdateStream extends Runnable
public interface UpdateStream
{
public Map<String, Object> pollFromQueue(long waitTime, TimeUnit unit) throws InterruptedException;
public String getTimeDimension();
public void start();
public void stop();
}

7
examples/src/main/java/druid/examples/webStream/WebFirehoseFactory.java
View File

@ -35,8 +35,6 @@ import org.joda.time.DateTime;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@JsonTypeName("webstream")
@ -78,8 +76,7 @@ public class WebFirehoseFactory implements FirehoseFactory
{
final UpdateStream updateStream = factory.build();
final ExecutorService service = Executors.newSingleThreadExecutor();
service.submit(updateStream);
updateStream.start();
return new Firehose()
{
@ -129,7 +126,7 @@ public class WebFirehoseFactory implements FirehoseFactory
@Override
public void close() throws IOException
{
service.shutdown();
updateStream.stop();
}
};

122
examples/src/main/java/druid/examples/webStream/WebFirehoseFactoryTest.java
View File

@ -51,26 +51,7 @@ public class WebFirehoseFactoryTest
@Override
public UpdateStream build()
{
return new UpdateStream()
{
@Override
public Map<String, Object> pollFromQueue(long waitTime, TimeUnit unit) throws InterruptedException
{
return ImmutableMap.<String, Object>of("item1", "value1", "item2", 2, "time", "1372121562");
}
@Override
public String getTimeDimension()
{
return "time";
}
@Override
public void run()
{
}
};
return new MyUpdateStream(ImmutableMap.<String,Object>of("item1", "value1", "item2", 2, "time", "1372121562"));
}
},
"posix"
@ -82,26 +63,7 @@ public class WebFirehoseFactoryTest
@Override
public UpdateStream build()
{
return new UpdateStream()
{
@Override
public Map<String, Object> pollFromQueue(long waitTime, TimeUnit unit) throws InterruptedException
{
return ImmutableMap.<String, Object>of("item1", "value1", "item2", 2, "time", "1373241600000");
}
@Override
public String getTimeDimension()
{
return "time";
}
@Override
public void run()
{
}
};
return new MyUpdateStream(ImmutableMap.<String,Object>of("item1", "value1", "item2", 2, "time", "1373241600000"));
}
},
"auto"
@ -141,37 +103,18 @@ public class WebFirehoseFactoryTest
@Test
public void testISOTimeStamp() throws Exception
{
WebFirehoseFactory webbie4 = new WebFirehoseFactory(
WebFirehoseFactory webbie3 = new WebFirehoseFactory(
new UpdateStreamFactory()
{
@Override
public UpdateStream build()
{
return new UpdateStream()
{
@Override
public Map<String, Object> pollFromQueue(long waitTime, TimeUnit unit) throws InterruptedException
{
return ImmutableMap.<String, Object>of("item1", "value1", "item2", 2, "time", "2013-07-08");
}
@Override
public String getTimeDimension()
{
return "time";
}
@Override
public void run()
{
}
};
return new MyUpdateStream(ImmutableMap.<String,Object>of("item1", "value1", "item2", 2, "time", "2013-07-08"));
}
},
"auto"
);
Firehose firehose1 = webbie4.connect();
Firehose firehose1 = webbie3.connect();
if (firehose1.hasMore()) {
long milliSeconds = firehose1.nextRow().getTimestampFromEpoch();
DateTime date = new DateTime("2013-07-08");
@ -184,37 +127,18 @@ public class WebFirehoseFactoryTest
@Test
public void testAutoIsoTimeStamp() throws Exception
{
WebFirehoseFactory webbie5 = new WebFirehoseFactory(
WebFirehoseFactory webbie2 = new WebFirehoseFactory(
new UpdateStreamFactory()
{
@Override
public UpdateStream build()
{
return new UpdateStream()
{
@Override
public Map<String, Object> pollFromQueue(long waitTime, TimeUnit unit) throws InterruptedException
{
return ImmutableMap.<String, Object>of("item1", "value1", "item2", 2, "time", "2013-07-08");
}
@Override
public String getTimeDimension()
{
return "time";
}
@Override
public void run()
{
}
};
return new MyUpdateStream(ImmutableMap.<String,Object>of("item1", "value1", "item2", 2, "time", "2013-07-08"));
}
},
null
);
Firehose firehose2 = webbie5.connect();
Firehose firehose2 = webbie2.connect();
if (firehose2.hasMore()) {
long milliSeconds = firehose2.nextRow().getTimestampFromEpoch();
DateTime date = new DateTime("2013-07-08");
@ -266,4 +190,34 @@ public class WebFirehoseFactoryTest
Assert.assertEquals((float) 2.0, inputRow.getFloatMetric("item2"));
}
private static class MyUpdateStream implements UpdateStream
{
private static ImmutableMap<String,Object> map;
public MyUpdateStream(ImmutableMap<String,Object> map){
this.map=map;
}
@Override
public Map<String, Object> pollFromQueue(long waitTime, TimeUnit unit) throws InterruptedException
{
return map;
}
@Override
public String getTimeDimension()
{
return "time";
}
@Override
public void start()
{
}
@Override
public void stop()
{
}
}
}