Remove some Internal* abstractions #8904
Closed
Conversation
This file contains 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
s1monw
added
v2.0.0-beta1
v1.5.0
>docs
|
Improves readability. +1 |
| @@ -552,7 +549,7 @@ private void applyNewOrUpdatedShards(final ClusterChangedEvent event) throws Ela | |||
| continue; | |||
| } | |||
|
|
|||
| InternalIndexShard indexShard = (InternalIndexShard) indexService.shard(shardId); | |||
| IndexShard indexShard = (IndexShard) indexService.shard(shardId); | |||
There was a problem hiding this comment.
The cast is useless now? (There are a couple of other places that have this unnecessary cast)
|
+1, thanks for doing this. |
|
Same here, +1! The change looks good to me, I was looking for some usages of componentSettings that would break due to package name changes, but I could not find any. I think there are just a couple of unnecessary casts that can be removed now that there is a single impl. |
|
+1, wonderful! |
s1monw
force-pushed
the
remove_internal_shard
branch
from
10802e0
to
57ffe75
Compare
|
removed unnecessary casts - I think it's ready - I wanna remove this soon since it's a large change |
We have lots of boilerplate code that is unnecessarily abstracting services ie InternalIndexShard and IndexShard or InternalIndexService and IndexService. It's enough to have concrete classes for these core classes.
s1monw
force-pushed
the
remove_internal_shard
branch
from
57ffe75
to
15cd3f1
Compare
| @@ -418,7 +407,7 @@ public synchronized void removeShard(int shardId, String reason, @Nullable final | |||
| // and close the shard so no operations are allowed to it | |||
| if (indexShard != null) { | |||
| try { | |||
| ((InternalIndexShard) indexShard).close(reason); | |||
| ((IndexShard) indexShard).close(reason); | |||
s1monw
added a commit
that referenced
this pull request
Dec 11, 2014
We have lots of boilerplate code that is unnecessarily abstracting services ie InternalIndexShard and IndexShard or InternalIndexService and IndexService. It's enough to have concrete classes for these core classes. Closes #8904 Conflicts: src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java src/main/java/org/elasticsearch/index/IndexService.java src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayService.java src/main/java/org/elasticsearch/index/gateway/local/LocalIndexShardGateway.java src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java src/main/java/org/elasticsearch/index/service/IndexService.java src/main/java/org/elasticsearch/index/shard/IndexShard.java src/main/java/org/elasticsearch/index/shard/service/IndexShard.java src/main/java/org/elasticsearch/index/termvectors/ShardTermVectorService.java src/main/java/org/elasticsearch/indices/InternalIndicesService.java src/test/java/org/elasticsearch/common/lucene/docset/DocIdSetsTests.java src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java src/test/java/org/elasticsearch/test/InternalTestCluster.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We have lots of boilerplate code that is unnecessarily abstracting
services ie InternalIndexShard and IndexShard or InternalIndexService and
IndexService. It's enough to have concrete classes for these core classes.