Commit Graph

520 Commits

Author SHA1 Message Date
fjy 67cafaa0b1 Merge branch 'master' into spatial 2013-04-26 17:56:18 -07:00
fjy 82a62e3ba0 bug fixes for spatial and groupby; threshold for groupby 2013-04-26 17:46:25 -07:00
cheddar 52ba60963e Screwed up the conflicts on rebasing. Fixorz orz orz 2013-04-26 19:25:23 -05:00
cheddar 74ff07ba3e Moar unit tests 2013-04-26 19:19:57 -05:00
cheddar 8768406069 1) Unit tests! 2013-04-26 19:19:57 -05:00
cheddar 046647c203 1) Make druid.zk.paths.base required
2) Unit tests for announcer and fix race condition with session death
2013-04-26 19:19:57 -05:00
cheddar 163a73bed1 More logging stuff 2013-04-26 19:19:57 -05:00
cheddar 19d80ccd9d Remove extraneous logs 2013-04-26 19:19:57 -05:00
cheddar 67ce1b6f26 1) Adjust all of the uses of zookeeper paths to be based on ZkPathsConfig 2013-04-26 19:19:56 -05:00
cheddar b6d72c0da4 1) Log when servers show up and when they load segments
2) Adjust nodes to publish to ZK as the last part of their initialization
2013-04-26 19:19:56 -05:00
cheddar 3e94204c44 1) Switch from com.netflix.curator to org.apache.curator 2013-04-26 19:19:55 -05:00
cheddar 9153cc94ac 1) Nicer logging
2) Announcer should actually delete its zk entries when it is told to unannounce something
3) Skip over complex columns that we don't have a proper deserializer for
2013-04-26 19:19:55 -05:00
cheddar b8ba9138ff 1) Fix bug with Master not starting up without an indexer specified
2) Fix bug with PotentiallyGzippedCompressionProvider only catching ZipExceptions and not IOException (java 6 throws IO, java 7 throws Zip)
3) Create DruidServerMetadata and use that instead of DruidServer to represent the current server
2013-04-26 19:19:55 -05:00
cheddar f71b941a1a 1) Refactor the announcement of segments to all exist inside the DataSegmentAnnouncer
2) Adjust the ExecutorNodes to expose the correct nodeType given the refactorings
2013-04-26 19:19:54 -05:00
cheddar 545b489093 1) Use PathChildrenCacheFactory to simplify creation of PathChildrenCache objects. 2013-04-26 19:19:53 -05:00
cheddar 57c31656d1 1) Eliminate PhoneBook 2013-04-26 19:19:53 -05:00
cheddar dde50a0d87 1) Remove references to zkclient
2) Eradicate zkclient from the poms!
2013-04-26 19:19:53 -05:00
cheddar 43d630c098 1) Replace InventoryManagers with Curator-based Inventory Managers
2) Replace ZkSegmentAnnouncer with CuratorSegmentAnnouncer
3) Adjust LoadQueuePeons to operate using Curator
4) Remove ZkPhoneBook

Things left to do:
1) Unit tests
2) Remove references to zkclient library
3) Remove references to PhoneBook interface
2013-04-26 19:19:23 -05:00
Gian Merlino f463b95256 Merger: Advertise event receivers through service discovery 2013-04-25 14:06:46 +03:00
xvrl e3c6bad117 add emitting request logger 2013-04-24 15:38:16 -07:00
fjy 7f43f37441 bug fixes 2013-04-23 18:06:41 -07:00
fjy 70937af7bd Merge branch 'master' of github.com:metamx/druid into spatial
Conflicts:
	server/src/main/java/com/metamx/druid/index/v1/IndexStorageAdapter.java
	server/src/main/java/com/metamx/druid/index/v1/QueryableIndexStorageAdapter.java
