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

Merge pull request #1 from mcroydon/master 

Build and example fixes
This commit is contained in:
cheddar 2012-10-24 14:57:17 -07:00
parent 631c3bf301 9575326c00
commit c8f549f7f1
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -14,3 +14,5 @@ target
client/.settings/org.eclipse.jdt.core.prefs
common/.settings/org.eclipse.jdt.core.prefs
server/.settings/org.eclipse.jdt.core.prefs
examples/rand/RealtimeNode.out
examples/twitter/RealtimeNode.out

2
examples/rand/run_client.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
echo " commandline query to RealtimeStandaloneMain service using curl"
echo " before running this, do: run_server.sh &"
echo " before running this, do: run_server.sh"
set +u
shopt -s xpg_echo

2
examples/rand/run_server.sh
View File

@ -15,7 +15,7 @@ echo "cleaning up previous run, if any"
# start RealtimeNode process
#
java -Xmx400m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath target/druid-examples-rand-2.5.72-SNAPSHOT-selfcontained.jar druid.examples.RealtimeStandaloneMain >RealtimeNode.out 2>&1 &
java -Xmx400m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath target/druid-examples-rand-*-selfcontained.jar druid.examples.RealtimeStandaloneMain >RealtimeNode.out 2>&1 &
PID=$!
trap "kill $PID" 1 2 3 15

2
examples/twitter/run_client.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
echo " commandline query to RealtimeStandaloneMain service using curl"
echo " before running this, do: run_server.sh &"
echo " before running this, do: run_server.sh"
set +u
shopt -s xpg_echo

1
server/src/main/java/com/metamx/druid/index/v1/IndexMerger.java
View File

@ -57,7 +57,6 @@ import com.metamx.druid.kv.TmpFileIOPeon;
import com.metamx.druid.kv.VSizeIndexedWriter;
import com.metamx.druid.utils.JodaUtils;
import com.metamx.druid.utils.SerializerUtils;
import com.sun.tools.javac.resources.version;
import it.uniroma3.mat.extendedset.intset.ConciseSet;
import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet;
import org.apache.commons.io.FileUtils;