You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2020/06/06 22:15:59 UTC
[lucene-solr] branch branch_8x updated: SOLR-14480: Fix or suppress
warnings in solr/cloud/api
This is an automated email from the ASF dual-hosted git repository.
erick pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new f068309 SOLR-14480: Fix or suppress warnings in solr/cloud/api
f068309 is described below
commit f0683090797d3e0d3bb1799f2bdd3038f9114d79
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Sat Jun 6 18:07:05 2020 -0400
SOLR-14480: Fix or suppress warnings in solr/cloud/api
---
solr/CHANGES.txt | 2 ++
.../solr/cloud/api/collections/AddReplicaCmd.java | 7 ++---
.../solr/cloud/api/collections/AliasCmd.java | 1 +
.../apache/solr/cloud/api/collections/Assign.java | 9 +++++--
.../solr/cloud/api/collections/BackupCmd.java | 5 ++--
.../solr/cloud/api/collections/CreateAliasCmd.java | 2 +-
.../cloud/api/collections/CreateCollectionCmd.java | 4 ++-
.../solr/cloud/api/collections/CreateShardCmd.java | 1 +
.../cloud/api/collections/CreateSnapshotCmd.java | 6 ++++-
.../solr/cloud/api/collections/DeleteAliasCmd.java | 2 +-
.../cloud/api/collections/DeleteCollectionCmd.java | 3 ++-
.../solr/cloud/api/collections/DeleteNodeCmd.java | 7 +++--
.../cloud/api/collections/DeleteReplicaCmd.java | 10 ++++---
.../solr/cloud/api/collections/DeleteShardCmd.java | 5 +++-
.../cloud/api/collections/DeleteSnapshotCmd.java | 6 ++++-
.../api/collections/MaintainRoutedAliasCmd.java | 8 +++---
.../solr/cloud/api/collections/MigrateCmd.java | 5 ++--
.../solr/cloud/api/collections/MoveReplicaCmd.java | 16 ++++++++---
.../OverseerCollectionMessageHandler.java | 31 +++++++++++++---------
.../cloud/api/collections/OverseerRoleCmd.java | 6 ++---
.../cloud/api/collections/OverseerStatusCmd.java | 7 ++++-
.../api/collections/ReindexCollectionCmd.java | 8 +++++-
.../solr/cloud/api/collections/RenameCmd.java | 2 +-
.../solr/cloud/api/collections/ReplaceNodeCmd.java | 5 +++-
.../solr/cloud/api/collections/RestoreCmd.java | 2 +-
.../solr/cloud/api/collections/RoutedAlias.java | 8 +++---
.../cloud/api/collections/SetAliasPropCmd.java | 2 +-
.../solr/cloud/api/collections/SplitShardCmd.java | 5 ++--
.../solr/cloud/api/collections/UtilizeNodeCmd.java | 4 ++-
29 files changed, 121 insertions(+), 58 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 94e07ea..13a8883 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -225,6 +225,8 @@ Other Changes
* SOLR-14536: Fix or suppress warnings in apache/solr/common (Erick Erickson)
+* SOLR-14480: Fix or suppress warnings in solr/cloud/api (Erick Erickson)
+
================== 8.5.2 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.java
index e1cfe12..3e0332e 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.java
@@ -89,11 +89,12 @@ public class AddReplicaCmd implements OverseerCollectionMessageHandler.Cmd {
}
@Override
- public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
+ public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
addReplica(state, message, results, null);
}
- List<ZkNodeProps> addReplica(ClusterState clusterState, ZkNodeProps message, NamedList results, Runnable onComplete)
+ @SuppressWarnings({"unchecked"})
+ List<ZkNodeProps> addReplica(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results, Runnable onComplete)
throws IOException, InterruptedException, KeeperException {
if (log.isDebugEnabled()) {
log.debug("addReplica() : {}", Utils.toJSONString(message));
@@ -214,7 +215,7 @@ public class AddReplicaCmd implements OverseerCollectionMessageHandler.Cmd {
.collect(Collectors.toList());
}
- private ModifiableSolrParams getReplicaParams(ClusterState clusterState, ZkNodeProps message, NamedList results, String collectionName, DocCollection coll, boolean skipCreateReplicaInClusterState, String asyncId, ShardHandler shardHandler, CreateReplica createReplica) throws IOException, InterruptedException, KeeperException {
+ private ModifiableSolrParams getReplicaParams(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results, String collectionName, DocCollection coll, boolean skipCreateReplicaInClusterState, String asyncId, ShardHandler shardHandler, CreateReplica createReplica) throws IOException, InterruptedException, KeeperException {
if (coll.getStr(WITH_COLLECTION) != null) {
String withCollectionName = coll.getStr(WITH_COLLECTION);
DocCollection withCollection = clusterState.getCollection(withCollectionName);
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/AliasCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/AliasCmd.java
index 3afc805..611bd2d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/AliasCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/AliasCmd.java
@@ -53,6 +53,7 @@ abstract class AliasCmd implements OverseerCollectionMessageHandler.Cmd {
* Creates a collection (for use in a routed alias), waiting for it to be ready before returning.
* If the collection already exists then this is not an error.<p>
*/
+ @SuppressWarnings({"rawtypes"})
static NamedList createCollectionAndWait(ClusterState clusterState, String aliasName, Map<String, String> aliasMetadata,
String createCollName, OverseerCollectionMessageHandler ocmh) throws Exception {
// Map alias metadata starting with a prefix to a create-collection API request
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
index 6ff70f9..cfc401d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
@@ -277,6 +277,7 @@ public class Assign {
return usePolicyFramework(Optional.of(collection), cloudManager);
}
+ @SuppressWarnings({"unchecked"})
private static boolean usePolicyFramework(Optional<DocCollection> collection, SolrCloudManager cloudManager) throws IOException, InterruptedException {
boolean useLegacyAssignment = true;
Map<String, Object> clusterProperties = cloudManager.getClusterStateProvider().getClusterProperties();
@@ -323,13 +324,14 @@ public class Assign {
//
// Gets a list of candidate nodes to put the required replica(s) on. Throws errors if not enough replicas
// could be created on live nodes given maxShardsPerNode, Replication factor (if from createShard) etc.
+ @SuppressWarnings({"unchecked"})
public static List<ReplicaPosition> getNodesForNewReplicas(ClusterState clusterState, String collectionName,
String shard, int nrtReplicas, int tlogReplicas, int pullReplicas,
Object createNodeSet, SolrCloudManager cloudManager) throws IOException, InterruptedException, AssignmentException {
log.debug("getNodesForNewReplicas() shard: {} , nrtReplicas : {} , tlogReplicas: {} , pullReplicas: {} , createNodeSet {}"
, shard, nrtReplicas, tlogReplicas, pullReplicas, createNodeSet);
DocCollection coll = clusterState.getCollection(collectionName);
- Integer maxShardsPerNode = coll.getMaxShardsPerNode() == -1 ? Integer.MAX_VALUE : coll.getMaxShardsPerNode();
+ int maxShardsPerNode = coll.getMaxShardsPerNode() == -1 ? Integer.MAX_VALUE : coll.getMaxShardsPerNode();
List<String> createNodeList = null;
if (createNodeSet instanceof List) {
@@ -575,10 +577,11 @@ public class Assign {
public static class RulesBasedAssignStrategy implements AssignStrategy {
public List<Rule> rules;
+ @SuppressWarnings({"rawtypes"})
public List snitches;
public ClusterState clusterState;
- public RulesBasedAssignStrategy(List<Rule> rules, List snitches, ClusterState clusterState) {
+ public RulesBasedAssignStrategy(List<Rule> rules, @SuppressWarnings({"rawtypes"})List snitches, ClusterState clusterState) {
this.rules = rules;
this.snitches = snitches;
this.clusterState = clusterState;
@@ -648,8 +651,10 @@ public class Assign {
}
public AssignStrategy create(ClusterState clusterState, DocCollection collection) throws IOException, InterruptedException {
+ @SuppressWarnings({"unchecked", "rawtypes"})
List<Map> ruleMaps = (List<Map>) collection.get("rule");
String policyName = collection.getStr(POLICY);
+ @SuppressWarnings({"rawtypes"})
List snitches = (List) collection.get(SNITCH);
Strategy strategy = null;
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.java
index 5be9716..e873669 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.java
@@ -66,7 +66,7 @@ public class BackupCmd implements OverseerCollectionMessageHandler.Cmd {
}
@Override
- public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
+ public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
String extCollectionName = message.getStr(COLLECTION_PROP);
boolean followAliases = message.getBool(FOLLOW_ALIASES, false);
String collectionName;
@@ -165,7 +165,8 @@ public class BackupCmd implements OverseerCollectionMessageHandler.Cmd {
return r.get();
}
- private void copyIndexFiles(URI backupPath, String collectionName, ZkNodeProps request, NamedList results) throws Exception {
+ @SuppressWarnings({"unchecked"})
+ private void copyIndexFiles(URI backupPath, String collectionName, ZkNodeProps request, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
String backupName = request.getStr(NAME);
String asyncId = request.getStr(ASYNC);
String repoName = request.getStr(CoreAdminParams.BACKUP_REPOSITORY);
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateAliasCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateAliasCmd.java
index fdadf77..9a9b0bb 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateAliasCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateAliasCmd.java
@@ -52,7 +52,7 @@ public class CreateAliasCmd extends AliasCmd {
}
@Override
- public void call(ClusterState state, ZkNodeProps message, NamedList results)
+ public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results)
throws Exception {
final String aliasName = message.getStr(CommonParams.NAME);
ZkStateReader zkStateReader = ocmh.zkStateReader;
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
index 182b66e..4f00253 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
@@ -103,7 +103,8 @@ public class CreateCollectionCmd implements OverseerCollectionMessageHandler.Cmd
}
@Override
- public void call(ClusterState clusterState, ZkNodeProps message, NamedList results) throws Exception {
+ @SuppressWarnings({"unchecked"})
+ public void call(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
if (ocmh.zkStateReader.aliasesManager != null) { // not a mock ZkStateReader
ocmh.zkStateReader.aliasesManager.update();
}
@@ -297,6 +298,7 @@ public class CreateCollectionCmd implements OverseerCollectionMessageHandler.Cmd
}
shardRequestTracker.processResponses(results, shardHandler, false, null, Collections.emptySet());
+ @SuppressWarnings({"rawtypes"})
boolean failure = results.get("failure") != null && ((SimpleOrderedMap)results.get("failure")).size() > 0;
if (failure) {
// Let's cleanup as we hit an exception
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateShardCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateShardCmd.java
index 023bc3c..989003a 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateShardCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateShardCmd.java
@@ -51,6 +51,7 @@ public class CreateShardCmd implements OverseerCollectionMessageHandler.Cmd {
}
@Override
+ @SuppressWarnings({"unchecked", "rawtypes"})
public void call(ClusterState clusterState, ZkNodeProps message, NamedList results) throws Exception {
String extCollectionName = message.getStr(COLLECTION_PROP);
String sliceName = message.getStr(SHARD_ID_PROP);
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateSnapshotCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateSnapshotCmd.java
index 1085c8a..a110952 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateSnapshotCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateSnapshotCmd.java
@@ -65,7 +65,8 @@ public class CreateSnapshotCmd implements OverseerCollectionMessageHandler.Cmd {
}
@Override
- public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
+ @SuppressWarnings({"unchecked"})
+ public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
String extCollectionName = message.getStr(COLLECTION_PROP);
boolean followAliases = message.getBool(FOLLOW_ALIASES, false);
@@ -92,6 +93,7 @@ public class CreateSnapshotCmd implements OverseerCollectionMessageHandler.Cmd {
SolrSnapshotManager.createCollectionLevelSnapshot(zkClient, collectionName, new CollectionSnapshotMetaData(commitName));
log.info("Created a ZK path to store snapshot information for collection={} with commitName={}", collectionName, commitName);
+ @SuppressWarnings({"rawtypes"})
NamedList shardRequestResults = new NamedList();
Map<String, Slice> shardByCoreName = new HashMap<>();
ShardHandler shardHandler = ocmh.shardHandlerFactory.getShardHandler(ocmh.overseer.getCoreContainer().getUpdateShardHandler().getDefaultHttpClient());
@@ -127,10 +129,12 @@ public class CreateSnapshotCmd implements OverseerCollectionMessageHandler.Cmd {
Set<String> failedShards = new HashSet<>();
shardRequestTracker.processResponses(shardRequestResults, shardHandler, false, null);
+ @SuppressWarnings({"rawtypes"})
NamedList success = (NamedList) shardRequestResults.get("success");
List<CoreSnapshotMetaData> replicas = new ArrayList<>();
if (success != null) {
for ( int i = 0 ; i < success.size() ; i++) {
+ @SuppressWarnings({"rawtypes"})
NamedList resp = (NamedList)success.getVal(i);
// Check if this core is the leader for the shard. The idea here is that during the backup
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteAliasCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteAliasCmd.java
index 6cc2eec..d071e91 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteAliasCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteAliasCmd.java
@@ -33,7 +33,7 @@ public class DeleteAliasCmd implements OverseerCollectionMessageHandler.Cmd {
}
@Override
- public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
+ public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
String aliasName = message.getStr(NAME);
ZkStateReader zkStateReader = ocmh.zkStateReader;
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteCollectionCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteCollectionCmd.java
index 648f5ba..70d8d2b 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteCollectionCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteCollectionCmd.java
@@ -69,7 +69,7 @@ public class DeleteCollectionCmd implements OverseerCollectionMessageHandler.Cmd
}
@Override
- public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
+ public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
Object o = message.get(MaintainRoutedAliasCmd.INVOKED_BY_ROUTED_ALIAS);
if (o != null) {
((Runnable)o).run(); // this will ensure the collection is removed from the alias before it disappears.
@@ -132,6 +132,7 @@ public class DeleteCollectionCmd implements OverseerCollectionMessageHandler.Cmd
okayExceptions.add(NonExistentCoreException.class.getName());
ZkNodeProps internalMsg = message.plus(NAME, collection);
+ @SuppressWarnings({"unchecked"})
List<Replica> failedReplicas = ocmh.collectionCmd(internalMsg, params, results, null, asyncId, okayExceptions);
for (Replica failedReplica : failedReplicas) {
boolean isSharedFS = failedReplica.getBool(ZkStateReader.SHARED_STORAGE_PROP, false) && failedReplica.get("dataDir") != null;
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteNodeCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteNodeCmd.java
index 5f6e29c..19865d3 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteNodeCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteNodeCmd.java
@@ -51,7 +51,8 @@ public class DeleteNodeCmd implements OverseerCollectionMessageHandler.Cmd {
}
@Override
- public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
+ @SuppressWarnings({"unchecked"})
+ public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
ocmh.checkRequired(message, "node");
String node = message.getStr("node");
List<ZkNodeProps> sourceReplicas = ReplaceNodeCmd.getReplicasOfNode(node, state);
@@ -91,7 +92,8 @@ public class DeleteNodeCmd implements OverseerCollectionMessageHandler.Cmd {
return res;
}
- static void cleanupReplicas(NamedList results,
+ @SuppressWarnings({"unchecked"})
+ static void cleanupReplicas(@SuppressWarnings({"rawtypes"})NamedList results,
ClusterState clusterState,
List<ZkNodeProps> sourceReplicas,
OverseerCollectionMessageHandler ocmh,
@@ -103,6 +105,7 @@ public class DeleteNodeCmd implements OverseerCollectionMessageHandler.Cmd {
String shard = sourceReplica.getStr(SHARD_ID_PROP);
String type = sourceReplica.getStr(ZkStateReader.REPLICA_TYPE);
log.info("Deleting replica type={} for collection={} shard={} on node={}", type, coll, shard, node);
+ @SuppressWarnings({"rawtypes"})
NamedList deleteResult = new NamedList();
try {
if (async != null) sourceReplica = sourceReplica.plus(ASYNC, async);
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteReplicaCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteReplicaCmd.java
index fa7676a..c263203 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteReplicaCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteReplicaCmd.java
@@ -63,13 +63,13 @@ public class DeleteReplicaCmd implements Cmd {
@Override
@SuppressWarnings("unchecked")
- public void call(ClusterState clusterState, ZkNodeProps message, NamedList results) throws Exception {
+ public void call(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
deleteReplica(clusterState, message, results,null);
}
@SuppressWarnings("unchecked")
- void deleteReplica(ClusterState clusterState, ZkNodeProps message, NamedList results, Runnable onComplete)
+ void deleteReplica(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results, Runnable onComplete)
throws KeeperException, InterruptedException {
if (log.isDebugEnabled()) {
log.debug("deleteReplica() : {}", Utils.toJSONString(message));
@@ -112,9 +112,10 @@ public class DeleteReplicaCmd implements Cmd {
* Delete replicas based on count for a given collection. If a shard is passed, uses that
* else deletes given num replicas across all shards for the given collection.
*/
+ @SuppressWarnings({"unchecked"})
void deleteReplicaBasedOnCount(ClusterState clusterState,
ZkNodeProps message,
- NamedList results,
+ @SuppressWarnings({"rawtypes"})NamedList results,
Runnable onComplete,
boolean parallel)
throws KeeperException, InterruptedException {
@@ -211,7 +212,8 @@ public class DeleteReplicaCmd implements Cmd {
}
}
- void deleteCore(Slice slice, String collectionName, String replicaName,ZkNodeProps message, String shard, NamedList results, Runnable onComplete, boolean parallel) throws KeeperException, InterruptedException {
+ @SuppressWarnings({"unchecked"})
+ void deleteCore(Slice slice, String collectionName, String replicaName,ZkNodeProps message, String shard, @SuppressWarnings({"rawtypes"})NamedList results, Runnable onComplete, boolean parallel) throws KeeperException, InterruptedException {
Replica replica = slice.getReplica(replicaName);
if (replica == null) {
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteShardCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteShardCmd.java
index e6d1e6a..ff7edfa 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteShardCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteShardCmd.java
@@ -62,7 +62,8 @@ public class DeleteShardCmd implements OverseerCollectionMessageHandler.Cmd {
}
@Override
- public void call(ClusterState clusterState, ZkNodeProps message, NamedList results) throws Exception {
+ @SuppressWarnings({"unchecked"})
+ public void call(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
String extCollectionName = message.getStr(ZkStateReader.COLLECTION_PROP);
String sliceId = message.getStr(ZkStateReader.SHARD_ID_PROP);
@@ -109,6 +110,7 @@ public class DeleteShardCmd implements OverseerCollectionMessageHandler.Cmd {
if (log.isInfoEnabled()) {
log.info("Deleting replica for collection={} shard={} on node={}", replica.getStr(COLLECTION_PROP), replica.getStr(SHARD_ID_PROP), replica.getStr(CoreAdminParams.NODE));
}
+ @SuppressWarnings({"rawtypes"})
NamedList deleteResult = new NamedList();
try {
((DeleteReplicaCmd)ocmh.commandMap.get(DELETEREPLICA)).deleteReplica(clusterState, replica, deleteResult, () -> {
@@ -119,6 +121,7 @@ public class DeleteShardCmd implements OverseerCollectionMessageHandler.Cmd {
" on node=%s", replica.getStr(COLLECTION_PROP), replica.getStr(SHARD_ID_PROP), replica.getStr(NODE_NAME_PROP)));
}
}
+ @SuppressWarnings({"rawtypes"})
SimpleOrderedMap success = (SimpleOrderedMap) deleteResult.get("success");
if (success != null) {
synchronized (results) {
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.java
index 128a0cb..2f62139 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.java
@@ -63,7 +63,8 @@ public class DeleteSnapshotCmd implements OverseerCollectionMessageHandler.Cmd {
}
@Override
- public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
+ @SuppressWarnings({"unchecked"})
+ public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
String extCollectionName = message.getStr(COLLECTION_PROP);
boolean followAliases = message.getBool(FOLLOW_ALIASES, false);
String collectionName;
@@ -74,6 +75,7 @@ public class DeleteSnapshotCmd implements OverseerCollectionMessageHandler.Cmd {
}
String commitName = message.getStr(CoreAdminParams.COMMIT_NAME);
String asyncId = message.getStr(ASYNC);
+ @SuppressWarnings({"rawtypes"})
NamedList shardRequestResults = new NamedList();
ShardHandler shardHandler = ocmh.shardHandlerFactory.getShardHandler(ocmh.overseer.getCoreContainer().getUpdateShardHandler().getDefaultHttpClient());
SolrZkClient zkClient = ocmh.zkStateReader.getZkClient();
@@ -126,10 +128,12 @@ public class DeleteSnapshotCmd implements OverseerCollectionMessageHandler.Cmd {
}
shardRequestTracker.processResponses(shardRequestResults, shardHandler, false, null);
+ @SuppressWarnings({"rawtypes"})
NamedList success = (NamedList) shardRequestResults.get("success");
List<CoreSnapshotMetaData> replicas = new ArrayList<>();
if (success != null) {
for ( int i = 0 ; i < success.size() ; i++) {
+ @SuppressWarnings({"rawtypes"})
NamedList resp = (NamedList)success.getVal(i);
// Unfortunately async processing logic doesn't provide the "core" name automatically.
String coreName = (String)resp.get("core");
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/MaintainRoutedAliasCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/MaintainRoutedAliasCmd.java
index 2728b9aa..396b45b 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/MaintainRoutedAliasCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/MaintainRoutedAliasCmd.java
@@ -99,7 +99,7 @@ public class MaintainRoutedAliasCmd extends AliasCmd {
}
@Override
- public void call(ClusterState clusterState, ZkNodeProps message, NamedList results) throws Exception {
+ public void call(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
//---- PARSE PRIMARY MESSAGE PARAMS
// important that we use NAME for the alias as that is what the Overseer will get a lock on before calling us
final String aliasName = message.getStr(NAME);
@@ -162,7 +162,9 @@ public class MaintainRoutedAliasCmd extends AliasCmd {
}
}
- public void addTargetCollection(ClusterState clusterState, NamedList results, String aliasName, ZkStateReader.AliasesManager aliasesManager, Map<String, String> aliasMetadata, RoutedAlias.Action action) throws Exception {
+ @SuppressWarnings({"unchecked"})
+ public void addTargetCollection(ClusterState clusterState, @SuppressWarnings({"rawtypes"})NamedList results, String aliasName, ZkStateReader.AliasesManager aliasesManager, Map<String, String> aliasMetadata, RoutedAlias.Action action) throws Exception {
+ @SuppressWarnings({"rawtypes"})
NamedList createResults = createCollectionAndWait(clusterState, aliasName, aliasMetadata,
action.targetCollection, ocmh);
if (createResults != null) {
@@ -171,7 +173,7 @@ public class MaintainRoutedAliasCmd extends AliasCmd {
addCollectionToAlias(aliasName, aliasesManager, action.targetCollection);
}
- public void deleteTargetCollection(ClusterState clusterState, NamedList results, String aliasName, ZkStateReader.AliasesManager aliasesManager, RoutedAlias.Action action) throws Exception {
+ public void deleteTargetCollection(ClusterState clusterState, @SuppressWarnings({"rawtypes"})NamedList results, String aliasName, ZkStateReader.AliasesManager aliasesManager, RoutedAlias.Action action) throws Exception {
Map<String, Object> delProps = new HashMap<>();
delProps.put(INVOKED_BY_ROUTED_ALIAS,
(Runnable) () -> removeCollectionFromAlias(aliasName, aliasesManager, action.targetCollection));
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/MigrateCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/MigrateCmd.java
index 38e84e4..c41cb7f 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/MigrateCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/MigrateCmd.java
@@ -74,7 +74,7 @@ public class MigrateCmd implements OverseerCollectionMessageHandler.Cmd {
@Override
- public void call(ClusterState clusterState, ZkNodeProps message, NamedList results) throws Exception {
+ public void call(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
String extSourceCollectionName = message.getStr("collection");
String splitKey = message.getStr("split.key");
String extTargetCollectionName = message.getStr("target.collection");
@@ -136,10 +136,11 @@ public class MigrateCmd implements OverseerCollectionMessageHandler.Cmd {
}
}
+ @SuppressWarnings({"unchecked"})
private void migrateKey(ClusterState clusterState, DocCollection sourceCollection, Slice sourceSlice,
DocCollection targetCollection, Slice targetSlice,
String splitKey, int timeout,
- NamedList results, String asyncId, ZkNodeProps message) throws Exception {
+ @SuppressWarnings({"rawtypes"})NamedList results, String asyncId, ZkNodeProps message) throws Exception {
String tempSourceCollectionName = "split_" + sourceSlice.getName() + "_temp_" + targetSlice.getName();
ZkStateReader zkStateReader = ocmh.zkStateReader;
if (clusterState.hasCollection(tempSourceCollectionName)) {
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/MoveReplicaCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/MoveReplicaCmd.java
index bd4fb81..f567b2e 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/MoveReplicaCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/MoveReplicaCmd.java
@@ -66,11 +66,11 @@ public class MoveReplicaCmd implements OverseerCollectionMessageHandler.Cmd {
}
@Override
- public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
+ public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
moveReplica(ocmh.zkStateReader.getClusterState(), message, results);
}
- private void moveReplica(ClusterState clusterState, ZkNodeProps message, NamedList results) throws Exception {
+ private void moveReplica(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
if (log.isDebugEnabled()) {
log.debug("moveReplica() : {}", Utils.toJSONString(message));
}
@@ -166,7 +166,8 @@ public class MoveReplicaCmd implements OverseerCollectionMessageHandler.Cmd {
}
}
- private void moveHdfsReplica(ClusterState clusterState, NamedList results, String dataDir, String targetNode, String async,
+ @SuppressWarnings({"unchecked"})
+ private void moveHdfsReplica(ClusterState clusterState, @SuppressWarnings({"rawtypes"})NamedList results, String dataDir, String targetNode, String async,
DocCollection coll, Replica replica, Slice slice, int timeout, boolean waitForFinalState) throws Exception {
String skipCreateReplicaInClusterState = "true";
if (clusterState.getLiveNodes().contains(replica.getNodeName())) {
@@ -179,6 +180,7 @@ public class MoveReplicaCmd implements OverseerCollectionMessageHandler.Cmd {
removeReplicasProps.getProperties().put(CoreAdminParams.DELETE_DATA_DIR, false);
removeReplicasProps.getProperties().put(CoreAdminParams.DELETE_INDEX, false);
if (async != null) removeReplicasProps.getProperties().put(ASYNC, async);
+ @SuppressWarnings({"rawtypes"})
NamedList deleteResult = new NamedList();
try {
ocmh.deleteReplica(clusterState, removeReplicasProps, deleteResult, null);
@@ -224,6 +226,7 @@ public class MoveReplicaCmd implements OverseerCollectionMessageHandler.Cmd {
ZkStateReader.REPLICA_TYPE, replica.getType().name());
if(async!=null) addReplicasProps.getProperties().put(ASYNC, async);
+ @SuppressWarnings({"rawtypes"})
NamedList addResult = new NamedList();
try {
ocmh.addReplica(ocmh.zkStateReader.getClusterState(), addReplicasProps, addResult, null);
@@ -234,6 +237,7 @@ public class MoveReplicaCmd implements OverseerCollectionMessageHandler.Cmd {
results.add("failure", errorString);
log.warn("Error adding replica {} - trying to roll back...", addReplicasProps, e);
addReplicasProps = addReplicasProps.plus(CoreAdminParams.NODE, replica.getNodeName());
+ @SuppressWarnings({"rawtypes"})
NamedList rollback = new NamedList();
ocmh.addReplica(ocmh.zkStateReader.getClusterState(), addReplicasProps, rollback, null);
if (rollback.get("failure") != null) {
@@ -250,6 +254,7 @@ public class MoveReplicaCmd implements OverseerCollectionMessageHandler.Cmd {
log.debug("--- trying to roll back...");
// try to roll back
addReplicasProps = addReplicasProps.plus(CoreAdminParams.NODE, replica.getNodeName());
+ @SuppressWarnings({"rawtypes"})
NamedList rollback = new NamedList();
try {
ocmh.addReplica(ocmh.zkStateReader.getClusterState(), addReplicasProps, rollback, null);
@@ -269,7 +274,8 @@ public class MoveReplicaCmd implements OverseerCollectionMessageHandler.Cmd {
}
}
- private void moveNormalReplica(ClusterState clusterState, NamedList results, String targetNode, String async,
+ @SuppressWarnings({"unchecked"})
+ private void moveNormalReplica(ClusterState clusterState, @SuppressWarnings({"rawtypes"})NamedList results, String targetNode, String async,
DocCollection coll, Replica replica, Slice slice, int timeout, boolean waitForFinalState) throws Exception {
String newCoreName = Assign.buildSolrCoreName(ocmh.overseer.getSolrCloudManager().getDistribStateManager(), coll, slice.getName(), replica.getType());
ZkNodeProps addReplicasProps = new ZkNodeProps(
@@ -280,6 +286,7 @@ public class MoveReplicaCmd implements OverseerCollectionMessageHandler.Cmd {
ZkStateReader.REPLICA_TYPE, replica.getType().name());
if (async != null) addReplicasProps.getProperties().put(ASYNC, async);
+ @SuppressWarnings({"rawtypes"})
NamedList addResult = new NamedList();
SolrCloseableLatch countDownLatch = new SolrCloseableLatch(1, ocmh);
ActiveReplicaWatcher watcher = null;
@@ -325,6 +332,7 @@ public class MoveReplicaCmd implements OverseerCollectionMessageHandler.Cmd {
SHARD_ID_PROP, slice.getName(),
REPLICA_PROP, replica.getName());
if (async != null) removeReplicasProps.getProperties().put(ASYNC, async);
+ @SuppressWarnings({"rawtypes"})
NamedList deleteResult = new NamedList();
try {
ocmh.deleteReplica(clusterState, removeReplicasProps, deleteResult, null);
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java
index 6fe3463..94f1312 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java
@@ -255,6 +255,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler,
MDCLoggingContext.setReplica(message.getStr(REPLICA_PROP));
log.debug("OverseerCollectionMessageHandler.processMessage : {} , {}", operation, message);
+ @SuppressWarnings({"rawtypes"})
NamedList results = new NamedList();
try {
CollectionAction action = getCollectionAction(operation);
@@ -286,7 +287,8 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler,
}
@SuppressForbidden(reason = "Needs currentTimeMillis for mock requests")
- private void mockOperation(ClusterState state, ZkNodeProps message, NamedList results) throws InterruptedException {
+ @SuppressWarnings({"unchecked"})
+ private void mockOperation(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws InterruptedException {
//only for test purposes
Thread.sleep(message.getInt("sleep", 1));
if (log.isInfoEnabled()) {
@@ -303,7 +305,8 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler,
return action;
}
- private void reloadCollection(ClusterState clusterState, ZkNodeProps message, NamedList results) {
+ @SuppressWarnings({"unchecked"})
+ private void reloadCollection(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set(CoreAdminParams.ACTION, CoreAdminAction.RELOAD.toString());
@@ -312,7 +315,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler,
}
@SuppressWarnings("unchecked")
- private void processRebalanceLeaders(ClusterState clusterState, ZkNodeProps message, NamedList results)
+ private void processRebalanceLeaders(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results)
throws Exception {
checkRequired(message, COLLECTION_PROP, SHARD_ID_PROP, CORE_NAME_PROP, ELECTION_NODE_PROP,
CORE_NODE_NAME_PROP, BASE_URL_PROP, REJOIN_AT_HEAD_PROP);
@@ -341,7 +344,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler,
}
@SuppressWarnings("unchecked")
- private void processReplicaAddPropertyCommand(ClusterState clusterState, ZkNodeProps message, NamedList results)
+ private void processReplicaAddPropertyCommand(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results)
throws Exception {
checkRequired(message, COLLECTION_PROP, SHARD_ID_PROP, REPLICA_PROP, PROPERTY_PROP, PROPERTY_VALUE_PROP);
SolrZkClient zkClient = zkStateReader.getZkClient();
@@ -352,7 +355,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler,
overseer.offerStateUpdate(Utils.toJSON(m));
}
- private void processReplicaDeletePropertyCommand(ClusterState clusterState, ZkNodeProps message, NamedList results)
+ private void processReplicaDeletePropertyCommand(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results)
throws Exception {
checkRequired(message, COLLECTION_PROP, SHARD_ID_PROP, REPLICA_PROP, PROPERTY_PROP);
SolrZkClient zkClient = zkStateReader.getZkClient();
@@ -363,7 +366,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler,
overseer.offerStateUpdate(Utils.toJSON(m));
}
- private void balanceProperty(ClusterState clusterState, ZkNodeProps message, NamedList results) throws Exception {
+ private void balanceProperty(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
if (StringUtils.isBlank(message.getStr(COLLECTION_PROP)) || StringUtils.isBlank(message.getStr(PROPERTY_PROP))) {
throw new SolrException(ErrorCode.BAD_REQUEST,
"The '" + COLLECTION_PROP + "' and '" + PROPERTY_PROP +
@@ -409,7 +412,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler,
}
@SuppressWarnings("unchecked")
- void deleteReplica(ClusterState clusterState, ZkNodeProps message, NamedList results, Runnable onComplete)
+ void deleteReplica(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results, Runnable onComplete)
throws Exception {
((DeleteReplicaCmd) commandMap.get(DELETEREPLICA)).deleteReplica(clusterState, message, results, onComplete);
@@ -470,7 +473,8 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler,
//TODO should we not remove in the next release ?
- private void migrateStateFormat(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
+ @SuppressWarnings({"unchecked"})
+ private void migrateStateFormat(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
final String collectionName = message.getStr(COLLECTION_PROP);
boolean firstLoop = true;
@@ -498,7 +502,8 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler,
throw new SolrException(ErrorCode.SERVER_ERROR, "Could not migrate state format for collection: " + collectionName);
}
- void commit(NamedList results, String slice, Replica parentShardLeader) {
+ @SuppressWarnings({"unchecked"})
+ void commit(@SuppressWarnings({"rawtypes"})NamedList results, String slice, Replica parentShardLeader) {
log.debug("Calling soft commit to make sub shard updates visible");
String coreUrl = new ZkCoreNodeProps(parentShardLeader).getCoreUrl();
// HttpShardHandler is hard coded to send a QueryRequest hence we go direct
@@ -616,7 +621,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler,
}
- private void modifyCollection(ClusterState clusterState, ZkNodeProps message, NamedList results)
+ private void modifyCollection(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results)
throws Exception {
final String collectionName = message.getStr(ZkStateReader.COLLECTION_PROP);
@@ -668,7 +673,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler,
}
}
- void cleanupCollection(String collectionName, NamedList results) throws Exception {
+ void cleanupCollection(String collectionName, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
log.error("Cleaning up collection [{}].", collectionName);
Map<String, Object> props = makeMap(
Overseer.QUEUE_OPERATION, DELETE.toLower(),
@@ -707,7 +712,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler,
}
}
- List<ZkNodeProps> addReplica(ClusterState clusterState, ZkNodeProps message, NamedList results, Runnable onComplete)
+ List<ZkNodeProps> addReplica(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results, Runnable onComplete)
throws Exception {
return ((AddReplicaCmd) commandMap.get(ADDREPLICA)).addReplica(clusterState, message, results, onComplete);
@@ -939,7 +944,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler,
}
protected interface Cmd {
- void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception;
+ void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception;
}
/*
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerRoleCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerRoleCmd.java
index 16f9327..8b2ce92 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerRoleCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerRoleCmd.java
@@ -56,7 +56,7 @@ public class OverseerRoleCmd implements OverseerCollectionMessageHandler.Cmd {
}
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
ZkStateReader zkStateReader = ocmh.zkStateReader;
SolrZkClient zkClient = zkStateReader.getZkClient();
@@ -68,11 +68,11 @@ public class OverseerRoleCmd implements OverseerCollectionMessageHandler.Cmd {
if (nodeExists = zkClient.exists(ZkStateReader.ROLES, true)) {
roles = (Map) Utils.fromJSON(zkClient.getData(ZkStateReader.ROLES, null, new Stat(), true));
} else {
- roles = new LinkedHashMap(1);
+ roles = new LinkedHashMap<>(1);
}
List nodeList = (List) roles.get(roleName);
- if (nodeList == null) roles.put(roleName, nodeList = new ArrayList());
+ if (nodeList == null) roles.put(roleName, nodeList = new ArrayList<>());
if (ADDROLE == operation) {
log.info("Overseer role added to {}", node);
if (!nodeList.contains(node)) nodeList.add(node);
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerStatusCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerStatusCmd.java
index 6f0bbfd..7bc51c9 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerStatusCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerStatusCmd.java
@@ -46,7 +46,7 @@ public class OverseerStatusCmd implements OverseerCollectionMessageHandler.Cmd {
@Override
@SuppressWarnings("unchecked")
- public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
+ public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
ZkStateReader zkStateReader = ocmh.zkStateReader;
String leaderNode = OverseerTaskProcessor.getLeaderNode(zkStateReader.getZkClient());
results.add("leader", leaderNode);
@@ -60,10 +60,15 @@ public class OverseerStatusCmd implements OverseerCollectionMessageHandler.Cmd {
zkStateReader.getZkClient().getData("/overseer/collection-queue-work",null, stat, true);
results.add("overseer_collection_queue_size", stat.getNumChildren());
+ @SuppressWarnings({"rawtypes"})
NamedList overseerStats = new NamedList();
+ @SuppressWarnings({"rawtypes"})
NamedList collectionStats = new NamedList();
+ @SuppressWarnings({"rawtypes"})
NamedList stateUpdateQueueStats = new NamedList();
+ @SuppressWarnings({"rawtypes"})
NamedList workQueueStats = new NamedList();
+ @SuppressWarnings({"rawtypes"})
NamedList collectionQueueStats = new NamedList();
Stats stats = ocmh.stats;
for (Map.Entry<String, Stats.Stat> entry : stats.getStats().entrySet()) {
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java
index c291342..912834a 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java
@@ -169,7 +169,8 @@ public class ReindexCollectionCmd implements OverseerCollectionMessageHandler.Cm
}
@Override
- public void call(ClusterState clusterState, ZkNodeProps message, NamedList results) throws Exception {
+ @SuppressWarnings({"unchecked"})
+ public void call(ClusterState clusterState, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
log.debug("*** called: {}", message);
@@ -576,12 +577,14 @@ public class ReindexCollectionCmd implements OverseerCollectionMessageHandler.Cm
// XXX see #waitForDaemon() for why we need this
private String getDaemonUrl(SolrResponse rsp, DocCollection coll) {
+ @SuppressWarnings({"unchecked"})
Map<String, Object> rs = (Map<String, Object>) rsp.getResponse().get("result-set");
if (rs == null || rs.isEmpty()) {
if (log.isDebugEnabled()) {
log.debug(" -- Missing daemon information in response: {}", Utils.toJSONString(rsp));
}
}
+ @SuppressWarnings({"unchecked"})
List<Object> list = (List<Object>) rs.get("docs");
if (list == null) {
if (log.isDebugEnabled()) {
@@ -591,6 +594,7 @@ public class ReindexCollectionCmd implements OverseerCollectionMessageHandler.Cm
}
String replicaName = null;
for (Object o : list) {
+ @SuppressWarnings({"unchecked"})
Map<String, Object> map = (Map<String, Object>) o;
String op = (String) map.get("DaemonOp");
if (op == null) {
@@ -625,6 +629,7 @@ public class ReindexCollectionCmd implements OverseerCollectionMessageHandler.Cm
// XXX currently this is complicated to due a bug in the way the daemon 'list'
// XXX operation is implemented - see SOLR-13245. We need to query the actual
// XXX SolrCore where the daemon is running
+ @SuppressWarnings({"unchecked"})
private void waitForDaemon(String daemonName, String daemonUrl, String sourceCollection, String targetCollection, Map<String, Object> reindexingState) throws Exception {
HttpClient client = ocmh.overseer.getCoreContainer().getUpdateShardHandler().getDefaultHttpClient();
try (HttpSolrClient solrClient = new HttpSolrClient.Builder()
@@ -676,6 +681,7 @@ public class ReindexCollectionCmd implements OverseerCollectionMessageHandler.Cm
}
}
+ @SuppressWarnings({"unchecked"})
private void killDaemon(String daemonName, String daemonUrl) throws Exception {
log.debug("-- killing daemon {} at {}", daemonName, daemonUrl);
HttpClient client = ocmh.overseer.getCoreContainer().getUpdateShardHandler().getDefaultHttpClient();
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/RenameCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/RenameCmd.java
index 7296f6c..17aea8e 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/RenameCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/RenameCmd.java
@@ -44,7 +44,7 @@ public class RenameCmd implements OverseerCollectionMessageHandler.Cmd {
}
@Override
- public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
+ public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
String extCollectionName = message.getStr(CoreAdminParams.NAME);
String target = message.getStr(CollectionAdminParams.TARGET);
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/ReplaceNodeCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/ReplaceNodeCmd.java
index 9b80b71..f1c1f8c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/ReplaceNodeCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/ReplaceNodeCmd.java
@@ -62,7 +62,8 @@ public class ReplaceNodeCmd implements OverseerCollectionMessageHandler.Cmd {
}
@Override
- public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
+ @SuppressWarnings({"unchecked"})
+ public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
ZkStateReader zkStateReader = ocmh.zkStateReader;
String source = message.getStr(CollectionParams.SOURCE_NODE, message.getStr("source"));
String target = message.getStr(CollectionParams.TARGET_NODE, message.getStr("target"));
@@ -103,6 +104,7 @@ public class ReplaceNodeCmd implements OverseerCollectionMessageHandler.Cmd {
AtomicReference<PolicyHelper.SessionWrapper> sessionWrapperRef = new AtomicReference<>();
try {
for (ZkNodeProps sourceReplica : sourceReplicas) {
+ @SuppressWarnings({"rawtypes"})
NamedList nl = new NamedList();
String sourceCollection = sourceReplica.getStr(COLLECTION_PROP);
if (log.isInfoEnabled()) {
@@ -204,6 +206,7 @@ public class ReplaceNodeCmd implements OverseerCollectionMessageHandler.Cmd {
log.info("Failed to create some replicas. Cleaning up all replicas on target node");
SolrCloseableLatch cleanupLatch = new SolrCloseableLatch(createdReplicas.size(), ocmh);
for (ZkNodeProps createdReplica : createdReplicas) {
+ @SuppressWarnings({"rawtypes"})
NamedList deleteResult = new NamedList();
try {
ocmh.deleteReplica(zkStateReader.getClusterState(), createdReplica.plus("parallel", "true"), deleteResult, () -> {
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/RestoreCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/RestoreCmd.java
index 0e64e4b..f314ebb 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/RestoreCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/RestoreCmd.java
@@ -88,6 +88,7 @@ public class RestoreCmd implements OverseerCollectionMessageHandler.Cmd {
}
@Override
+ @SuppressWarnings({"unchecked", "rawtypes"})
public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
// TODO maybe we can inherit createCollection's options/code
@@ -182,7 +183,6 @@ public class RestoreCmd implements OverseerCollectionMessageHandler.Cmd {
propMap.put(CollectionAdminParams.COLL_CONF, restoreConfigName);
// router.*
- @SuppressWarnings("unchecked")
Map<String, Object> routerProps = (Map<String, Object>) backupCollectionState.getProperties().get(DocCollection.DOC_ROUTER);
for (Map.Entry<String, Object> pair : routerProps.entrySet()) {
propMap.put(DocCollection.DOC_ROUTER + "." + pair.getKey(), pair.getValue());
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAlias.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAlias.java
index 097048c..7b4efc6 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAlias.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAlias.java
@@ -106,10 +106,10 @@ public abstract class RoutedAlias {
// v2 api case - the v2 -> v1 mapping mechanisms can't handle this conversion because they expect
// strings or arrays of strings, not lists of objects.
if (props.containsKey("router.routerList")) {
- @SuppressWarnings("unchecked") // working around solrparams inability to express lists of objects
- HashMap tmp = new HashMap(props);
- @SuppressWarnings("unchecked") // working around solrparams inability to express lists of objects
- List<Map<String, Object>> v2RouterList = (List<Map<String, Object>>) tmp.get("router.routerList");
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ HashMap tmp = new HashMap(props);
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ List<Map<String, Object>> v2RouterList = (List<Map<String, Object>>) tmp.get("router.routerList");
Map<String, Object> o = v2RouterList.get(i);
for (Map.Entry<String, Object> entry : o.entrySet()) {
props.put(ROUTER_PREFIX + i + "." + entry.getKey(), String.valueOf(entry.getValue()));
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/SetAliasPropCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/SetAliasPropCmd.java
index fdee1d1..ea491f6 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/SetAliasPropCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/SetAliasPropCmd.java
@@ -47,7 +47,7 @@ public class SetAliasPropCmd implements Cmd {
}
@Override
- public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
+ public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
String aliasName = message.getStr(NAME);
final ZkStateReader.AliasesManager aliasesManager = messageHandler.zkStateReader.aliasesManager;
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java
index 29d9a03..2d04947 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java
@@ -98,10 +98,11 @@ public class SplitShardCmd implements OverseerCollectionMessageHandler.Cmd {
@SuppressWarnings("unchecked")
@Override
- public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
+ public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
split(state, message,(NamedList<Object>) results);
}
+ @SuppressWarnings({"rawtypes"})
public boolean split(ClusterState clusterState, ZkNodeProps message, NamedList<Object> results) throws Exception {
final String asyncId = message.getStr(ASYNC);
@@ -625,7 +626,7 @@ public class SplitShardCmd implements OverseerCollectionMessageHandler.Cmd {
* In case of async requests, the ShardRequestTracker's processResponses() does not
* abort on failure (as it should). Handling this here temporarily for now.
*/
- private void handleFailureOnAsyncRequest(NamedList results, String msgOnError) {
+ private void handleFailureOnAsyncRequest(@SuppressWarnings({"rawtypes"})NamedList results, String msgOnError) {
Object splitResultFailure = results.get("failure");
if (splitResultFailure != null) {
throw new SolrException(ErrorCode.SERVER_ERROR, msgOnError);
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/UtilizeNodeCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/UtilizeNodeCmd.java
index 53e5ea6..0fd19ac 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/UtilizeNodeCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/UtilizeNodeCmd.java
@@ -52,7 +52,7 @@ public class UtilizeNodeCmd implements OverseerCollectionMessageHandler.Cmd {
}
@Override
- public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
+ public void call(ClusterState state, ZkNodeProps message, @SuppressWarnings({"rawtypes"})NamedList results) throws Exception {
ocmh.checkRequired(message, NODE);
String nodeName = message.getStr(NODE);
String async = message.getStr(ASYNC);
@@ -94,6 +94,7 @@ public class UtilizeNodeCmd implements OverseerCollectionMessageHandler.Cmd {
for (; ; ) {
suggester = session.getSuggester(MOVEREPLICA)
.hint(Suggester.Hint.TARGET_NODE, nodeName);
+ @SuppressWarnings({"rawtypes"})
SolrRequest request = suggester.getSuggestion();
if (requests.size() > 10) {
log.info("too_many_suggestions");
@@ -125,6 +126,7 @@ public class UtilizeNodeCmd implements OverseerCollectionMessageHandler.Cmd {
private void executeAll(List<ZkNodeProps> requests) throws Exception {
if (requests.isEmpty()) return;
for (ZkNodeProps props : requests) {
+ @SuppressWarnings({"rawtypes"})
NamedList result = new NamedList();
ocmh.commandMap.get(MOVEREPLICA)
.call(ocmh.overseer.getSolrCloudManager().getClusterStateProvider().getClusterState(),