2013-04-23 11:40:44 -07:00
fjy f28abd4256 fix cache 2013-04-22 15:01:07 -07:00
Gian Merlino deefa870ec [maven-release-plugin] prepare for next development iteration 2013-04-19 17:15:07 -07:00
Gian Merlino 5ea1a77a45 [maven-release-plugin] prepare release druid-0.4.0 2013-04-19 17:15:00 -07:00
Gian Merlino 4c4d30cf66 Initialization: Set service discovery address equal to druid.host (without port if any) 2013-04-19 15:45:00 -07:00
Fangjin Yang 71269d7e88 somehow tests are passing 2013-04-17 17:13:24 -07:00
xvrl db2f3aa761 fix pom versions 2013-04-16 09:53:34 -07:00
Gian Merlino a166344297 [maven-release-plugin] prepare for next development iteration 2013-04-15 18:55:53 -07:00
Gian Merlino 21c2aa5793 [maven-release-plugin] prepare release druid-0.3.38 2013-04-15 18:55:46 -07:00
Gian Merlino d879c9a41e [maven-release-plugin] prepare for next development iteration 2013-04-15 18:17:42 -07:00
Gian Merlino c3d229df7f [maven-release-plugin] prepare release druid-0.3.37 2013-04-15 18:17:36 -07:00
Gian Merlino 128b873022 [maven-release-plugin] prepare for next development iteration 2013-04-15 16:43:53 -07:00
Gian Merlino eb80429177 [maven-release-plugin] prepare release druid-0.3.36 2013-04-15 16:43:47 -07:00
Gian Merlino beff15f8d4 [maven-release-plugin] prepare for next development iteration 2013-04-15 15:03:26 -07:00
Gian Merlino b71ae8ade3 [maven-release-plugin] prepare release druid-0.3.35 2013-04-15 15:03:20 -07:00
Eric Tschetter 55648c47a7 1) Adjust the GroupByQuery to also be able to merge results on the local node. Fixes #116
2) Make the GroupByQuery operate in a multi-threaded fashion by default (this is configurable via druid.query.groupBy.singleThreaded).  Fixes #96
3) Fix up some post aggregation computation stuff.  I believe #72 is fixed
4) Fix case sensitivity issue with post aggregations on GroupBy queries
2013-04-09 19:13:08 -07:00
cheddar a678f08b67 Merge pull request #118 from darxriggs/master
cleanup & refactoring
2013-04-09 18:56:59 -07:00
Fangjin Yang 6fe9707f96 [maven-release-plugin] prepare for next development iteration 2013-04-08 11:26:37 -07:00
Fangjin Yang f0ab28be90 [maven-release-plugin] prepare release druid-0.3.34 2013-04-08 11:26:32 -07:00
Fangjin Yang 120b822c18 Merge branch 'master' of github.com:metamx/druid
Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java
	server/src/main/java/com/metamx/druid/http/ComputeNode.java
