Skip to content

Druid version 0.6.0 #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fjy merged 107 commits into from
Sep 18, 2013
Merged

Druid version 0.6.0 #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
75a464a
1) Initial commit of conversion to using Guice modules for bootstrapp…
cheddar May 14, 2013
9df458a
1) Initial commit of conversion to using Guice modules for bootstrapp…
cheddar May 14, 2013
f68df7a
1) Make tests work and continue trying to make the DruidMaster start …
cheddar Jun 7, 2013
2f56c24
1) Inject IndexingServiceClient
cheddar Jun 8, 2013
06f7e7e
1) Fix DatabaseSegmentManager so that Unit Test passes
cheddar Jun 10, 2013
11ea15f
1) Introduce Jetty 8
cheddar Jun 17, 2013
149c2e3
1) A bunch more changes to make things actually run. Not quite done,…
cheddar Jun 21, 2013
e892d14
1) Configuration fixes, slowly gonna make the MasterMain actually sta…
cheddar Jul 9, 2013
d7f9b82
This conflict merge thing is really weird...
cheddar Jul 17, 2013
e885cb5
1) Switch CuratorDiscoveryConfig to not be an abstract class 'cause J…
cheddar Jul 18, 2013
85a3520
1) The Master compiles and runs with Guice bindings!!!!
cheddar Jul 19, 2013
02ffd80
1) Move DbConnector into its own module
cheddar Jul 23, 2013
6b9963b
1) Move the @Json and @Smile annotations to com.metamx.druid.guice.an…
cheddar Jul 26, 2013
9cd26c7
1) Adjust the JettyServerModule and other things such that Jetty will…
cheddar Jul 29, 2013
4c9be81
1) Pull try/catch check in the JettyServerInitializer out of the init…
cheddar Jul 29, 2013
2b587cb
1) Introduce airlift/airline for CLI stuff and add a Coordinator CLI …
cheddar Jul 29, 2013
97fb971
1) Start the journey of making the historical nodes work with Guice. …
cheddar Jul 30, 2013
9de2e5b
1) Adjust JsonConfigurator to be able to attach the proper property p…
cheddar Jul 31, 2013
f4fc8b2
1) A whole boondoggle of changes to Guicify the instantiation of thin…
cheddar Aug 1, 2013
019bb5d
1) Another whole bunch of changes to annotate things and create Modul…
cheddar Aug 1, 2013
9e78bb3
Merge branch 'master' into guice
cheddar Aug 1, 2013
2361e01
Make it all compile again...
cheddar Aug 2, 2013
f593b23
Remove unused boolean parameter
cheddar Aug 2, 2013
d66af76
1) Eliminate the need for SingleSegmentLoader
cheddar Aug 3, 2013
d64bc2f
1) Eliminate Old mains() that aren't needed anymore.
cheddar Aug 5, 2013
293c0e8
1) Clean up the servlet registration stuff, resource registrations on…
cheddar Aug 5, 2013
9f71d42
1) Broker works with Guice
cheddar Aug 6, 2013
c3ca9f5
1) Rename MemcachedCacheConfig back to what it should be
cheddar Aug 6, 2013
69f7831
1) Rename QueryToolChestModule because there was a case sensitivity i…
cheddar Aug 6, 2013
51f648e
1) Rename QueryToolChestModule back
cheddar Aug 6, 2013
eee1efd
Merge branch 'master' into guice
cheddar Aug 6, 2013
4a64ce3
Finish the merging, wtf IntelliJ?
cheddar Aug 6, 2013
85ee8bb
port realtime to guice
Aug 14, 2013
7ebe053
Fix bug with segment loader counting thingie
cheddar Aug 14, 2013
b95d949
add version information to status
xvrl Aug 21, 2013
d5b3f71
replace StatusServlet with StatusResource
xvrl Aug 21, 2013
3adcaab
Eric said I did too much work
xvrl Aug 21, 2013
8980a4a
Merge pull request #227 from metamx/version-in-status
cheddar Aug 21, 2013
3f51ef6
Merge branch 'guice' into guice-rt
Aug 22, 2013
6a8c160
update code according to code review
Aug 22, 2013
261ef7c
add some fixes
Aug 22, 2013
1aa99f5
Merge pull request #218 from metamx/guice-rt
cheddar Aug 22, 2013
b897c2c
1) IndexCoordinator appears to work as the CliOverlord now, yay!
cheddar Aug 23, 2013
613ebd5
1) Delete unused things
cheddar Aug 23, 2013
55dbda2
1) Worker appears to be running! It's also now known as the MiddleMa…
cheddar Aug 23, 2013
6636ef1
Remove unused files again
cheddar Aug 23, 2013
269997d
1) ExecutorNode is working, except for the running of the task. Need…
cheddar Aug 26, 2013
3617ac1
1) Eliminate ExecutorMain and have it run using the new Main!
cheddar Aug 27, 2013
5fa944d
Merge branch 'master' into guice
cheddar Aug 27, 2013
8097450
Some things that didn't get committed with the merge for some reason!?
cheddar Aug 27, 2013
ee1e73c
1) Make it compile again after the merge
cheddar Aug 27, 2013
fc60158
1) What is an .Rhistory file and why is it checked in? It's not! (an…
cheddar Aug 27, 2013
9c30ced
1) Move various "api" classes to io.druid packages and make sure thin…
cheddar Aug 28, 2013
bfe9673
1) Move various "api" classes to io.druid packages and make sure thin…
cheddar Aug 28, 2013
1f37e96
1) Delete the files that have moved to druid-api and get them through…
cheddar Aug 28, 2013
c02d887
1) Rewrite SearchQueryRunner to not require StorageAdapter to be "Sea…
cheddar Aug 28, 2013
15ec8e7
1) Remove the Searchable interface
cheddar Aug 28, 2013
5ad023c
Merge branch 'master' into guice
cheddar Aug 29, 2013
7834ffe
Make LinearShardSpec require a partitionNum
cheddar Aug 29, 2013
c5760f4
Whitespace!
cheddar Aug 29, 2013
2a46086
1) Didn't remove the io.druid files from client. Remove those and ma…
cheddar Aug 29, 2013
cb90ed0
Revert the previous commit. After going down this path, I realized t…
cheddar Aug 29, 2013
3c1b0a8
1) Make it compile after merging with master
cheddar Aug 29, 2013
ca2c56d
1) Remove PostAggregator and put it in druid-api
cheddar Aug 29, 2013
846b3c9
1) Spell better
cheddar Aug 29, 2013
2e26a4d
1) Add back segment-related interfaces and classes to new druid-segme…
cheddar Aug 29, 2013
56e2b95
OMG!!! A lot of stuff has been moved. Modules have been created and…
cheddar Aug 30, 2013
bd0756e
More stuff moved, things still compiling and tests still passing. Yay!
cheddar Aug 30, 2013
5ab6710
No more com.metamx.druid, it is now all io.druid!
cheddar Aug 31, 2013
3c39f90
1) Move Firehose interface and dependencies to druid-api
cheddar Aug 31, 2013
740c70e
1) It's good when unit tests actually pass...
cheddar Aug 31, 2013
dadd9bc
1) Rename MetricSelector(Factory) to ColumnSelector(Factory)
cheddar Sep 4, 2013
6c9a107
1) remove duplicate package initialization.initialization
cheddar Sep 9, 2013
3e4a4f5
1) Adjustments to allow for the addition of new Runnables via modules…
cheddar Sep 11, 2013
b8bd19e
whitespace
cheddar Sep 12, 2013
a2dcc45
1) Remove SingleSegmentLoader and replace with OmniSegmentLoader
cheddar Sep 12, 2013
2ea09e2
1) Clean up specification of StorageLocations
cheddar Sep 12, 2013
a001c1d
1) Remove TODO from ZkCoordinator. Always load the cache, 'cause I s…
cheddar Sep 12, 2013
044e43d
1) Remove last TODO related to segment lifetime. Don't think we care…
cheddar Sep 12, 2013
e0738b3
1) Add tool to convert properties from the old settings to the new ones.
cheddar Sep 12, 2013
f7c10e3
rework tests in indexing service to be more unit testy
Sep 12, 2013
ef1ac46
Merge pull request #237 from metamx/is-ut
cheddar Sep 13, 2013
66c2ea2
1) Move doc/publications to top-level publications directory.
cheddar Sep 13, 2013
73a87fe
Merge branch 'guice' of github.com:metamx/druid into guice
cheddar Sep 13, 2013
8b480e5
Add docs from github wiki
cheddar Sep 13, 2013
9b4c375
fix exception catching logic of moving segments
Sep 15, 2013
c06b37f
Won't serve html
rjurney Sep 16, 2013
248fba6
Added prepend tag to make pages display.
rjurney Sep 16, 2013
063a068
Converted links, sans space to slash
rjurney Sep 16, 2013
cabae79
port over multi threaded realtime and also fix broken realtime nodes …
Sep 16, 2013
946a9e5
Replaced spaces with dashes
rjurney Sep 16, 2013
6df3140
made layouts work
rjurney Sep 17, 2013
64f3821
throw exception for annotated members
Sep 17, 2013
48dea82
Merge pull request #240 from rjurney/guice
cheddar Sep 17, 2013
295426d
Updated config to create tables.
rjurney Sep 18, 2013
4557838
Merge pull request #241 from rjurney/guice
cheddar Sep 18, 2013
f7df951
broker needs to announce itself in service discovery
Sep 18, 2013
02b86a6
Merge branch 'guice' of github.com:metamx/druid into guice
Sep 18, 2013
e551afe
fix broken master console
Sep 18, 2013
949c52d
1) Remove snapshots
cheddar Sep 18, 2013
6bfe231
Merge branch 'master' into guice
cheddar Sep 18, 2013
dc728b5
Update versions of poms and make IncrementalIndexStorageAdapterTest c…
cheddar Sep 18, 2013
d61fe95
Fix RealtimePlumberSchool.setQueryExecutorService() to actually use i…
cheddar Sep 18, 2013
6150365
Reapply "fix regex and assign random user ids" from Xavier
cheddar Sep 18, 2013
e019ddd
Reapply Fix for NoSuchElementException that happens in IncrementalInd…
cheddar Sep 18, 2013
b3bfcb7
workaround for broker to plug in extensions
Sep 18, 2013
8d7af40
Merge branch 'guice' of github.com:metamx/druid into guice
Sep 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ target
.idea
.project
.settings/
examples/rand/RealtimeNode.out
examples/twitter/RealtimeNode.out
*.log
*.DS_Store
_site
243 changes: 0 additions & 243 deletions client/pom.xml
View file
Open in desktop

This file was deleted.

Loading