Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion jni/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<description>Infinispan HotRod JNI Wrapper</description>

<properties>
<version.org.infinispan>9.0.0.Final</version.org.infinispan>
<version.org.infinispan>9.1.1.Final</version.org.infinispan>
<version.org.jboss.logging.processor>1.2.1.Final</version.org.jboss.logging.processor>
<version.org.jboss.jbossts>4.17.13.Final</version.org.jboss.jbossts>
<version.org.testng>6.8</version.org.testng>
Expand Down Expand Up @@ -62,6 +62,13 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-server-core</artifactId>
<version>${version.org.infinispan}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-server-hotrod</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ public interface RemoteCache<K, V> {
Map<K, V> getBulk();

Map<K, V> getBulk(int size);

Map<K, V> getAll(Set<K> keySet);

boolean isEmpty();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import java.math.BigInteger;
import java.net.SocketAddress;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
Expand All @@ -34,6 +35,7 @@
import org.infinispan.client.hotrod.jni.MetadataPairReturn;
import org.infinispan.client.hotrod.jni.RelayBytes;
import org.infinispan.client.hotrod.jni.RemoteCache_jb_jb;
import org.infinispan.client.hotrod.jni.SetArgs;
import org.infinispan.client.hotrod.jni.SetReturn;
import org.infinispan.client.hotrod.jni.StringVectorReturn;
import org.infinispan.client.hotrod.jni.VectorReturn;
Expand Down Expand Up @@ -483,6 +485,41 @@ public Object invoke(RelayBytes... rbs) {
return result;
}

@Override
public Map<K, V> getAll(Set<K> keySet) {
return relayedInvoker(new RelayedMethod() {
@Override
public Object invoke(RelayBytes... rbs) {
SetArgs s = new SetArgs();
for (RelayBytes r : rbs) {
s.insert(r);
}
MapReturn mr = jniRemoteCache.getAll(s);
final VectorReturn vectorReturn = Hotrod.keySet(mr);
Map<K, V> ret = new HashMap<K, V>();
for (int i = 0; i < vectorReturn.size(); i++) {
final RelayBytes k = Hotrod.dereference(vectorReturn.get(i));
final RelayBytes v = Hotrod.dereference(mr.get(vectorReturn.get(i)));
K key = relayedInvoker(new RelayedMethod() {
@Override
public Object invoke(RelayBytes... rbs) {
return k;
}
});
V value = relayedInvoker(new RelayedMethod() {
@Override
public Object invoke(RelayBytes... rbs) {
return v;
}
});

ret.put(key, value);
}
return ret;
}
}, (Collection<Object>) keySet);
}

@Override
public RemoteCache<K, V> withFlags(Flag... flags) {
int result = 0;
Expand All @@ -495,6 +532,43 @@ public RemoteCache<K, V> withFlags(Flag... flags) {
return this;
}

private <R> R relayedInvoker(RelayedMethod m, Collection<Object> oc) {
RelayBytes rb[] = new RelayBytes[oc.size()];
byte bytes[][] = new byte[oc.size()][];
try {
int i = 0;
for (Object o : oc) {
rb[i] = new RelayBytes();
bytes[i] = marshaller.objectToByteBuffer(o);
setJvmBytes(rb[i], bytes[i]);
++i;
}
Object ret = m.invoke(rb);
if (ret == null) {
return null;
} else if (ret instanceof RelayBytes) {
RelayBytes retrb = (RelayBytes) ret;
byte[] jcopy = new byte[(int) retrb.getLength()];
readNative(retrb, jcopy);
try {
return (R) marshaller.objectFromByteBuffer(jcopy);
} finally {
dispose(retrb);
}
} else {
return (R) ret;
}
} catch (RuntimeException e) {
throw e;
} catch (Throwable t) {
throw new RuntimeException(t);
} finally {
for (int i = 0; i < oc.size(); i++) {
releaseJvmBytes(rb[i], bytes[i]);
}
}
}

private <R> R relayedInvoker(RelayedMethod m, Object... o) {
RelayBytes rb[] = new RelayBytes[o.length];
byte bytes[][] = new byte[o.length][];
Expand Down
5 changes: 4 additions & 1 deletion jni/src/main/swig/java.i
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ class RelayBytes {
size_t getLength () const {return length; }
jbyteArray getJarray() const { return jarray; }
bool isNull() const { return !bytes; }
bool operator< (const RelayBytes &b) const { return std::memcmp(bytes, b.bytes, std::min(length, b.length))<0; }

private:
char *bytes;
size_t length;
Expand All @@ -186,11 +188,12 @@ class RelayBytes {

%}

//%template(RelayShrPointer) std::shared_ptr<RelayBytes>;
%template(RelayShrPointer) std::shared_ptr<RelayBytes>;
%template(MetadataPairReturn) std::pair<std::shared_ptr<RelayBytes>, infinispan::hotrod::MetadataValue>;
%template(VersionPairReturn) std::pair<std::shared_ptr<RelayBytes>, infinispan::hotrod::VersionedValue>;
%template(MapReturn) std::map<std::shared_ptr<RelayBytes>, std::shared_ptr<RelayBytes> >;
%template(SetReturn) std::set<std::shared_ptr<RelayBytes> >;
%template(SetArgs) std::set<RelayBytes>;
%template(VectorReturn) std::vector<std::shared_ptr<RelayBytes> >;
%template(StringVectorReturn) std::vector<std::string>;
%template(IntegerVectorReturn) std::vector<int>;
Expand Down
21 changes: 8 additions & 13 deletions jni/src/test/java/org/infinispan/client/jni/hotrod/JniTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,9 @@ public static void main(String[] args) {
CrossLanguageHotRodTest.class,
/* package org.infinispan.client.hotrod */
// ApacheCommonsPoolTest.class, // omitting
BulkGetKeysDistTest.class,
BulkGetKeysReplTest.class,
BulkGetKeysSimpleTest.class,
BulkGetReplTest.class,
BulkGetSimpleTest.class,
GetAllLocalTest.class,
GetAllReplTest.class,
GetAllDistTest.class,
// CacheContainerTest.class, // not relevant
CacheManagerNotStartedTest.class,
CacheManagerStoppedTest.class,
Expand Down Expand Up @@ -80,21 +78,18 @@ public static void main(String[] args) {
// SslTest.class, // SSL not implemented
// TransportObjectFactoryTest.class, // omitting
});

testng.addListener(tr);
testng.setGroups("unit,functional");
testng.run();

Set<String> expectedTestFailures = new TreeSet<String>(Arrays.asList(
"BulkGetKeysDistTest.testBulkGetAfterLifespanExpire", // unstable, ISPN-4017
"HotRodIntegrationTest.testReplaceWithVersionWithLifespanAsync", // async not implemented
"ClientSocketReadTimeoutTest.testPutTimeout", // TODO: TransportException not marshalled correctly
"BulkGetKeysReplTest.testBulkGetAfterLifespanExpire",
"BulkGetKeysSimpleTest.testBulkGetAfterLifespanExpire",
"BulkGetReplTest.testBulkGetAfterLifespanExpire",
"BulkGetSimpleTest.testBulkGetAfterLifespanExpire",
"ForceReturnValuesTest.testSameInstanceForSameForceReturnValues",
"HotRodIntegrationTest.testGetWithMetadata"
"HotRodIntegrationTest.testGetWithMetadata",
"RemoteCacheManagerTest.testStartStopAsync",
"GetAllDistTest.testBulkGetAfterLifespanExpire",
"GetAllLocalTest.testBulkGetAfterLifespanExpire",
"GetAllReplTest.testBulkGetAfterLifespanExpire"
));
Set<String> expectedSkips = Collections.emptySet();

Expand Down