2013-04-08 11:24:17 -07:00
Fangjin Yang 925c104dd2 update emitter version and fix some NPEs 2013-04-08 11:23:08 -07:00
René Scheibe 6c27cd2e8e cleanup - removed unused imports 2013-04-07 23:31:22 +02:00
René Scheibe a6dc29cf85 cleanup - removed extra empty lines
- there should not be any adjacent empty lines
2013-04-07 14:32:09 +02:00
René Scheibe 488b3ef8ff refactoring - made json type infos consistent for all query types 2013-04-07 14:32:09 +02:00
xvrl 6d5869d8e4 remove unused imports 2013-04-05 14:36:41 -07:00
xvrl 1d050245fa add argument checks to dim filters 2013-04-04 16:30:33 -07:00
Fangjin Yang 8b100248a8 [maven-release-plugin] prepare for next development iteration 2013-04-01 17:17:50 -07:00
Fangjin Yang bbb3991bc9 [maven-release-plugin] prepare release druid-0.3.33 2013-04-01 17:17:44 -07:00
Fangjin Yang e8c6936aca [maven-release-plugin] prepare for next development iteration 2013-04-01 14:28:43 -07:00
Fangjin Yang 1f342dc0f2 [maven-release-plugin] prepare release druid-0.3.32 2013-04-01 14:28:36 -07:00
Fangjin Yang 30465b5c26 [maven-release-plugin] prepare for next development iteration 2013-03-28 19:48:46 -07:00
Fangjin Yang 1515dddfe0 [maven-release-plugin] prepare release druid-0.3.31 2013-03-28 19:48:39 -07:00
Fangjin Yang f9e5a10c70 fix query problem 2013-03-28 19:47:01 -07:00
Fangjin Yang 04a46fb74f [maven-release-plugin] prepare for next development iteration 2013-03-28 19:21:14 -07:00
Fangjin Yang 36601ee3aa [maven-release-plugin] prepare release druid-0.3.30 2013-03-28 19:21:07 -07:00
Fangjin Yang 12e0dbce68 fix broker datasources path 2013-03-28 19:12:10 -07:00
Fangjin Yang 9e54e11827 [maven-release-plugin] prepare for next development iteration 2013-03-27 11:55:48 -07:00
Fangjin Yang 8fee044c68 [maven-release-plugin] prepare release druid-0.3.29 2013-03-27 11:55:38 -07:00
Fangjin Yang 5bdcc3613c fix inconsistent druid http paths + fix master console bugs 2013-03-27 10:40:44 -07:00
Fangjin Yang e785b87be0 [maven-release-plugin] prepare for next development iteration 2013-03-26 11:10:15 -07:00
Fangjin Yang a97287fa50 [maven-release-plugin] prepare release druid-0.3.28 2013-03-26 11:10:04 -07:00
Fangjin Yang efd57dcf38 [maven-release-plugin] prepare for next development iteration 2013-03-25 13:17:50 -07:00
Fangjin Yang 3d7a0ea2d3 [maven-release-plugin] prepare release druid-0.3.27 2013-03-25 13:17:43 -07:00
Fangjin Yang 082ea59cf1 Merge branch 'master' of github.com:metamx/druid 2013-03-25 13:11:20 -07:00
Fangjin Yang 0ab7c315dd more logging in CEQR to track down NPE 2013-03-25 13:11:02 -07:00
xvrl c420fe3b56 fix output timestamps in groupby queries with granularity "all". 2013-03-23 23:42:43 -07:00
Fangjin Yang e72695111c Merge branch 'master' of github.com:metamx/druid 2013-03-22 17:07:05 -07:00
Fangjin Yang 5eaaabce7f fix for concurrent modifications in druid server 2013-03-22 17:05:39 -07:00
Eric Tschetter 35cfd1f186 [maven-release-plugin] prepare for next development iteration 2013-03-21 13:14:20 -05:00
Eric Tschetter 3860710f11 [maven-release-plugin] prepare release druid-0.3.26 2013-03-21 13:14:14 -05:00
Eric Tschetter f47319f118 [maven-release-plugin] prepare for next development iteration 2013-03-18 17:09:01 -05:00
Eric Tschetter 1066144b43 [maven-release-plugin] prepare release druid-0.3.25 2013-03-18 17:08:56 -05:00
Eric Tschetter cba404a65d [maven-release-plugin] prepare for next development iteration 2013-03-18 13:02:40 -05:00
Eric Tschetter 29a0a7e6c6 [maven-release-plugin] prepare release druid-0.3.24 2013-03-18 13:02:33 -05:00
Fangjin Yang b9de751b32 [maven-release-plugin] prepare for next development iteration 2013-03-15 14:32:31 -07:00
Fangjin Yang 57655f19c4 [maven-release-plugin] prepare release druid-0.3.23 2013-03-15 14:32:24 -07:00
Eric Tschetter 7dacf952d6 [maven-release-plugin] prepare for next development iteration 2013-03-15 13:53:39 -05:00
Eric Tschetter ff017fe72a [maven-release-plugin] prepare release druid-0.3.22 2013-03-15 13:53:33 -05:00
Eric Tschetter a933438e4e 1) Fix bugs with VersionConverterTask
2) Fix bugs with NPEs on indexing
2013-03-15 13:48:55 -05:00
cheddar 2a94bd508d Merge pull request #104 from metamx/javascript-dimfilters
support for Javascript DimFilters
2013-03-14 11:47:55 -07:00
Eric Tschetter 2bd34f1454 [maven-release-plugin] prepare for next development iteration 2013-03-13 18:32:00 -05:00
Eric Tschetter b7960e202d [maven-release-plugin] prepare release druid-0.3.21 2013-03-13 18:31:55 -05:00
Eric Tschetter f1175389c4 [maven-release-plugin] prepare for next development iteration 2013-03-13 16:33:17 -05:00
Eric Tschetter 8aac482618 [maven-release-plugin] prepare release druid-0.3.20 2013-03-13 16:33:10 -05:00
Fangjin Yang a49d0c5e4c [maven-release-plugin] prepare for next development iteration 2013-03-11 17:20:16 -07:00
Fangjin Yang 97f828f6b1 [maven-release-plugin] prepare release druid-0.3.19 2013-03-11 17:20:09 -07:00
Eric Tschetter 1c3ef48f34 1) Adjust the Config stuff that WorkerSetupManager was using to be reusable
2) Use new ConfigManager to pull out a whitelist for the Master
2013-03-07 17:45:57 -06:00
Eric Tschetter 6864007c05 1) Remove Task parameter from other methods off of TaskToolbox that required it
2) Move getTaskDir() off of TaskConfig and onto TaskToolbox
3) Rename SegmentKiller interface to DataSegmentKiller
4) Change signature of "DataSegmentKiller.kill(Collection<DataSegment>) throws ServiceException" to just kill(DataSegment) throws SegmentLoadingException
5) Add various log messages
6) Update the version of the segment that has been converted
2013-03-07 17:44:06 -06:00
xvrl a79c9ec183 fix some issues with negative numbers 2013-03-07 14:10:58 -08:00
cheddar a3279541c6 Merge pull request #102 from metamx/cache-fixes
log but do not fail if memcached operations do not get queued in time
2013-03-07 13:36:51 -08:00
cheddar a1cd3c3905 Merge pull request #103 from metamx/request-logs
make request logs machine-readable
2013-03-07 13:35:48 -08:00
xvrl b0349a6518 move objectMapper into requestLogger 2013-03-07 11:31:36 -08:00
xvrl 1b51848a89 add cache errorCount 2013-03-07 10:38:41 -08:00
xvrl 21d648cc39 make request logs machine-readable 2013-03-06 22:33:39 -08:00
xvrl 2837309075 do not fail on exceptions when pulling from cache 2013-03-06 19:22:15 -08:00
xvrl 8f6c313561 log but do not fail if memcached operations do not get queued in time 2013-03-06 17:28:09 -08:00
xvrl 4cb3ca00bc support for javascript dimfilters 2013-03-06 09:59:53 -08:00
xvrl 614d7801a4 very simplistic error handling 2013-03-05 12:41:44 -08:00
xvrl 28fe206404 output tsv format + better command line 2013-03-05 11:48:47 -08:00
xvrl 035986b3bc keep track of queried fields 2013-03-05 11:45:51 -08:00
xvrl ae682d2cbb fix multiple toplevel dimfilters 2013-03-04 16:44:54 -08:00
xvrl d1c128bdbf more elaborate example 2013-03-04 16:44:54 -08:00
xvrl 88515ec59f add support for regex filter 2013-03-04 16:44:54 -08:00
xvrl f5e3ff9692 add support for `!=` operator and `in ('a','b',...) expressions 2013-03-04 16:44:54 -08:00
xvrl 6a40072d50 toy SQL runner 2013-03-04 16:44:54 -08:00
xvrl 4e765f6754 remove obsolete comments 2013-03-04 16:44:54 -08:00
xvrl aa3822454a add support for 'NOT' filter and comments 2013-03-04 16:44:53 -08:00
xvrl eae5db6f57 friendlier aggregator naming 2013-03-04 16:44:53 -08:00
xvrl 5d1af7d884 support aliasing 2013-03-04 16:44:53 -08:00
xvrl f8a118dd98 better number handling 2013-03-04 16:44:53 -08:00
xvrl 3f7bd7d1c0 add group by 2013-03-04 16:44:53 -08:00
xvrl b64118b168 minimal SQL support 2013-03-04 16:44:52 -08:00
Fangjin Yang 552b365194 [maven-release-plugin] prepare for next development iteration 2013-03-04 15:11:37 -08:00
Fangjin Yang fdb3911794 [maven-release-plugin] prepare release druid-0.3.18 2013-03-04 15:11:28 -08:00
Fangjin Yang 91f54a72ee fix broken UT 2013-03-04 15:09:55 -08:00
Fangjin Yang 6977fe03bd [maven-release-plugin] prepare for next development iteration 2013-03-04 13:08:26 -08:00
Fangjin Yang d4f4e41320 [maven-release-plugin] prepare release druid-0.3.16 2013-03-04 13:08:09 -08:00
Fangjin Yang ee38d096c7 [maven-release-plugin] prepare for next development iteration 2013-03-02 09:29:04 -08:00
Fangjin Yang a90d204ba2 [maven-release-plugin] prepare release druid-0.3.15 2013-03-02 09:28:51 -08:00
Fangjin Yang 879b2475d4 [maven-release-plugin] prepare for next development iteration 2013-03-01 19:53:13 -08:00
Fangjin Yang e3ba6efb80 [maven-release-plugin] prepare release druid-0.3.14 2013-03-01 19:53:07 -08:00
Fangjin Yang 7f6747194d [maven-release-plugin] prepare for next development iteration 2013-03-01 19:45:59 -08:00
Fangjin Yang 06a2a3a793 [maven-release-plugin] prepare release druid-0.3.13 2013-03-01 19:45:50 -08:00
Fangjin Yang e0700bb161 [maven-release-plugin] prepare for next development iteration 2013-03-01 19:28:34 -08:00
Fangjin Yang 38c8ffb552 [maven-release-plugin] prepare release druid-0.3.12 2013-03-01 19:28:28 -08:00
Fangjin Yang 49e61d00fd [maven-release-plugin] prepare for next development iteration 2013-03-01 19:05:46 -08:00
Fangjin Yang 7e316e3508 [maven-release-plugin] prepare release druid-0.3.11 2013-03-01 19:05:39 -08:00
Fangjin Yang e2b4163e31 [maven-release-plugin] prepare for next development iteration 2013-03-01 18:24:09 -08:00
Fangjin Yang 023199702e [maven-release-plugin] prepare release druid-0.3.10 2013-03-01 18:24:03 -08:00
Fangjin Yang a574da55ed fix broken UT 2013-03-01 18:22:30 -08:00
Gian Merlino 0092ad7efb [maven-release-plugin] prepare for next development iteration 2013-03-01 16:57:47 -08:00
Gian Merlino 03ff72b7e2 [maven-release-plugin] prepare release druid-0.3.8 2013-03-01 16:57:38 -08:00
Gian Merlino 998ed0a8de [maven-release-plugin] prepare for next development iteration 2013-03-01 14:43:20 -08:00
Gian Merlino 89d5ddf2f7 [maven-release-plugin] prepare release druid-0.3.7 2013-03-01 14:43:13 -08:00
Fangjin Yang 360c6a1df1 [maven-release-plugin] prepare for next development iteration 2013-03-01 13:55:07 -08:00
Fangjin Yang a43dc44ebb [maven-release-plugin] prepare release druid-0.3.6 2013-03-01 13:55:01 -08:00
Fangjin Yang 7f32629429 fix a bug with client info resource with guice 2013-03-01 13:53:27 -08:00
Fangjin Yang 3264a689f1 [maven-release-plugin] prepare for next development iteration 2013-03-01 11:43:23 -08:00
Fangjin Yang 334fffdef5 [maven-release-plugin] prepare release druid-0.3.5 2013-03-01 11:43:16 -08:00
Fangjin Yang fb87458056 cleaner code for dimension/metric exploration on broker 2013-03-01 11:41:28 -08:00
Gian Merlino 26dca5630f QueryServlet: Send alerts with remote address as "peer" instead of "host"
"host" is used by the emitter. Both end up being emitted, which can be confusing.
2013-03-01 06:59:25 -08:00
Fangjin Yang 2e1e1753d5 [maven-release-plugin] prepare for next development iteration 2013-02-26 15:15:54 -08:00
Fangjin Yang ab456cf3b1 [maven-release-plugin] prepare release druid-0.3.4 2013-02-26 15:15:36 -08:00
Gian Merlino d32a6284ce Merge branch 'task-stuff' into indexing_refactor
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/worker/config/WorkerConfig.java
2013-02-26 13:03:56 -08:00
Gian Merlino 3129e5451b Merge branch 'master' into task-stuff 2013-02-25 12:33:45 -08:00
Gian Merlino 9964e7dfe4 [maven-release-plugin] prepare for next development iteration 2013-02-25 12:24:24 -08:00
Gian Merlino 99c4f9446c [maven-release-plugin] prepare release druid-0.3.3 2013-02-25 12:24:15 -08:00
Gian Merlino 49700dffe9 Merge branch 'master' into task-stuff
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/TaskToolbox.java
	merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/IndexGeneratorTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/MergeTask.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
	merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java
2013-02-25 12:18:31 -08:00
Eric Tschetter e0f6df1a5c [maven-release-plugin] prepare for next development iteration 2013-02-21 20:39:50 -06:00
Eric Tschetter 846bc0e4f0 [maven-release-plugin] prepare release druid-0.3.2 2013-02-21 20:39:45 -06:00
Eric Tschetter 699aadd2b1 [maven-release-plugin] prepare for next development iteration 2013-02-21 15:50:01 -06:00
Eric Tschetter 606a2e4b01 [maven-release-plugin] prepare release druid-0.3.1 2013-02-21 15:49:55 -06:00
Gian Merlino 824e3c0eb2 [maven-release-plugin] prepare for next development iteration 2013-02-15 13:03:39 -08:00
Gian Merlino 6bbc992101 [maven-release-plugin] prepare release druid-0.3.0 2013-02-15 13:03:32 -08:00
Eric Tschetter 0d99cee3c3 1) Whitespace ftw! 2013-02-15 14:25:44 -06:00
xvrl 05d347c304 Merge remote-tracking branch 'origin/master' into speedup-timeboundary
Conflicts:
	client/pom.xml
	common/pom.xml
	druid-services/pom.xml
	examples/pom.xml
	examples/rand/pom.xml
	examples/twitter/pom.xml
	index-common/pom.xml
	indexer/pom.xml
	merger/pom.xml
	pom.xml
	realtime/pom.xml
	server/pom.xml
2013-02-15 11:25:47 -08:00
xvrl 780410446c even more simple 2013-02-15 11:19:13 -08:00
Gian Merlino 3fed8ee0ce [maven-release-plugin] prepare for next development iteration 2013-02-14 21:23:46 -08:00
Gian Merlino ba7df5b709 [maven-release-plugin] prepare release druid-0.2.9 2013-02-14 21:23:41 -08:00
Gian Merlino 152bf201ec [maven-release-plugin] prepare for next development iteration 2013-02-14 16:27:20 -08:00
Gian Merlino e56bc27f93 [maven-release-plugin] prepare release druid-0.2.8 2013-02-14 16:27:12 -08:00
Fangjin Yang ef768feeb1 new resource 2013-02-14 14:20:20 -08:00
Gian Merlino 18daa19fc9 Merge branch 'master' into task-stuff
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/TaskHolder.java
	merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java
	merger/src/main/java/com/metamx/druid/merger/common/task/AbstractTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/IndexDeterminePartitionsTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/IndexGeneratorTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/Task.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/MergerDBCoordinator.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskContext.java
	merger/src/main/java/com/metamx/druid/merger/worker/TaskMonitor.java
	merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
	merger/src/test/java/com/metamx/druid/merger/coordinator/TaskQueueTest.java
	server/src/main/java/com/metamx/druid/master/DruidMaster.java
2013-02-14 13:10:29 -08:00
xvrl 6998d604a2 fixes #80 2013-02-14 12:41:34 -08:00
xvrl 1b85eaad3e simplify query toolchest interface 2013-02-13 21:25:16 -08:00
Eric Tschetter c5b78e75cf 1) Move up to Jackson 2.1
2) Some bugs were fixed, but they ended up getting mixed in with the Jackson upgrade :(
2013-02-13 18:51:32 -08:00
Fangjin Yang 82f02a4fe4 Merge branch 'master' into indexing_refactor
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java
	merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/IndexDeterminePartitionsTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/Task.java
	merger/src/main/java/com/metamx/druid/merger/common/task/V8toV9UpgradeTask.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/MergerDBCoordinator.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
	merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
2013-02-13 16:34:14 -08:00
Eric Tschetter a0b159fed7 1) Move up to Jackson 2.1
2) Some bugs were fixed, but they ended up getting mixed in with the Jackson upgrade :(
2013-02-12 20:58:17 -06:00
xvrl 07b0b4611b bump up to 0.3.0 2013-02-12 09:52:21 -08:00
xvrl 68cd2e10a7 remove unnecessary segment grouping 2013-02-12 09:45:26 -08:00
xvrl 7ab2e0552a cleanup imports 2013-02-11 18:42:43 -08:00
xvrl d4009c8c1c refactor filterSegments to use `TimelineObjectHolder`s 2013-02-11 18:41:25 -08:00
xvrl 6b87ef2921 assume segment intervals have already been filtered based on query interval 2013-02-11 16:56:52 -08:00
xvrl e9f546c4ca add default implementations to QueryToolChest methods 2013-02-11 16:51:40 -08:00
xvrl e10025c841 filter out unneeded segments for TimeBoundary query 2013-02-11 13:21:37 -08:00
Fangjin Yang 69d0d98df6 t Merge branch 'master' into indexing_refactor 2013-02-11 12:37:20 -08:00
Fangjin Yang a9176e738a Merge branch 'master' into indexing_refactor 2013-02-11 12:36:49 -08:00
Eric Tschetter 6708029043 1) Remove class level comments auto-created by IntelliJ 2013-02-11 13:13:52 -06:00
cheddar 05168808c2 Merge pull request #77 from metacret/master
Adding LinearShardSpec and ACL on S3 object
2013-02-11 11:12:31 -08:00
Fangjin Yang e519f82e87 [maven-release-plugin] prepare for next development iteration 2013-02-11 10:58:51 -08:00
Fangjin Yang 73f7468a23 [maven-release-plugin] prepare release druid-0.2.7 2013-02-11 10:58:43 -08:00
Fangjin Yang 111df9a90e Merge branch 'master' into indexing_refactor
Conflicts:
	merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
	server/src/main/java/com/metamx/druid/master/DruidMaster.java
2013-02-07 10:35:32 -08:00
Fangjin Yang ec2b906fad [maven-release-plugin] prepare for next development iteration 2013-02-06 18:43:42 -08:00
Fangjin Yang 22d9607169 [maven-release-plugin] prepare release druid-0.2.6 2013-02-06 18:43:34 -08:00
Fangjin Yang e09c658352 [maven-release-plugin] prepare for next development iteration 2013-02-06 17:42:39 -08:00
Fangjin Yang 668353e895 [maven-release-plugin] prepare release druid-0.2.5 2013-02-06 17:42:33 -08:00
Fangjin Yang d023d219ae [maven-release-plugin] prepare for next development iteration 2013-02-06 16:54:21 -08:00
Fangjin Yang d0fdf4ccf0 [maven-release-plugin] prepare release druid-0.2.4 2013-02-06 16:54:16 -08:00
Fangjin Yang efd0dc0062 refactor scaling stuff 2013-02-06 11:09:49 -08:00
Jae Hyeon Bae 4f70bbc687 adding linear shard spec and ACL for s3 bucket 2013-02-04 10:27:09 -08:00
Eric Tschetter f4e843c8dc 1) Make BasePhoneBook not quite so zealous about throwing exceptions when things didn't line up exactly as it thought they should. 2013-02-03 11:02:38 -06:00
Eric Tschetter 34b4383934 1) Adjust DataSegment to have a binaryVersion field that indicates the expected binary version of the segment files
2) Eliminate race condition from RemoteTaskRunnerTest.testAlreadyExecutedTask()
2013-02-01 18:59:33 -06:00
xvrl 7ec3563e7b [maven-release-plugin] prepare for next development iteration 2013-02-01 16:25:42 -08:00
xvrl a239f62158 [maven-release-plugin] prepare release druid-0.2.3 2013-02-01 16:25:35 -08:00
xvrl 31743ed438 defaults + max memcached expiration is 30 days 2013-02-01 16:22:33 -08:00
Gian Merlino 9f73c1a428 Merge branch 'master' into task-stuff 2013-02-01 12:16:25 -08:00
xvrl 3aef020fe0 include actual key in value to detect improbable hash collisions 2013-01-31 15:54:52 -08:00
xvrl d5cf7cfdb3 remove references to 'broker' 2013-01-31 14:55:02 -08:00
xvrl 9179718db5 hash cache keys to stay under memcached limit of 250 characters 2013-01-31 14:53:50 -08:00