database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[Doris On ES][Bug-Fix] fix problem for selecting random be (#4972)

Browse Source 
1.  Random().nextInt() maybe return negative numeric value which would result in `java.lang.ArrayIndexOutOfBoundsException`, 
pass a positive numeric value would avoid this problem.

```
int seed = new Random().nextInt(Short.MAX_VALUE) % nodesInfo.size()
```

2.  EsNodeInfo[] nodeInfos = (EsNodeInfo[]) nodesInfo.values().toArray() maybe lead `java.lang.ClassCastException  in some JDK version : [Ljava.lang.Object; cannot be cast to [Lorg.apache.doris.external.elasticsearch.EsNodeInfo` , pass the original `Class Type` can resolve this.

```
EsNodeInfo[] nodeInfos = nodesInfo.values().toArray(new EsNodeInfo[0]);
```
This commit is contained in:
Yunfeng,Wu
2020-11-28 09:57:44 +08:00
committed by GitHub
parent 2331ce10f1
commit 2e9c8dda04
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsShardPartitions.java vendored
View File

@ -21,14 +21,14 @@ import org.apache.doris.analysis.SingleRangePartitionDesc;
import org.apache.doris.catalog.PartitionKey;
import org.apache.doris.thrift.TNetworkAddress;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.json.JSONArray;
import org.json.JSONObject;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.util.List;
import java.util.Map;
import java.util.Random;
@ -82,7 +82,8 @@ public class EsShardPartitions {
jsonObject.getJSONObject("nodes")));
} catch (Exception e) {
LOG.error("fetch index [{}] shard partitions failure", indexName, e);
throw new DorisEsException("fetch [" + indexName + "] shard partitions failure [" + e.getMessage() + "]"); }
throw new DorisEsException("fetch [" + indexName + "] shard partitions failure [" + e.getMessage() + "]");
}
}
}
if (singleShardRouting.isEmpty()) {
@ -108,8 +109,9 @@ public class EsShardPartitions {
}
public TNetworkAddress randomAddress(Map<String, EsNodeInfo> nodesInfo) {
int seed = new Random().nextInt() % nodesInfo.size();
EsNodeInfo[] nodeInfos = (EsNodeInfo[]) nodesInfo.values().toArray();
// return a random value between 0 and 32767 : [0, 32767)
int seed = new Random().nextInt(Short.MAX_VALUE) % nodesInfo.size();
EsNodeInfo[] nodeInfos = nodesInfo.values().toArray(new EsNodeInfo[0]);
return nodeInfos[seed].getPublishAddress();
}