866 Commits

Author SHA1 Message Date
nishantmonu51
358ff915bb fix merge conflicts 2014-09-30 22:19:18 +05:30
nishantmonu51
2789536bed merge changes from druid-0.7.x 2014-09-30 22:05:49 +05:30
nishantmonu51
61c7fd2e6e make ingestOffheap tuneable 2014-09-30 15:30:02 +05:30
Gian Merlino
1e6ce8ac9a TaskLogs fixes and cleanups.
- Fix negative offsets in FileTaskLogs and HdfsTaskLogs.
- Consolidate file offset code into LogUtils (currently used in two places).
- Clean up style for HdfsTaskLogs and related classes.
- Remove unused code in ForkingTaskRunner.
2014-09-29 16:20:34 -07:00
fjy
4a09678739 make the selection strategy in rtr extendable 2014-09-29 14:24:02 -07:00
jisookim0513
74565c9371 cleaned up the code 2014-09-27 13:10:01 -07:00
jisookim0513
6a641621b2 finished merging into druid-0.7.x; derby not working (to be fixed) 2014-09-26 14:24:53 -07:00
jisookim0513
43cc6283d3 trying to revert files that have overwritten changes 2014-09-26 12:38:04 -07:00
fjy
eaf0a48b92 Merge branch 'master' into druid-0.7.x
Conflicts:
	cassandra-storage/pom.xml
	common/pom.xml
	examples/pom.xml
	hdfs-storage/pom.xml
	histogram/pom.xml
	indexing-hadoop/pom.xml
	indexing-service/pom.xml
	kafka-eight/pom.xml
	kafka-seven/pom.xml
	pom.xml
	processing/pom.xml
	processing/src/main/java/io/druid/guice/PropertiesModule.java
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	services/pom.xml
2014-09-26 11:39:24 -07:00
jisookim0513
3bf39cc9f8 attempted to fix merge-conflicts 2014-09-24 15:55:42 -07:00
nishantmonu51
f51ab84386 merge changes from druid-0.7.x 2014-09-22 23:48:45 +05:30
jisookim0513
273205f217 initial attempt for abstraction; druid cluster works with Derby as a default 2014-09-19 17:39:59 -07:00
nishantmonu51
8eb6466487 revert buffer size and add back rowFlushBoundary 2014-09-19 23:06:04 +05:30
nishantmonu51
e6d93a3070 fix NPE
fix NPE when the dimension of metric is not present one of the segments
to be reIndexed.
2014-09-17 15:57:58 +05:30
nishantmonu51
f006de8639 fix #732
fix metric list discovery
2014-09-16 22:12:36 +05:30
Xavier Léauté
c8b8e3f6e9 negating compare is bad 2014-09-15 13:00:06 -07:00
Xavier Léauté
137ad50bf1 classes that should be static 2014-09-15 13:00:06 -07:00
Xavier Léauté
e57e2d97ba make constants final 2014-09-15 12:53:40 -07:00
Xavier Léauté
cfa92e8217 fix incorrect nullable annotations 2014-09-15 12:13:52 -07:00
fjy
469ccbbe5e Merge branch 'master' into druid-0.7.x
Conflicts:
	cassandra-storage/pom.xml
	common/pom.xml
	examples/pom.xml
	hdfs-storage/pom.xml
	histogram/pom.xml
	indexing-hadoop/pom.xml
	indexing-service/pom.xml
	kafka-eight/pom.xml
	kafka-seven/pom.xml
	pom.xml
	processing/pom.xml
	processing/src/main/java/io/druid/query/FinalizeResultsQueryRunner.java
	processing/src/main/java/io/druid/query/UnionQueryRunner.java
	processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactory.java
	processing/src/main/java/io/druid/query/topn/TopNQueryEngine.java
	processing/src/main/java/io/druid/query/topn/TopNQueryRunnerFactory.java
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	server/src/test/java/io/druid/server/initialization/JettyTest.java
	services/pom.xml
