Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-7110: tests - java7 compilable 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1673270 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2015-04-13 20:15:53 +00:00
parent a8fa1435ea
commit 0c32d78135
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java
View File

@ -424,7 +424,7 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 {
}
};
JavaBinCodec.StringCache STRING_CACHE = new JavaBinCodec.StringCache(cache1);
final JavaBinCodec.StringCache STRING_CACHE = new JavaBinCodec.StringCache(cache1);
// STRING_CACHE = new JavaBinCodec.StringCache(cache);
byte[] bytes = new byte[0];
@ -441,17 +441,20 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 {
printMem("after cache init");
long ms = System.currentTimeMillis();
int ITERS = 1000000;
final int ITERS = 1000000;
int THREADS = 10;
runInThreads(THREADS, () -> {
JavaBinCodec.StringBytes stringBytes1 = new JavaBinCodec.StringBytes(new byte[0], 0,0);
for(int i=0;i< ITERS;i++){
runInThreads(THREADS, new Runnable() {
@Override
public void run() {
JavaBinCodec.StringBytes stringBytes1 = new JavaBinCodec.StringBytes(new byte[0], 0, 0);
for (int i = 0; i < ITERS; i++) {
JavaBinCodec.StringBytes b = l.get(i % l.size());
stringBytes1.reset(b.bytes,0,b.bytes.length);
if(STRING_CACHE.get(stringBytes1) == null) throw new RuntimeException("error");
stringBytes1.reset(b.bytes, 0, b.bytes.length);
if (STRING_CACHE.get(stringBytes1) == null) throw new RuntimeException("error");
}
}
});
@ -460,7 +463,9 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 {
System.out.println("time taken by LRUCACHE "+ (System.currentTimeMillis()-ms));
ms = System.currentTimeMillis();
runInThreads(THREADS, ()-> {
runInThreads(THREADS, new Runnable() {
@Override
public void run() {
String a = null;
CharArr arr = new CharArr();
for (int i = 0; i < ITERS; i++) {
@ -469,6 +474,7 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 {
ByteUtils.UTF8toUTF16(sb.bytes, 0, sb.bytes.length, arr);
a = arr.toString();
}
}
});
printMem("after new string test");
@ -525,12 +531,12 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 {
int arg=0;
int nThreads = Integer.parseInt(args[arg++]);
int nBuffers = Integer.parseInt(args[arg++]);
long iter = Long.parseLong(args[arg++]);
final long iter = Long.parseLong(args[arg++]);
int cacheSz = Integer.parseInt(args[arg++]);
Random r = new Random(0);
byte[][] buffers = new byte[nBuffers][];
final byte[][] buffers = new byte[nBuffers][];
for (int bufnum=0; bufnum<nBuffers; bufnum++) {
SolrDocument sdoc = new SolrDocument();
@ -566,7 +572,7 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 {
int ret = 0;
long start = System.currentTimeMillis();
ConcurrentLRUCache underlyingCache = cacheSz > 0 ? new ConcurrentLRUCache<>(cacheSz,cacheSz-cacheSz/10,cacheSz,cacheSz/10,false,true,null) : null; // the cache in the first version of the patch was 10000,9000,10000,1000,false,true,null
JavaBinCodec.StringCache stringCache = underlyingCache==null ? null : new JavaBinCodec.StringCache(underlyingCache);
final JavaBinCodec.StringCache stringCache = underlyingCache==null ? null : new JavaBinCodec.StringCache(underlyingCache);
if (nThreads <= 0) {
ret += doDecode(buffers, iter, stringCache);
} else {
@ -591,7 +597,6 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 {
public static int doDecode(byte[][] buffers, long iter, JavaBinCodec.StringCache stringCache) throws IOException {
int ret = 0;
int bufnum = -1;
byte[] tmp = new byte[8192];
InputStream empty = new InputStream() {
@Override