Commit Graph

1503 Commits

Author SHA1 Message Date
fjy 8138d96f9d [maven-release-plugin] prepare for next development iteration 2014-04-03 17:21:14 -07:00
fjy 4619e498c3 [maven-release-plugin] prepare release druid-0.6.82 2014-04-03 17:21:10 -07:00
fjy d9062d91fa fix endpoint bugs and more docs 2014-04-03 17:01:33 -07:00
fjy edba3ba40e [maven-release-plugin] prepare for next development iteration 2014-04-02 22:24:36 -07:00
fjy 0f0e525a75 [maven-release-plugin] prepare release druid-0.6.81 2014-04-02 22:24:32 -07:00
fjy b0bf08554a fix broken build 2014-04-02 22:22:42 -07:00
nishantmonu51 d6eebce998 Revert "Merge pull request #457 from metamx/stream-cache"
This reverts commit 5fae4d9abc, reversing
changes made to 43a0554179.
2014-04-03 10:38:43 +05:30
fjy 133c624f69 [maven-release-plugin] prepare for next development iteration 2014-04-02 21:33:10 -07:00
fjy 4e2ac3234c [maven-release-plugin] prepare release druid-0.6.79 2014-04-02 21:33:05 -07:00
fjy ea9f31bbe0 learn to math and prepare for next release 2014-04-02 21:31:17 -07:00
fjy 6bab22ef71 [maven-release-plugin] prepare for next development iteration 2014-04-02 21:08:18 -07:00
fjy 93e19b62e6 [maven-release-plugin] prepare release druid-0.6.78 2014-04-02 21:08:14 -07:00
fjy f185d215e1 fix jetty default thread pool size for jetty 9 and prepare for next release 2014-04-02 21:01:07 -07:00
fjy 6cd5a76983 [maven-release-plugin] prepare for next development iteration 2014-04-02 17:33:26 -07:00
fjy d1e7b98177 [maven-release-plugin] prepare release druid-0.6.77 2014-04-02 17:33:19 -07:00
fjy 7547e989f0 Merge pull request #456 from metamx/processing-threads-default
more sensible defaults
2014-04-02 18:25:43 -06:00
fjy 5fae4d9abc Merge pull request #457 from metamx/stream-cache
Populate cache without materializing results first
2014-04-02 18:07:36 -06:00
fjy 43a0554179 Merge pull request #455 from metamx/async
Asynchronous servlet for query forwarding
2014-04-02 18:05:49 -06:00
Xavier Léauté 458a873505 make test reflect the fact that resulting sequence is not consumed yet 2014-04-02 15:37:54 -07:00
Xavier Léauté ee34415470 populate cache without materializing results 2014-04-02 15:32:14 -07:00
Xavier Léauté f3cc316e66 create utiliy class for getMaxDirectMemory 2014-04-02 15:27:34 -07:00
fjy 85ffce25a6 fix code review comments 2014-04-02 14:56:00 -07:00
Xavier Léauté ee97fb98bc more sensible defaults for single core machines 2014-04-02 14:24:08 -07:00
fjy eaec0e3ab2 cleanup 2014-04-01 17:56:25 -07:00
fjy 6952eb7878 asynch servlet for query forwarding 2014-04-01 17:51:28 -07:00
Xavier Léauté 74c5d9889b [maven-release-plugin] prepare for next development iteration 2014-03-31 16:07:31 -07:00
Xavier Léauté 0845cc4078 [maven-release-plugin] prepare release druid-0.6.76 2014-03-31 16:07:25 -07:00
fjy 50b6888210 Merge pull request #450 from metamx/fix-cache-population
Fix cache population
2014-03-31 12:26:37 -06:00
nishantmonu51 05f3f7d49e review comments - remove instance of check 2014-03-29 03:06:53 +05:30
fjy c5fbb67d94 more endpoint cleanup 2014-03-28 14:31:30 -07:00
fjy 676671e575 new endpoints 2014-03-28 13:55:44 -07:00
nishantmonu51 af470223f1 add test 2014-03-28 22:39:29 +05:30
nishantmonu51 ccf72bfdf8 Fix cache population simple way 2014-03-28 14:14:46 +05:30
fjy 652506d1bd [maven-release-plugin] prepare for next development iteration 2014-03-27 18:03:55 -07:00
fjy 7fa62cd9c7 [maven-release-plugin] prepare release druid-0.6.75 2014-03-27 18:03:51 -07:00
fjy 21e54d8060 rename var to be less confusing 2014-03-27 15:48:37 -07:00
fjy bc4bc277f2 Merge pull request #447 from metamx/fix-configmanager
Move db specific things from ConfigManager into DbConnector
2014-03-27 16:47:03 -06:00
fjy 366872ffe9 Merge pull request #446 from liquidm/add_druiddirectclient_logging
add url logging to DirectDruidClient for debugging purposes
2014-03-27 16:41:03 -06:00
Xavier Léauté 6e18ff7ed4 use prepared statement instead of string interpolation 2014-03-27 12:41:30 -07:00
Hagen Rother d6f4cf3733 add changes as suggested by cheddar 2014-03-27 19:46:53 +01:00
Hagen Rother 6fb3e61a98 add url logging to DirectDruidClient for debugging purposes 2014-03-27 19:38:53 +01:00
fjy 7e54c6a359 [maven-release-plugin] prepare for next development iteration 2014-03-25 13:43:25 -07:00
fjy 0baf95098d [maven-release-plugin] prepare release druid-0.6.74 2014-03-25 13:43:21 -07:00
nishantmonu51 3ba67946a3 review comments - remove unused import and extract out constants 2014-03-25 23:03:13 +05:30
nishantmonu51 fe7a184096 review comments 2014-03-25 17:02:36 +05:30
nishantmonu51 0ba72ffb2b merge from master 2014-03-25 15:43:05 +05:30
nishantmonu51 1c5d2b6dc5 review comments 2014-03-25 13:27:30 +05:30
nishantmonu51 6a34c09e05 Merge branch 'master' into compute-populate-cache 2014-03-25 13:23:00 +05:30
fjy 60c204afeb Merge pull request #433 from metamx/router-node
Client-side tier-aware query runner
2014-03-24 16:17:59 -06:00
fjy 75ec8bed9a address code review comments 2014-03-24 14:53:30 -07:00
fjy fcd7522596 Merge branch 'master' into router-node 2014-03-24 13:43:52 -07:00
fjy b0790783b7 Merge pull request #436 from metamx/better-context
Extend context to able to take more sophisticated objects than just strings
2014-03-24 14:40:45 -06:00
fjy de83677165 more logging at initialization 2014-03-24 13:40:04 -07:00
fjy e523bfc237 [maven-release-plugin] prepare for next development iteration 2014-03-21 11:07:40 -07:00
fjy 6fbc3b15a7 [maven-release-plugin] prepare release druid-0.6.73 2014-03-21 11:07:34 -07:00
fjy 7f8211ecc7 extend context to use map string object instead of map string string 2014-03-20 13:41:45 -07:00
nishantmonu51 69e9b7a6c5 merge changes from master 2014-03-20 20:23:58 +05:30
nishantmonu51 9079a17df0 Add headers 2014-03-20 19:44:36 +05:30
fjy a96dfc7742 clean up failure scenarios 2014-03-19 10:30:52 -07:00
fjy 76ef9d192c add tests 2014-03-18 13:47:53 -07:00
fjy ab2524ba0a add router node 2014-03-18 13:44:29 -07:00
fjy 03851101f0 [maven-release-plugin] prepare for next development iteration 2014-03-18 08:12:51 -07:00
fjy 508d892ba1 [maven-release-plugin] prepare release druid-0.6.72 2014-03-18 08:12:44 -07:00
nishantmonu51 32ad26210d Fix backwards compatibilty constant post aggregator 2014-03-18 20:34:49 +05:30
fjy 294f15d624 [maven-release-plugin] prepare for next development iteration 2014-03-17 21:44:17 -07:00
fjy 199efa049a [maven-release-plugin] prepare release druid-0.6.71 2014-03-17 21:44:11 -07:00
fjy 1d1ec1d855 clean up some defaults and prepare for next release 2014-03-17 21:41:34 -07:00
Xavier Léauté b9fe12977e [maven-release-plugin] prepare for next development iteration 2014-03-17 13:57:10 -07:00
Xavier Léauté 0276223db1 [maven-release-plugin] prepare release druid-0.6.70 2014-03-17 13:57:06 -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 468e8e0b31 Memcache changes 2014-03-17 18:54:30 +05:30
fjy 8e5cbca2ee [maven-release-plugin] prepare for next development iteration 2014-03-14 15:16:55 -07:00
fjy 852d167eaf [maven-release-plugin] prepare release druid-0.6.69 2014-03-14 15:16:50 -07:00
fjy f1da044cfa fix another breaking endpoint in druid coordinator 2014-03-14 15:15:08 -07:00
fjy 7a2d0850e3 [maven-release-plugin] prepare for next development iteration 2014-03-14 15:06:54 -07:00
fjy 2646b5421b [maven-release-plugin] prepare release druid-0.6.68 2014-03-14 15:06:50 -07:00
fjy f525361c3d fix broken tests and prepare for next release 2014-03-14 15:05:07 -07:00
fjy 454a240525 [maven-release-plugin] prepare for next development iteration 2014-03-14 10:59:27 -07:00
fjy 6e9bc9acab [maven-release-plugin] prepare release druid-0.6.66 2014-03-14 10:59:23 -07:00
fjy b4f1591260 clean up examples, finish paper 2014-03-13 18:52:08 -07:00
fjy a6fc82e267 Merge pull request #428 from metamx/fix-bytesboundedLinkedQueue
fix concurrency issues in bytesboundedlinkedqueue
2014-03-12 13:30:53 -06:00
nishantmonu51 f10ac73eef fix concurrency issues 2014-03-12 20:54:05 +05:30
Xavier Léauté b15b544429 make defaults more explicit 2014-03-11 12:39:08 -07:00
Xavier Léauté 44f9b9cec9 add readBufferSize option to memcached client config 2014-03-11 10:37:23 -07:00
Xavier Léauté 8baac724c3 add comments 2014-03-11 09:59:05 -07:00
Xavier Léauté b5d9876b77 allow disabling of memcached op-queue limit, default to disabled 2014-03-11 09:56:45 -07:00
fjy 34957ee471 [maven-release-plugin] prepare for next development iteration 2014-03-10 15:05:48 -07:00
fjy 35297572ed [maven-release-plugin] prepare release druid-0.6.65 2014-03-10 15:05:43 -07:00
fjy 369156fe80 [maven-release-plugin] prepare for next development iteration 2014-03-10 13:26:38 -07:00
fjy ba3806fcc2 [maven-release-plugin] prepare release druid-0.6.64 2014-03-10 13:26:34 -07:00
fjy 3ef75031c3 Merge pull request #423 from tucksaun/fix-kill-task-local-storage
Adds LocalDataSegmentKiller to allow KillTask for local storage
2014-03-07 13:45:39 -07:00
fjy 228cfa95bd Merge pull request #371 from N3TWORK/subquery
Subquery functionality for Group By queries
2014-03-07 13:41:56 -07:00
Tugdual Saunier 7dbcc74510 Adds LocalDataSegmentKiller to allow KillTask for local storage 2014-03-07 12:30:00 +00:00
Yuval Oren 5601c51ae6 finalize variables and optimize imports 2014-03-06 15:03:43 -08: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
fjy 00c5a708a2 [maven-release-plugin] prepare for next development iteration 2014-03-06 12:55:11 -08:00
fjy 9599832c58 [maven-release-plugin] prepare release druid-0.6.63 2014-03-06 12:55:06 -08:00
fjy 14a5149419 minor javascript problem 2014-03-06 12:43:28 -08:00
fjy e27b2fa7cb Merge branch 'master' of github.com:metamx/druid 2014-03-06 11:57:14 -08:00
fjy 1e9e61f786 fix some broken coordinator endpoints 2014-03-06 11:57:08 -08:00
fjy 1745aa744b Merge pull request #417 from metamx/fix-caching-bug
Fix caching bug and add CachingClusteredClient tests
2014-03-06 11:41:51 -07:00
Himadri Singh 625c78aae5 comments 2014-03-06 11:06:38 +05:30
Himadri Singh dc8ae1d20e revert 2014-03-06 10:46:48 +05:30
Himadri Singh d773a6ca24 One CostBalancerStrategy 2014-03-06 10:35:12 +05:30
Xavier Léauté 9fc5cca663 add disable populate / use cache tests 2014-03-05 14:07:15 -08:00
Xavier Léauté fffb58f6e8 add CachingClusteredClient tests 2014-03-05 14:07:15 -08:00
Xavier Léauté 427014d0a0 cosmetics 2014-03-05 14:07:15 -08:00
Xavier Léauté 5b4c04510f fix populateCache flag not working 2014-03-05 14:07:15 -08: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
nishantmonu51 40aa6ecaef fix npe queryID 2014-03-01 04:32:27 +05:30
nishantmonu51 e54949ca98 make queryIDProvider a singleton 2014-02-28 12:19:07 +05:30
fjy bf2ddda897 unit tests passing after more refactoring 2014-02-27 15:21:09 -08:00
fjy 37a79dd4cb [maven-release-plugin] prepare for next development iteration 2014-02-27 11:52:40 -08:00
fjy 8cdd0e3d53 [maven-release-plugin] prepare release druid-0.6.62 2014-02-27 11:52:35 -08:00
fjy bddf7b2908 fix naming problems 2014-02-27 11:50:51 -08:00
fjy 9502212b12 Merge pull request #403 from metamx/Query_id-for-metrics
add queryID to query context and request_logs
2014-02-27 12:44:05 -07:00
nishantmonu51 0701b1534d review comments queryID changes, add wait time for realtime node queries 2014-02-27 14:39:25 +05:30
fjy d57974d58b Merge pull request #407 from metamx/restore-task
Restore task
2014-02-26 19:18:58 -07:00
fjy 3d850aa260 Merge pull request #400 from tucksaun/feat-postgresql-support
Improving PostgreSQL support
2014-02-26 09:57:50 -07:00
Xavier Léauté 2f61035585 add restore task 2014-02-25 13:41:40 -08:00
nishantmonu51 b480d8f543 review comments 2014-02-25 03:09:44 +05:30
fjy 246ada63c5 fix interval load rule 2014-02-24 12:55:20 -08:00
nishantmonu51 373501a06d add queryID to query context and request_logs 2014-02-24 16:11:33 +05:30
fjy 7b0b90a860 Merge branch 'master' of github.com:metamx/druid into new-schema 2014-02-20 16:12:31 -08:00
fjy 5d2367f0fd unit tests pass at this point 2014-02-20 15:52:12 -08:00
fjy ef6208d192 Merge pull request #390 from metamx/bard-oome-fix
APP-2782 Bard oome fix
2014-02-19 19:52:56 -07:00
fjy 20cac8c506 not compiling yet but close 2014-02-19 15:54:27 -08:00
Himadri Singh a049188d23 minor changes from review 2014-02-19 09:13:47 +05:30
fjy 4b7c76762d unit tests passingn at this point, finished rt port maybe 2014-02-18 15:14:38 -08:00
Tugdual Saunier 4b67dbff5f Optimize DbSegmentPublisher.publishSegment 2014-02-17 18:11:15 +00:00
Tugdual Saunier 4dce007577 Use DbConnector.isPostgreSQL everywhere we used getDatabaseProductName before 2014-02-17 18:11:15 +00:00
Himadri Singh 5d729570c1 millis converted. 2014-02-17 15:00:58 +05:30
Himadri Singh 9b6fe2d003 Removed CostBalancerStrategy, made default = 1 thread 2014-02-17 14:57:05 +05:30
Himadri Singh bec264bdf7 Dynamic Config 2014-02-17 14:25:40 +05:30
fjy c57cf6ab4d [maven-release-plugin] prepare for next development iteration 2014-02-14 15:24:15 -08:00
fjy 44755cc91c [maven-release-plugin] prepare release druid-0.6.61 2014-02-14 15:24:11 -08:00
fjy f5affb6b5a [maven-release-plugin] prepare for next development iteration 2014-02-14 15:09:30 -08:00
fjy 189376f495 [maven-release-plugin] prepare release druid-0.6.60 2014-02-14 15:09:26 -08:00
fjy ef648b85f5 fix broken priority queries 2014-02-14 15:05:30 -08:00
fjy 3979eb270c Revert "Revert "Merge branch 'determine-partitions-improvements'""
This reverts commit 189b3e2b9b.
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 7ad228ceb5, reversing
changes made to 9c55e2b779.
2014-02-14 12:47:34 -08:00
nishantmonu51 78eddc50ee add checks for elements larger than capacity and account for the size of element being added 2014-02-15 00:12:21 +05:30
Himadri Singh 5af414c93c configurable thread count 2014-02-14 13:09:24 +05:30
Xavier Léauté 4b902aed23 fix typo 2014-02-13 23:25:11 -08:00
Himadri Singh 7dae293b5f fixes to comments 2014-02-14 12:42:46 +05:30
Himadri Singh 6e0590f97b Test udpate 2014-02-13 19:10:08 +05:30
Himadri Singh c2604657ed Extracted common methods 2014-02-13 19:04:54 +05:30
Himadri Singh a8d8d1ea06 Costbalancer Multithread 2014-02-13 18:58:45 +05:30
fjy 82fd35726f [maven-release-plugin] prepare for next development iteration 2014-02-12 20:03:00 -08:00
fjy cc1b91636f [maven-release-plugin] prepare release druid-0.6.59 2014-02-12 20:02:55 -08:00
fjy a986166b9c prepare for next release 2014-02-12 20:01:05 -08:00
fjy 60e950fad8 fix backwards compat issue with master 2014-02-12 20:00:43 -08:00
nishantmonu51 7ad228ceb5 Merge branch 'determine-partitions-improvements'
Conflicts:
	pom.xml