2014-09-11 16:20:50 -07:00
fjy
fec7b43fcb make making v9 segments something completely configurable 2014-09-10 15:28:30 -07:00
fjy
351afb8be7 allow legacy index generator 2014-09-09 17:04:35 -07:00
Xavier Léauté
508e982190 Merge remote-tracking branch 'origin/master' into druid-0.7.x
Conflicts:
	cassandra-storage/pom.xml
	common/pom.xml
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
	examples/pom.xml
	hdfs-storage/pom.xml
	histogram/pom.xml
	indexing-hadoop/pom.xml
	indexing-service/pom.xml
	kafka-eight/pom.xml
	kafka-seven/pom.xml
	pom.xml
	processing/pom.xml
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	server/src/main/java/io/druid/server/ClientQuerySegmentWalker.java
	services/pom.xml
2014-08-30 22:42:36 -07:00
Xavier Léauté
58ab759fc6 remove unused imports 2014-08-29 14:03:47 -07:00
Xavier Léauté
ac05836833 make Java 8 javadoc happy 2014-08-29 13:58:50 -07:00
Gian Merlino
8bcb73a0eb Java programs are best run with a java command. 2014-08-28 18:10:01 -07:00
Gian Merlino
5564a67bfc File.pathSeparator is better than ":". 2014-08-28 18:09:33 -07:00
Gian Merlino
68aeafaacd Allow indexing tasks to specify extra classpaths.
This could be used by Hadoop tasks to reference configs for different clusters, assuming
that the possible configs have been pre-distributed to middle managers.
2014-08-28 18:00:26 -07:00
fjy
d64879ccca more cleanup 2014-08-20 13:22:42 -07:00
fjy
1614f40f1a fix index task 2014-08-20 13:11:00 -07:00
fjy
92f26d9a1f cleanup rowflushboundary 2014-08-20 13:09:37 -07:00
nishantmonu51
fe105d52ee use bufferSize for IndexTask 2014-08-20 22:41:34 +05:30
nishantmonu51
33354cf7fe replace maxRowsInMemory with BufferSize 2014-08-20 20:59:44 +05:30
nishantmonu51
e525562767 review comments - cleanup ColumnSelectorFactory 2014-08-20 15:04:43 +05:30
nishantmonu51
60906c3244 Revert "make valueType configurable"
This reverts commit 6f60a3f60437ddfff2065110d8622ef218fd4b65.
2014-08-20 11:55:26 +05:30
fjy
4fd5479559 fix typo 2014-08-19 12:34:10 -07:00
fjy
77e514688a Merge branch 'druid-0.7.x' into offheap-incremental-index 2014-08-18 11:14:19 -07:00
Xavier Léauté
1fd30ab588 default service/host/port for all nodes 2014-08-15 17:14:05 -07:00
nishantmonu51
6f60a3f604 make valueType configurable 2014-08-13 14:37:57 +05:30
nishantmonu51
1b0a72751b Add support for LongColumn 2014-08-13 08:52:36 +05:30
nishantmonu51
c6712739dc merge changes from druid-0.7.x 2014-08-12 15:47:42 +05:30
fjy
91ebe45b4e support both rejectionPolicy and rejectionPolicyFactory in serde 2014-08-07 10:06:27 -07:00
nishantmonu51
637bd35785 merge changes from druid-0.7.x 2014-07-31 16:07:22 +05:30
Gian Merlino
09fcfc3b6d Fix race in RemoteTaskRunner that could lead to zombie tasks. 2014-07-18 11:41:50 -07:00
nishantmonu51
4ce12470a1 Add way to skip determine partitions for index task
Add a way to skip determinePartitions for IndexTask by manually
specifying numShards.
2014-07-18 18:52:15 +05:30
fjy
d8b8826c2e Merge branch 'cleanup-ingest' of github.com:metamx/druid into cleanup-ingest
Conflicts:
	server/src/test/java/io/druid/realtime/firehose/CombiningFirehoseFactoryTest.java
2014-07-17 20:26:11 -07:00
fjy
291f4c00ae Merge branch 'master' of github.com:metamx/druid into cleanup-ingest 2014-07-17 20:24:59 -07:00
nishantmonu51
0e0454a34c switch reingest task to noop & fix compilation
switch back to noop task, its confusing to have a reinvest task that
does nothing.
fix compilation
2014-07-18 06:50:58 +05:30
fjy
ded83557dd Merge pull request #640 from metamx/disable-worker
An alternative way to disable middlemanagers based on worker version
2014-07-17 19:07:27 -06:00
fjy
beac0be45b fix enabled endpoint 2014-07-17 18:04:36 -07:00