Conversation
…ing. Things don't actually completely work yet.
…ing. Things don't actually completely work yet.
…up with just Guice
2) Switch all the DBI references to IDBI
2) Fix up modules based on exceptions at startup for MasterMain
Merge branch 'guice' of github.com:metamx/druid into guice Conflicts: client/src/main/java/com/metamx/druid/curator/discovery/DiscoveryModule.java client/src/main/java/com/metamx/druid/initialization/CuratorDiscoveryConfig.java client/src/main/java/com/metamx/druid/initialization/DruidNodeConfig.java client/src/main/java/com/metamx/druid/initialization/EmitterModule.java client/src/main/java/com/metamx/druid/initialization/HttpEmitterConfig.java client/src/main/java/com/metamx/druid/initialization/HttpEmitterModule.java client/src/main/java/com/metamx/druid/initialization/LogEmitterModule.java client/src/main/java/com/metamx/druid/initialization/ServiceDiscoveryConfig.java common/pom.xml common/src/main/java/com/metamx/druid/db/DbConnector.java common/src/main/java/com/metamx/druid/db/DbTablesConfig.java common/src/main/java/com/metamx/druid/guice/ConfigProvider.java common/src/main/java/com/metamx/druid/guice/DruidSecondaryModule.java common/src/main/java/com/metamx/druid/guice/JsonConfigProvider.java common/src/main/java/com/metamx/druid/guice/LifecycleModule.java common/src/main/java/com/metamx/druid/guice/LifecycleScope.java indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/TaskMasterLifecycle.java indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/http/IndexerCoordinatorNode.java indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java indexing-service/src/main/java/com/metamx/druid/indexing/worker/http/WorkerNode.java pom.xml server/src/main/java/com/metamx/druid/db/DatabaseRuleManager.java server/src/main/java/com/metamx/druid/db/DatabaseRuleManagerConfig.java server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java server/src/main/java/com/metamx/druid/db/DatabaseSegmentManagerConfig.java server/src/main/java/com/metamx/druid/guice/MasterModule.java server/src/main/java/com/metamx/druid/http/MasterMain.java server/src/main/java/com/metamx/druid/loading/cassandra/CassandraDataSegmentConfig.java server/src/main/java/com/metamx/druid/metrics/MetricsModule.java
…ackson cannot instantiate them
2) The service discovery stuff really needs to be reworked. It's unhappy now.
2) Move JacksonConfig stuff into its own module 3) Fix LogEmitterModule to inject properly with a Supplier<> 4) Set Guice to require explicit bindings, to protect from weirdness like was initially experienced with LoggingEmitterConfig 5) Master fires up and appears to all work with Guice! Whoot!
…notations 2) Changed ServiceAnnouncer to take a DruidNode object 3) Remove ServiceInstanceFactory interface and implementations 4) Add registrations to DiscoveryModule so that you can register nodes that should be announced on startup 5) Make the set of default Monitors configurable
… actually serve the static artifacts and the various resources of the Master
…verb to make it all happiness
…Doesn't work yet, but at least it builds.
…ath if it is renamed via a @JsonProperty annotation 2) JsonConfigurator now requires that fields be annotated with @JsonProperty. It will fail fast if they aren't.
…gs for the Historical nodes 2) Add GuiceInjectableValues that supports @JacksonInject resolution via Guice 3) Refactor RequestLogger stuff and setup polymorphic deserialization method of creating objects
…es and bind stuff. But OMFG, the compute node actually appears to be working! 2) The compute node works with Guice 3) The compute node fires up with Guice and appears to work 4) Did I mention that the compute node, now called historical node, fires up with Guice and appears to work?
Conflicts: client/src/main/java/com/metamx/druid/QueryableNode.java client/src/main/java/com/metamx/druid/client/ServerInventoryView.java client/src/main/java/com/metamx/druid/coordination/SingleDataSegmentAnnouncer.java client/src/main/java/com/metamx/druid/initialization/CuratorDiscoveryConfig.java client/src/main/java/com/metamx/druid/query/MetricsEmittingExecutorService.java indexing-hadoop/src/test/java/com/metamx/druid/indexer/HadoopDruidIndexerConfigTest.java indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolbox.java indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/http/IndexerCoordinatorNode.java indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java indexing-service/src/main/java/com/metamx/druid/indexing/worker/http/WorkerNode.java pom.xml server/src/main/java/com/metamx/druid/coordination/ServerManager.java server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java server/src/main/java/com/metamx/druid/db/DatabaseRuleManager.java server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java server/src/main/java/com/metamx/druid/http/ComputeNode.java server/src/main/java/com/metamx/druid/http/MasterMain.java server/src/main/java/com/metamx/druid/loading/SegmentLoaderConfig.java server/src/main/java/com/metamx/druid/loading/SingleSegmentLoader.java server/src/main/java/com/metamx/druid/master/DruidMaster.java
2) Setup the configuration glue for ServerInventoryViews and DataSegmentAnnouncer 3) Make processes run and work again!
… CliHistorical weren't working, they do now.
2) Extract ServerViewModule to handle various ServerView thingies 3) Extract QueryToolChestModule and QueryRunnerFactoryModule to reuse code for configuration of Query stuff 4) Extract QueryJettyServerInitializer to reuse between Historical and Broker nodes 5) Remove ClientMain, BrokerMain and BrokerNode
Rework tests in indexing service to be more unit testy
2) Move data_flow and segment propagation stuff to static.druid.io/docs/flow and remove from repository
…that can't start up
Working import, sans tables
Updated config to create tables.
Conflicts: client/pom.xml client/src/main/java/com/metamx/druid/query/segment/LegacySegmentSpec.java indexing-common/pom.xml indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolbox.java indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolboxFactory.java indexing-service/src/main/java/com/metamx/druid/indexing/common/task/RealtimeIndexTask.java indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskQueueTest.java realtime/src/main/java/com/metamx/druid/realtime/RealtimeNode.java realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcFirehoseFactory.java realtime/src/main/java/com/metamx/druid/realtime/firehose/WikipediaIrcDecoder.java realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java server/src/main/java/com/metamx/druid/BaseServerNode.java server/src/main/java/com/metamx/druid/http/ComputeNode.java server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapter.java server/src/main/java/com/metamx/druid/query/group/GroupByQueryEngine.java
…ex when some columns are null
jon-wei
added a commit
to jon-wei/druid
that referenced
this pull request
Nov 22, 2021
Revert "refactor sql lifecycle, druid planner, views, and view permissions (apache#10812)"
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
A whole slew of changes to introduce guice for object graph bootstrapping and modularization.
Lots of changes to configuration
Move documents into code repository