1173 Commits

Author SHA1 Message Date
fjy
09ad32c5c5 fix race condition with merge and persist and sink adding
Conflicts:
	indexing-service/src/main/java/io/druid/indexing/common/task/IndexTask.java
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java
2014-05-16 15:21:09 -07:00
fjy
d75cc7b9b8 fix more serde 2014-05-06 15:17:38 -07:00
fjy
1100d2f2a1 rename configs to make a bit more sense 2014-05-06 14:52:50 -07:00
fjy
b6fb4245aa Merge branch 'master' into new-schema
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDriverConfig.java
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfigBuilder.java
	pom.xml
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
	server/src/main/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseFactory.java
2014-05-06 14:32:51 -07:00
fjy
79e6d4eb56 Merge pull request #528 from metamx/union-query-source
Union query source
2014-05-06 14:13:33 -06:00
Gian Merlino
bdf9e74a3b Allow config-based overriding of hadoop job properties. 2014-05-06 09:11:31 -07:00
nishantmonu51
728a606d32 Add support for union queries 2014-05-01 01:54:52 +05:30
fjy
171d20d52d Merge branch 'move-firehose' of github.com:metamx/druid into move-firehose 2014-04-25 14:13:19 -07:00
fjy
eef034ca7e Merge branch 'master' of github.com:metamx/druid into move-firehose 2014-04-25 14:13:08 -07:00
fjy
76e0a48527 Merge branch 'master' into new-schema
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/DbUpdaterJob.java
	indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java
	indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java
2014-04-25 14:03:28 -07:00
fjy
174ff66a88 Merge pull request #504 from metamx/shard-count-limit-fix
Fix shard count limit
2014-04-23 10:12:05 -06:00
nishantmonu51
6eb282b3a8 Fix shard count limit
Fix shard count limit at another place,
Use partitioned as a flag
2014-04-23 13:56:06 +05:30
Gian Merlino
8d650ae131 PullDependencies changes.
- Pull default Hadoop version by default.
- Allow additional coordinates on the command line.
2014-04-22 14:33:53 -07:00
fjy
c00fb1d08e Merge pull request #445 from metamx/hadoop-version-update
Hadoop version update
2014-04-17 19:16:44 -06:00
fjy
9b06b6aa58 misc fixes for router 2014-04-15 14:23:54 -07:00
fjy
9bfc738032 im deeply saddened but another case sensitivity problem and want to resolve these once and for all 2014-04-14 16:20:31 -07:00
nishantmonu51
0c95c0b689 moved file 2014-04-09 14:25:31 +05:30
fjy
1843316db6 commonalize event receiver firehose 2014-04-03 20:46:36 -07:00
Xavier Léauté
e0ff2aa0d6 make isPostgreSQL check URI instead of metadata 2014-03-27 12:13:10 -07:00
nishantmonu51
a24fc84d0d Merge branch 'master' into hadoop-version-update 2014-03-27 03:32:11 +05:30
nishantmonu51
a9a6682a0e Upgrade to Hadoop 2.3.0 2014-03-26 11:43:31 +05:30
fjy
4360c050eb fix broken ut 2014-03-25 11:13:52 -07:00
fjy
771aa2ae68 backwards compat 2014-03-25 09:23:48 -07:00
fjy
5ebb2d27e3 fix hadoop 2014-03-24 18:43:31 -07:00
fjy
2adcf07f5f Merge branch 'master' into new-schema
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java
	indexing-service/src/main/java/io/druid/indexing/common/task/RealtimeIndexTask.java
	indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java
	processing/src/test/java/io/druid/segment/TestIndex.java
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java
2014-03-17 10:59:31 -07:00
nishantmonu51
04f3d0a13a fix cli hadoop indexer
* run determine partitions job using CLI
2014-03-11 16:36:19 +05:30
fjy
b5181a8a89 Merge pull request #422 from tucksaun/feat-postgresql-support
Fixed segments SQL queries for PostgreSQL compatibility
2014-03-07 13:42:57 -07:00
Yuval Oren
4b63645802 Merge branch 'master' into subquery
Conflicts:
	processing/src/main/java/io/druid/query/BaseQuery.java
	processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java
	processing/src/test/java/io/druid/query/QueryRunnerTestHelper.java
	processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTest.java
2014-03-06 13:33:59 -08:00
Tugdual Saunier
ae38c92491 Fixed segments SQL queries for PostgreSQL compatibility 2014-03-06 19:14:32 +00:00
Gian Merlino
70db460f97 Blocking Executors and maxPendingPersists, oh my!
- Execs.newBlockingSingleThreaded can now accept capacity = 0.
- Changed default maxPendingPersists from 2 to 0.
- Fixed serde of maxPendingPersists in RealtimeIndexTasks.
2014-03-05 10:55:12 -08:00
fjy
5db00afb37 clean up and default values 2014-03-04 14:38:27 -08:00
fjy
c4c4d80336 make local testing pass 2014-03-03 14:52:43 -08:00
fjy
46b9ac78e7 Merge branch 'master' into new-schema
Conflicts:
	indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java
	pom.xml
	publications/whitepaper/druid.pdf
	publications/whitepaper/druid.tex
2014-03-03 14:48:15 -08:00
fjy
bf2ddda897 unit tests passing after more refactoring 2014-02-27 15:21:09 -08:00
Yuval Oren
314e38a2c6 Fixed realtime index query serving failure due to incorrect treatment of DataSource 2014-02-26 22:36:27 -08:00
fjy
d57974d58b Merge pull request #407 from metamx/restore-task
Restore task
2014-02-26 19:18:58 -07:00
Tugdual Saunier
e40725d5f3 Added support for PostgreSQL on overlord nodes 2014-02-26 01:24:37 +01:00
Xavier Léauté
7dbafa5453 fix task id 2014-02-25 13:49:39 -08:00
Xavier Léauté
e2defe8bf1 update copyright date 2014-02-25 13:44:15 -08:00
Xavier Léauté
2f61035585 add restore task 2014-02-25 13:41:40 -08:00
fjy
5d2367f0fd unit tests pass at this point 2014-02-20 15:52:12 -08:00
fjy
20cac8c506 not compiling yet but close 2014-02-19 15:54:27 -08:00
fjy
4b7c76762d unit tests passingn at this point, finished rt port maybe 2014-02-18 15:14:38 -08:00
fjy
3979eb270c Revert "Revert "Merge branch 'determine-partitions-improvements'""
This reverts commit 189b3e2b9bc3c79da9c98b805df624f024109469.
2014-02-14 12:58:56 -08:00
fjy
a8c4362d72 rejiggering druid api 2014-02-14 12:57:52 -08:00
fjy
189b3e2b9b Revert "Merge branch 'determine-partitions-improvements'"
This reverts commit 7ad228ceb580f9ca757e91b019bd8931f710f87a, reversing
changes made to 9c55e2b7794d37cd8713bbc0465aaad23e23472d.
2014-02-14 12:47:34 -08:00
nishantmonu51
7ad228ceb5 Merge branch 'determine-partitions-improvements'
Conflicts:
	pom.xml
2014-02-12 10:51:26 +05:30
Gian Merlino
b9556e2e2e SimpleResourceManagementStrategy: Fix log/return 2014-02-07 10:02:45 -08:00
Gian Merlino
5ec634e498 SimpleResourceManagementStrategy: Scale up to minWorkerCount when increased 2014-02-06 13:20:09 -08:00
fjy
0f6af72ea4 Merge branch 'master' into new-schema 2014-02-06 12:46:13 -08:00