Commit Graph

3890 Commits

Author SHA1 Message Date
fjy a15d32da9b Merge branch 'druid-0.7.x' into offheap-incremental-index 2014-08-18 17:11:12 -07:00
fjy c9ce074d84 Merge pull request #689 from metamx/default-host-port
fix test initialization
2014-08-18 14:40:39 -06:00
Xavier Léauté 78054d7f05 fix test initialization 2014-08-18 13:37:47 -07:00
fjy 8f7c6050f9 fix 2014-08-18 12:57:25 -07:00
fjy 38014fa964 Merge branch 'offheap-incremental-index' of github.com:metamx/druid into offheap-incremental-index 2014-08-18 11:14:49 -07:00
fjy 77e514688a Merge branch 'druid-0.7.x' into offheap-incremental-index 2014-08-18 11:14:19 -07:00
fjy 74b8adf5b0 Merge pull request #686 from metamx/default-host-port
default service/host/port for all nodes
2014-08-18 10:52:58 -06:00
nishantmonu51 4dd01d4eae review comments 2014-08-18 19:34:56 +05:30
Xavier Léauté 1fd30ab588 default service/host/port for all nodes 2014-08-15 17:14:05 -07:00
fjy 19f6d3207f Merge pull request #685 from metamx/metadata-init-tool
add missing tables
2014-08-15 13:53:39 -06:00
Xavier Léauté 17a3e65dc4 add missing tables 2014-08-15 12:50:30 -07:00
fjy 340c9e1458 Merge pull request #684 from metamx/metadata-init-tool
add tools comand to create metadata storage tables
2014-08-14 18:36:10 -06:00
Xavier Léauté 6f0e768d82 add tools comand to create metadata storage tables 2014-08-14 17:13:55 -07:00
fjy 8fabc541f0 Merge branch 'druid-0.7.x' into offheap-incremental-index 2014-08-14 11:39:44 -07:00
Xavier Léauté 603152eb18 fix compilation with Java 8 2014-08-14 11:37:47 -07:00
fjy 18d3acd3a8 fix all manners of brokenness from nulls and empty strings 2014-08-14 11:11:57 -07:00
fjy 1adec23126 some better null handling for MV 2014-08-12 16:40:02 -07:00
Xavier Léauté b448deeca0 fix compilation with Java 8 2014-08-12 14:02:08 -07:00
Xavier Léauté 161c2f0fff Merge branch '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
	services/pom.xml
2014-08-12 14:00:21 -07:00
fjy 4e3f4fbc22 [maven-release-plugin] prepare for next development iteration 2014-08-12 13:24:55 -07:00
fjy f3aafc246c [maven-release-plugin] prepare release druid-0.6.144 2014-08-12 13:24:50 -07:00
fjy 79f6486b88 prepare for next release 2014-08-12 13:22:23 -07:00
fjy d4014c6a4e Merge pull request #675 from metamx/slimmer-column-cache
reduce object count overhead of column cache
2014-08-12 14:16:33 -06:00
fjy 578e0b4fb6 add more logging for groupby caching 2014-08-12 12:35:39 -07:00
nishantmonu51 f36d030ef2 fix NPE while indexing 2014-08-13 00:54:31 +05:30
Xavier Léauté 1c244c8be8 add column cache docs 2014-08-12 10:40:09 -07:00
nishantmonu51 c6712739dc merge changes from druid-0.7.x 2014-08-12 15:47:42 +05:30
nishantmonu51 9598a524a8 review comment - move index closure to finally 2014-08-12 14:58:55 +05:30
Xavier Léauté a1bcff49c5 disable column cache by default 2014-08-11 18:10:33 -07:00
Xavier Léauté 69f4c2677f formatting 2014-08-11 18:10:19 -07:00
Xavier Léauté da399724eb add approximate object overhead 2014-08-11 17:07:10 -07:00
Xavier Léauté aecf4491be reduce object count overhead of column cache 2014-08-11 15:25:14 -07:00
fjy b740987381 Merge pull request #616 from metamx/jisoo
add retry feature on broker side; modify QueryRunner inferface and tests
2014-08-11 15:36:16 -06:00
fjy 7dba576ed7 Merge pull request #600 from metamx/new-init
Properties module can now take multiple properties files
2014-08-11 15:29:26 -06:00
fjy d082718ed2 fix assembly file 2014-08-11 14:28:44 -07:00
fjy 2ecd55bae5 Merge branch 'druid-0.7.x' into new-init
Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
2014-08-11 12:47:38 -07:00
fjy 424dfa7ee7 Merge branch 'druid-0.7.x' of github.com:metamx/druid into druid-0.7.x 2014-08-11 12:36:03 -07:00
fjy 70b86c5551 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
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	services/pom.xml
2014-08-11 12:35:47 -07:00
fjy 0cff63c7c6 [maven-release-plugin] prepare for next development iteration 2014-08-09 19:36:11 -07:00
fjy 724562b181 [maven-release-plugin] prepare release druid-0.6.143 2014-08-09 19:36:05 -07:00
fjy bd98e0dd29 prep next release 2014-08-09 19:33:31 -07:00
fjy 0e1a8f6f02 concurrency my old foe, we meet again 2014-08-09 19:33:07 -07:00
fjy d58ae945a4 [maven-release-plugin] prepare for next development iteration 2014-08-08 16:22:38 -07:00
fjy d240479133 [maven-release-plugin] prepare release druid-0.6.142 2014-08-08 16:22:34 -07:00
fjy 8998700760 prepare for next release 2014-08-08 16:19:45 -07:00
fjy 199f2b1683 [maven-release-plugin] prepare for next development iteration 2014-08-08 15:53:53 -07:00
fjy 29a077d893 [maven-release-plugin] prepare release druid-0.6.141 2014-08-08 15:53:49 -07:00
fjy 8e87cae990 prepare for next rel 2014-08-08 15:51:22 -07:00
fjy e5896f4863 fix yet another bug with LQP 2014-08-08 15:50:57 -07:00
fjy 958792db5c [maven-release-plugin] prepare for next development iteration 2014-08-08 15:16:38 -07:00