Commit Graph

4056 Commits

Author SHA1 Message Date
jisookim0513 74565c9371 cleaned up the code 2014-09-27 13:10:01 -07:00
jisookim0513 aa887edb73 added two seperate modules for mysql and postgres 2014-09-27 13:08:53 -07:00
jisookim0513 91bf8fadcf added MetadataSegmentManagerTest 2014-09-26 15:38:40 -07:00
jisookim0513 0436ae76a7 Merge branch 'druid-0.7.x' of github.com:metamx/druid into jisoo-metadata 2014-09-26 14:45:24 -07:00
jisookim0513 59b3e79c70 derby seems to be working..? 2014-09-26 14:36:17 -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 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
jisookim0513 a5d02b9030 second attempt to fix merge-conflicts 2014-09-24 15:59:00 -07:00
jisookim0513 3bf39cc9f8 attempted to fix merge-conflicts 2014-09-24 15:55:42 -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é 13ac7de882 update doc versions 2014-09-23 16:28:18 -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
fjy c042ce5b4b prep next rel 2014-09-23 16:10:12 -07:00
fjy d19723e186 Merge pull request #749 from metamx/background-segment-announcing
Parallelize segment loading + background announcing
2014-09-23 17:07:51 -06:00
Xavier Léauté 35fb210cfa add test for parallel loading 2014-09-23 16:06:46 -07:00
fjy bdea4f45ea fixes #733 2014-09-23 15:41:56 -07:00
Xavier Léauté 05d4f71ddc fix background annoucing race condition 2014-09-23 15:04:48 -07:00
fjy 0187c7f1c3 Merge pull request #748 from metamx/fix-columnschema-access
fix column selector on varying incr index schema
2014-09-23 11:25:46 -06:00
fjy 01bb7de3aa Merge pull request #756 from metamx/dimdim-comments
add some comments about string interning
2014-09-23 11:24:11 -06:00
Gian Merlino 43d1a7f36d Merge pull request #755 from metamx/update-java-util
update java-util
2014-09-23 09:47:57 -07:00
Xavier Léauté e6b3e37aeb update java-util 2014-09-23 09:36:21 -07:00
Xavier Léauté d7b39fa7ea add documentation 2014-09-23 09:30:40 -07:00
Xavier Léauté 12449481e3 parallelize segment loading 2014-09-22 16:33:25 -07:00
xvrl 5e0b6b9896 Merge pull request #746 from pdeva/master
segment metadata result explained better
2014-09-22 10:27:35 -07:00
fjy 323153a59f Merge pull request #753 from metamx/fix-compilation
upgrade druid-api
2014-09-22 11:25:15 -06:00
nishantmonu51 b38a9bc1c1 upgrade druid-api 2014-09-22 22:15:00 +05:30
jisookim0513 273205f217 initial attempt for abstraction; druid cluster works with Derby as a default 2014-09-19 17:39:59 -07:00
Xavier Léauté 815ebeee25 add docs for background segments loading 2014-09-18 12:09:20 -07:00
Xavier Léauté 32b6135f3d background announce segment cache 2014-09-18 12:09:20 -07:00
Xavier Léauté e5a13544a0 fix column selector on varying incr index schema 2014-09-17 10:36:05 -07:00
fjy a4777ede94 Merge pull request #747 from metamx/ingest-segment-npe-fix
fix NPE
2014-09-17 09:24:10 -06:00
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
pdeva d53ccf7ead segment metadata result explained better 2014-09-16 15:56:15 -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
fjy 4b5632008e Merge branch 'master' of github.com:metamx/druid 2014-09-16 15:18:34 -07:00
fjy fbeb57d261 prepare for next release 2014-09-16 15:18:27 -07:00
fjy 502964711f Merge pull request #745 from metamx/better-defaults
default zk compressed + batch announcements in 0.7
2014-09-16 16:14:18 -06: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 cada14586a fix tests 2014-09-16 14:16:49 -07:00
fjy 8b5c2fcd82 fix compile error 2014-09-16 14:10:02 -07:00
xvrl ff3163516f Merge pull request #744 from metamx/fix-select
fix select for non existant dimensions and metrics
2014-09-16 14:03:51 -07:00
fjy 9e0a2fd487 fix select for non existant dimensions and metrics 2014-09-16 14:01:21 -07:00