1864 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
nishantmonu51
adb4a65e0a Merge branch 'offheap-incremental-index' into mapdb-branch 2014-09-29 12:38:31 +05:30
fjy
4244accab5 Merge branch 'druid-0.7.x' of github.com:metamx/druid into druid-0.7.x 2014-09-26 11:39:50 -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
Xavier Léauté
7cfe86b7bc [maven-release-plugin] prepare for next development iteration 2014-09-23 16:31:25 -07:00
Xavier Léauté
80166314d9 [maven-release-plugin] prepare release druid-0.6.156 2014-09-23 16:31:21 -07:00
Xavier Léauté
d02fd97ea3 fix comment 2014-09-23 16:25:46 -07:00
Xavier Léauté
8603d2fd3e keep default behavior 2014-09-23 16:23:02 -07:00
fjy
4235e14fc6 [maven-release-plugin] prepare for next development iteration 2014-09-23 16:12:43 -07:00
fjy
576e9b8a84 [maven-release-plugin] prepare release druid-0.6.155 2014-09-23 16:12:39 -07:00
Xavier Léauté
35fb210cfa add test for parallel loading 2014-09-23 16:06:46 -07:00
Xavier Léauté
05d4f71ddc fix background annoucing race condition 2014-09-23 15:04:48 -07:00
Xavier Léauté
12449481e3 parallelize segment loading 2014-09-22 16:33:25 -07:00
nishantmonu51
f51ab84386 merge changes from druid-0.7.x 2014-09-22 23:48:45 +05:30
nishantmonu51
443e5788fb make OffheapIncrementalIndex tuneable 2014-09-22 19:26:10 +05:30
nishantmonu51
8eb6466487 revert buffer size and add back rowFlushBoundary 2014-09-19 23:06:04 +05:30
Xavier Léauté
32b6135f3d background announce segment cache 2014-09-18 12:09:20 -07:00
fjy
a17794a516 [maven-release-plugin] prepare for next development iteration 2014-09-16 15:22:55 -07:00
fjy
f9c91ace3f [maven-release-plugin] prepare release druid-0.6.154 2014-09-16 15:22:49 -07:00
Xavier Léauté
d9a0d403b3 default zk compressed + batch announcements in 0.7 2014-09-16 14:54:45 -07:00
fjy
8b387034a3 Merge pull request #741 from metamx/serverview-initialization
initialize segment view before announcing broker
2014-09-16 15:35:09 -06:00
fjy
1dbb6fd4b0 Merge pull request #736 from metamx/fix-synchronized
fix synchronized on field getting updated
2014-09-16 11:06:35 -06:00
Xavier Léauté
762485a0c9 remove unnecessary transient 2014-09-16 09:59:25 -07:00
Xavier Léauté
f1e3518f37 initialize segment view before announcing broker 2014-09-16 00:07:31 -07:00
xvrl
a73670ee7b Merge pull request #738 from metamx/dim-ex
Have better dimension exclusions
2014-09-15 17:14:29 -07:00
fjy
77dbac3739 fix import 2014-09-15 17:10:34 -07:00
fjy
f2d6360d4d cleanup 2014-09-15 17:08:45 -07:00
fjy
34ae426ffa address cr 2014-09-15 17:08:02 -07:00
fjy
1ab2662772 have better dimension exclusions 2014-09-15 16:52:07 -07:00
Xavier Léauté
02892233ac fix synchronized on field getting updated 2014-09-15 13:56:31 -07:00
fjy
aa28bc0613 address cr 2014-09-15 13:14:23 -07:00
Xavier Léauté
0712c666cb null check for something that cannot be null 2014-09-15 13:00:06 -07:00
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é
d4795ce927 fix missing charsets 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
cbf5076961 still propagate log 2014-09-12 11:43:42 -07:00
fjy
e62ed40d86 make some logs not emit 2014-09-11 16:49:18 -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
Xavier Léauté
32e256a842 [maven-release-plugin] prepare for next development iteration 2014-09-10 17:24:15 -07:00
Xavier Léauté
f7dc13d240 [maven-release-plugin] prepare release druid-0.6.153 2014-09-10 17:24:11 -07:00
fjy
fec7b43fcb make making v9 segments something completely configurable 2014-09-10 15:28:30 -07:00
Xavier Léauté
d6f6a59ae2 fix for missing context when embedding broker 2014-09-09 14:25:56 -07:00
Xavier Léauté
22553b0b28 [maven-release-plugin] prepare for next development iteration 2014-09-05 11:07:22 -07:00
Xavier Léauté
570a7a07bf [maven-release-plugin] prepare release druid-0.6.152 2014-09-05 11:07:14 -07:00
fjy
e24be03a38 [maven-release-plugin] prepare for next development iteration 2014-09-04 14:10:13 -07:00
fjy
a933ea1866 [maven-release-plugin] prepare release druid-0.6.151 2014-09-04 14:10:09 -07:00