IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-15 00:53:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

pull ConfigAware api up

Browse Source
This commit is contained in:
Jonathan Shook 2020-10-23 02:36:04 -05:00
parent 71195d0a0b
commit 574a89e75a
8 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_tuple/CustomFunc955.java
View File

@ -4,19 +4,15 @@ import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.DataType;
import com.datastax.driver.core.TupleType;
import com.datastax.driver.core.TupleValue;
import io.nosqlbench.nb.api.errors.BasicError;
import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
import io.nosqlbench.virtdata.core.config.ConfigAware;
import io.nosqlbench.virtdata.core.config.ConfigModel;
import io.nosqlbench.virtdata.core.config.MutableConfigModel;
import io.nosqlbench.nb.api.config.ConfigAware;
import io.nosqlbench.nb.api.config.ConfigModel;
import io.nosqlbench.nb.api.config.MutableConfigModel;
import java.math.BigInteger;
import java.util.*;
import java.util.function.Function;
import java.util.function.LongFunction;
import java.util.function.LongToIntFunction;
import java.util.function.LongUnaryOperator;
import java.util.regex.Pattern;
/**
* Temporary function to test a specific nested type. This should be replaced

2
virtdata-api/src/main/java/io/nosqlbench/virtdata/core/config/ConfigAware.java → nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigAware.java
View File

@ -1,4 +1,4 @@
package io.nosqlbench.virtdata.core.config;
package io.nosqlbench.nb.api.config;
import java.util.Map;

2
virtdata-api/src/main/java/io/nosqlbench/virtdata/core/config/ConfigData.java → nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigData.java
View File

@ -1,4 +1,4 @@
package io.nosqlbench.virtdata.core.config;
package io.nosqlbench.nb.api.config;
import io.nosqlbench.nb.api.errors.BasicError;

6
virtdata-api/src/main/java/io/nosqlbench/virtdata/core/config/ConfigModel.java → nb-api/src/main/java/io/nosqlbench/nb/api/config/ConfigModel.java
View File

@ -1,17 +1,17 @@
package io.nosqlbench.virtdata.core.config;
package io.nosqlbench.nb.api.config;
import java.util.List;
public interface ConfigModel {
List<Element> getElements();
public static class Element {
class Element {
public final String name;
public final Class<?> type;
public Element(String name, Class<?> type) {
this.name = name;
this.type =type;
this.type = type;
}
}
}

2
virtdata-api/src/main/java/io/nosqlbench/virtdata/core/config/MutableConfigModel.java → nb-api/src/main/java/io/nosqlbench/nb/api/config/MutableConfigModel.java
View File

@ -1,4 +1,4 @@
package io.nosqlbench.virtdata.core.config;
package io.nosqlbench.nb.api.config;
import java.util.ArrayList;
import java.util.Collections;

7
virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolver.java
View File

@ -1,7 +1,7 @@
package io.nosqlbench.virtdata.core.bindings;
import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
import io.nosqlbench.virtdata.core.config.ConfigAware;
import io.nosqlbench.nb.api.config.ConfigAware;
import org.apache.commons.lang3.ClassUtils;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
@ -64,10 +64,7 @@ public class VirtDataFunctionResolver {
return false;
}
Class<?> componentType = ctypes[ctypes.length - 1].getComponentType();
if (parameterTypes.length >= ctypes.length && !ClassUtils.isAssignable(parameterTypes[ctypes.length - 1], componentType, true)) {
return false;
}
return true;
return parameterTypes.length < ctypes.length || ClassUtils.isAssignable(parameterTypes[ctypes.length - 1], componentType, true);
} else {
if (parameterTypes.length!=ctypes.length) {
return false;

1
virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java
View File

@ -1,5 +1,6 @@
package io.nosqlbench.virtdata.core.config;
import io.nosqlbench.nb.api.config.ConfigData;
import org.junit.Test;
import java.util.List;

6
virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java
View File

@ -2,9 +2,9 @@ package io.nosqlbench.virtdata.library.basics.shared.stateful;
import io.nosqlbench.virtdata.api.annotations.Example;
import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
import io.nosqlbench.virtdata.core.config.ConfigAware;
import io.nosqlbench.virtdata.core.config.ConfigModel;
import io.nosqlbench.virtdata.core.config.MutableConfigModel;
import io.nosqlbench.nb.api.config.ConfigAware;
import io.nosqlbench.nb.api.config.ConfigModel;
import io.nosqlbench.nb.api.config.MutableConfigModel;
import java.util.Map;
import java.util.function.Function;