2014-02-12 10:51:26 +05:30
Hagen Rother b4eea282b6 consider errors in reading from firehose as unparsable 2014-02-11 16:00:13 +01:00
nishantmonu51 f8d8290a1e add newline at the end of file 2014-02-10 15:44:28 +05:30
nishantmonu51 ec2a32acfc review comments 2014-02-10 12:53:36 +05:30
Jae Hyeon Bae dca965a35a curator 2.4.0 and Announcer logging lines are added regarding infos of reinstating 2014-02-09 22:26:18 -08:00
fjy b7a78680b2 [maven-release-plugin] prepare for next development iteration 2014-02-07 13:06:23 -08:00
fjy cc6886646e [maven-release-plugin] prepare release druid-0.6.58 2014-02-07 13:06:18 -08:00
fjy 555f434fa6 [maven-release-plugin] prepare for next development iteration 2014-02-07 11:56:41 -08:00
fjy 371f2bb941 [maven-release-plugin] prepare release druid-0.6.57 2014-02-07 11:56:34 -08:00
nishantmonu51 dc097081a6 remove writeOpQueueFactory
for writeQueueFactory the buffer of the element is nulled by memcache
before remove is called, thus we are not able to determine the size of
element while removing, We can potentially work around this by adding a
wrapper to keep track of size but that will have its extra overhead,
Also verified from the heap dump that the growing queue was the queue
for opQueue.
2014-02-07 20:00:25 +05:30
nishantmonu51 db93e45bef minor fix 2014-02-07 17:52:52 +05:30
nishantmonu51 61d99bb8f2 change byte size config to long 2014-02-07 16:56:15 +05:30
nishantmonu51 d27274463b add separate putLock and takeLocks + test 2014-02-07 16:52:07 +05:30
Yuval Oren bd11309593 Merge branch 'master' into subquery 2014-02-06 15:36:29 -08:00
Xavier Léauté df0d81baa8 fix local cache byte counting on object removal 2014-02-06 14:28:14 -08:00
fjy 0f6af72ea4 Merge branch 'master' into new-schema 2014-02-06 12:46:13 -08:00
fjy af48273369 fix bug with dynamic configs in coordinator not working 2014-02-06 11:19:05 -08:00
nishantmonu51 7bbb6ba063 support for bounding operation queue by the byte size 2014-02-06 23:33:32 +05:30
nishantmonu51 aee574c772 review comments 2014-02-05 17:05:06 +05:30
fjy 056e82a516 [maven-release-plugin] prepare for next development iteration 2014-02-04 15:23:34 -08:00
fjy 0ea45b590f [maven-release-plugin] prepare release druid-0.6.56 2014-02-04 15:23:30 -08:00
fjy badc7b2e3f fix bug with load throttling and more tests 2014-02-04 15:21:45 -08:00
nishantmonu51 bacc72415f correct locking and partitionsSpec 2014-02-05 03:17:47 +05:30
fjy fc4cd79125 [maven-release-plugin] prepare for next development iteration 2014-02-03 16:47:50 -08:00
fjy 4d52e20fe1 [maven-release-plugin] prepare release druid-0.6.55 2014-02-03 16:47:46 -08:00
fjy 8b398533cb fix more bugs with determining what is assignable and what is not 2014-02-03 16:45:59 -08:00
fjy 46571ddf69 [maven-release-plugin] prepare for next development iteration 2014-02-03 16:35:02 -08:00
fjy cebb46a259 [maven-release-plugin] prepare release druid-0.6.54 2014-02-03 16:34:57 -08:00
fjy f4b6165307 fix bugs with finding indexing workers to assign 2014-02-03 16:33:06 -08:00
fjy d4eba49722 remove debug printing 2014-02-03 16:16:46 -08:00
Yuval Oren 689191c5ad Merge branch 'master' into subquery 2014-02-03 14:52:50 -08:00
fjy 14d0e54327 first commit 2014-02-03 14:15:03 -08:00
fjy 21d518e15c [maven-release-plugin] prepare for next development iteration 2014-01-31 16:32:25 -08:00
fjy 84f434d9f4 [maven-release-plugin] prepare release druid-0.6.53 2014-01-31 16:32:21 -08:00
fjy 019be5c3b0 update jquery 2014-01-31 12:37:37 -08:00
nishantmonu51 82b748ad43 review comments 2014-01-31 20:19:33 +05:30
nishantmonu51 7ca87d59df Determine partitions using cardinality 2014-01-31 00:49:11 +05:30
Yuval Oren e9cf935518 Fixed realtime querying after subquery changes 2014-01-27 18:58:25 -08:00
Yuval Oren 1c0b818cb2 Merge branch 'master' into subquery 2014-01-27 14:57:14 -08:00
fjy 7a116bf784 backwards compatibility fix for rules serde 2014-01-27 20:47:11 +08:00
nishantmonu51 7800dac7f7 backwards compatibility fix 2014-01-26 20:34:43 +08:00
fjy 158a725985 fix backwards compat issues 2014-01-26 20:07:09 +08:00
fjy 8ab0636f5c fix coord resource 2014-01-26 20:04:04 +08:00
Yuval Oren c99e468ccd Merge branch 'master' into subquery 2014-01-24 16:48:35 -08:00