Skip to content
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

Jump to bottom

Refactor the indexing service to be able to better support realtime tasks #87

Merged
merged 11 commits into from
Feb 26, 2013
Merged

Refactor the indexing service to be able to better support realtime tasks #87

merged 11 commits into from
Feb 26, 2013

Commits on Feb 6, 2013

  1. refactor scaling stuff

    Fangjin Yang committed Feb 6, 2013
    Configuration menu
    Copy the full SHA
    efd0dc0 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2013

  1. 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
    Fangjin Yang committed Feb 7, 2013
    Configuration menu
    Copy the full SHA
    111df9a View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2013

  1. Merge branch 'master' into indexing_refactor

    Fangjin Yang committed Feb 11, 2013
    Configuration menu
    Copy the full SHA
    a9176e7 View commit details
    Browse the repository at this point in the history

  2. t Merge branch 'master' into indexing_refactor

    Fangjin Yang committed Feb 11, 2013
    Configuration menu
    Copy the full SHA
    69d0d98 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2013

  1. more refactoring and UT passing at this point

    Fangjin Yang committed Feb 12, 2013
    Configuration menu
    Copy the full SHA
    b27a459 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2013

  1. bug fixes for RTR

    Fangjin Yang committed Feb 13, 2013
    Configuration menu
    Copy the full SHA
    c7b4973 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2013

  1. cleanup

    Fangjin Yang committed Feb 14, 2013
    Configuration menu
    Copy the full SHA
    1963bfe View commit details
    Browse the repository at this point in the history

  2. 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
    Fangjin Yang committed Feb 14, 2013
    Configuration menu
    Copy the full SHA
    82f02a4 View commit details
    Browse the repository at this point in the history

  3. new resource

    Fangjin Yang committed Feb 14, 2013
    Configuration menu
    Copy the full SHA
    ef768fe View commit details
    Browse the repository at this point in the history

  4. Merge branch 'task-stuff' into indexing_refactor 

    Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java
	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/IndexDeterminePartitionsTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/KillTask.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/main/java/com/metamx/druid/merger/coordinator/TaskMasterLifecycle.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskQueue.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskRunner.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/TaskRunnerWorkQueue.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorServletModule.java
	merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
    Fangjin Yang committed Feb 14, 2013
    Configuration menu
    Copy the full SHA
    bf0d9c6 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2013

  1. Merge branch 'task-stuff' into indexing_refactor 

    Conflicts:
	merger/src/main/java/com/metamx/druid/merger/worker/config/WorkerConfig.java
    @gianm
    gianm committed Feb 26, 2013
    Configuration menu
    Copy the full SHA
    d32a628 View commit details
    Browse the repository at this point in the history