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

Merge branch 'master' of github.com:metamx/druid

This commit is contained in:
Russell Jurney 2013-07-10 14:19:35 -07:00
parent 9d9d49f9b5 c519be5b9f
commit 921bee33d9
14 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/src/main/java/druid/examples/RealtimeStandaloneMain.java
View File

@ -16,7 +16,7 @@ import com.metamx.druid.realtime.SegmentPublisher;
import druid.examples.flights.FlightsFirehoseFactory;
import druid.examples.rand.RandomFirehoseFactory;
import druid.examples.twitter.TwitterSpritzerFirehoseFactory;
import druid.examples.webStream.WebFirehoseFactory;
import druid.examples.web.WebFirehoseFactory;
import java.io.File;
import java.io.IOException;

2
examples/src/main/java/druid/examples/webStream/InputSupplierUpdateStream.java → examples/src/main/java/druid/examples/web/InputSupplierUpdateStream.java
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package druid.examples.webStream;
package druid.examples.web;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.type.TypeReference;

2
examples/src/main/java/druid/examples/webStream/InputSupplierUpdateStreamFactory.java → examples/src/main/java/druid/examples/web/InputSupplierUpdateStreamFactory.java
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package druid.examples.webStream;
package druid.examples.web;
import com.google.common.io.InputSupplier;

2
examples/src/main/java/druid/examples/webStream/RenamingKeysUpdateStream.java → examples/src/main/java/druid/examples/web/RenamingKeysUpdateStream.java
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package druid.examples.webStream;
package druid.examples.web;
import com.google.common.collect.Maps;

2
examples/src/main/java/druid/examples/webStream/RenamingKeysUpdateStreamFactory.java → examples/src/main/java/druid/examples/web/RenamingKeysUpdateStreamFactory.java
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package druid.examples.webStream;
package druid.examples.web;
import java.util.Map;

2
examples/src/main/java/druid/examples/webStream/UpdateStream.java → examples/src/main/java/druid/examples/web/UpdateStream.java
View File

@ -16,7 +16,7 @@
* 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;
package druid.examples.web;
import java.util.Map;
import java.util.concurrent.TimeUnit;

2
examples/src/main/java/druid/examples/webStream/UpdateStreamFactory.java → examples/src/main/java/druid/examples/web/UpdateStreamFactory.java
View File

@ -16,7 +16,7 @@
* 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;
package druid.examples.web;
public interface UpdateStreamFactory
{

2
examples/src/main/java/druid/examples/webStream/WebFirehoseFactory.java → examples/src/main/java/druid/examples/web/WebFirehoseFactory.java
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package druid.examples.webStream;
package druid.examples.web;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;

3
examples/src/main/java/druid/examples/webStream/WebJsonSupplier.java → examples/src/main/java/druid/examples/web/WebJsonSupplier.java
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package druid.examples.webStream;
package druid.examples.web;
import com.google.common.io.InputSupplier;
import com.metamx.emitter.EmittingLogger;
@ -27,7 +27,6 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URL;
import java.net.URLConnection;
import java.util.List;
public class WebJsonSupplier implements InputSupplier<BufferedReader>
{

8
examples/src/main/java/druid/examples/webStream/InputSupplierUpdateStreamTest.java → examples/src/test/java/druid/examples/web/InputSupplierUpdateStreamTest.java
View File

@ -17,12 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package druid.examples.webStream;
package druid.examples.web;
import com.google.common.io.InputSupplier;
import junit.framework.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.junit.Before;
import org.junit.Test;
import java.util.ArrayList;
import java.util.HashMap;
@ -38,7 +38,7 @@ public class InputSupplierUpdateStreamTest
Map<String, Object> expectedAnswer = new HashMap<String, Object>();
String timeDimension;
@BeforeClass
@Before
public void setUp()
{
timeDimension = "time";

8
examples/src/main/java/druid/examples/webStream/RenamingKeysUpdateStreamTest.java → examples/src/test/java/druid/examples/web/RenamingKeysUpdateStreamTest.java
View File

@ -17,12 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package druid.examples.webStream;
package druid.examples.web;
import com.google.common.io.InputSupplier;
import junit.framework.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.junit.Before;
import org.junit.Test;
import java.util.HashMap;
import java.util.Map;
@ -35,7 +35,7 @@ public class RenamingKeysUpdateStreamTest
private InputSupplier testCaseSupplier;
String timeDimension;
@BeforeClass
@Before
public void setUp()
{
timeDimension = "time";

2
examples/src/main/java/druid/examples/webStream/TestCaseSupplier.java → examples/src/test/java/druid/examples/web/TestCaseSupplier.java
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package druid.examples.webStream;
package druid.examples.web;
import com.google.common.io.InputSupplier;

14
examples/src/main/java/druid/examples/webStream/WebFirehoseFactoryTest.java → examples/src/test/java/druid/examples/web/WebFirehoseFactoryTest.java
View File

@ -17,16 +17,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package druid.examples.webStream;
package druid.examples.web;
import com.beust.jcommander.internal.Lists;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.metamx.druid.input.InputRow;
import com.metamx.druid.realtime.firehose.Firehose;
import junit.framework.Assert;
import org.joda.time.DateTime;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import java.util.Collections;
import java.util.List;
@ -39,7 +39,7 @@ public class WebFirehoseFactoryTest
private WebFirehoseFactory webbie;
private WebFirehoseFactory webbie1;
@BeforeClass
@Before
public void setUp() throws Exception
{
dimensions.add("item1");
@ -188,7 +188,7 @@ public class WebFirehoseFactoryTest
throw new RuntimeException("queue is empty");
}
Assert.assertEquals((float) 2.0, inputRow.getFloatMetric("item2"));
Assert.assertEquals((float) 2.0, inputRow.getFloatMetric("item2"), 0.0f);
}
private static class MyUpdateStream implements UpdateStream

6
examples/src/main/java/druid/examples/webStream/WebJsonSupplierTest.java → examples/src/test/java/druid/examples/web/WebJsonSupplierTest.java
View File

@ -17,15 +17,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package druid.examples.webStream;
package druid.examples.web;
import org.testng.annotations.Test;
import org.junit.Test;
import java.net.UnknownHostException;
public class WebJsonSupplierTest
{
@Test(expectedExceptions = UnknownHostException.class)
@Test(expected = UnknownHostException.class)
public void checkInvalidUrl() throws Exception
{