IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

nosqlbench-1966 ArrayIndexOutOfBoundsException in ArgsComparator during resolveFunctions call

Browse Source
This commit is contained in:
Jonathan Shook 2024-06-24 11:56:39 -05:00
parent 883cde6fae
commit 014c82dc51
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java
View File

@ -89,7 +89,7 @@ public class NBSession extends NBHeartbeatComponent implements Function<List<Cmd
try (ResultContext results = new ResultContext(collector).ok()) { try (ResultContext results = new ResultContext(collector).ok()) {
for (Cmd cmd : assembledCommands) { for (Cmd cmd : assembledCommands) {
String explanation = " in context " + cmd.getTargetContext() + ", command '" + cmd.toString() + "'"; String explanation = "in container '" + cmd.getTargetContext() + "', command '" + cmd.toString() + "'";
try (NBInvokableCommand command = NBCommandAssembly.resolve(cmd,this::getContext)) { try (NBInvokableCommand command = NBCommandAssembly.resolve(cmd,this::getContext)) {
NBCommandParams params = NBCommandAssembly.paramsFor(cmd); NBCommandParams params = NBCommandAssembly.paramsFor(cmd);
NBBufferedContainer container = getContext(cmd.getTargetContext()); NBBufferedContainer container = getContext(cmd.getTargetContext());

11
nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ArgsComparator.java
View File

@ -83,9 +83,15 @@ public class ArgsComparator implements Comparator<Constructor<?>> {
int paramLen = ctor.getParameterCount(); int paramLen = ctor.getParameterCount();
int argsLen = arguments.length; int argsLen = arguments.length;
if (paramLen!=argsLen && !ctor.isVarArgs()) { if (ctor.isVarArgs()) {
if (argsLen<paramLen-1) {
return MATCHRANK.INCOMPATIBLE; return MATCHRANK.INCOMPATIBLE;
} }
} else {
if (paramLen!=argsLen) {
return MATCHRANK.INCOMPATIBLE;
}
}
int len = arguments.length; // only consider varargs if some provided int len = arguments.length; // only consider varargs if some provided
MATCHRANK[] ranks = new MATCHRANK[len]; MATCHRANK[] ranks = new MATCHRANK[len];
@ -94,7 +100,8 @@ public class ArgsComparator implements Comparator<Constructor<?>> {
Class<?>[] atypes = Arrays.stream(arguments).map(Object::getClass).toArray(i -> new Class<?>[i]); Class<?>[] atypes = Arrays.stream(arguments).map(Object::getClass).toArray(i -> new Class<?>[i]);
for (int position = 0; position < len; position++) { for (int position = 0; position < len; position++) {
Class<?> ptype = ptypes[position];
Class<?> ptype = (position<ptypes.length) ? ptypes[position] : ptypes[ptypes.length-1];
Class<?> atype = (position<atypes.length) ? atypes[position] : atypes[atypes.length-1]; Class<?> atype = (position<atypes.length) ? atypes[position] : atypes[atypes.length-1];
Class<?> across = WRAPPER_TYPE_MAP.get(atype); Class<?> across = WRAPPER_TYPE_MAP.get(atype);
Class<?> pcross = WRAPPER_TYPE_MAP.get(ptype); Class<?> pcross = WRAPPER_TYPE_MAP.get(ptype);