You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2017/07/20 14:45:40 UTC
svn commit: r1802498 - in
/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas:
BooleanArray.java ByteArray.java DoubleArray.java FSHashSet.java
FloatArray.java IntegerArray.java LongArray.java ShortArray.java
StringArray.java
Author: schor
Date: Thu Jul 20 14:45:39 2017
New Revision: 1802498
URL: http://svn.apache.org/viewvc?rev=1802498&view=rev
Log:
no Jira, replace array clone with Arrays.copyOf (performance issue observed)
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java?rev=1802498&r1=1802497&r2=1802498&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java Thu Jul 20 14:45:39 2017
@@ -19,6 +19,7 @@
package org.apache.uima.jcas.cas;
+import java.util.Arrays;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -133,7 +134,7 @@ public final class BooleanArray extends
* @see org.apache.uima.cas.BooleanArrayFS#toArray()
*/
public boolean[] toArray() {
- return theArray.clone();
+ return Arrays.copyOf(theArray, theArray.length);
}
/** return the size of the array */
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java?rev=1802498&r1=1802497&r2=1802498&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java Thu Jul 20 14:45:39 2017
@@ -19,6 +19,7 @@
package org.apache.uima.jcas.cas;
+import java.util.Arrays;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -130,7 +131,7 @@ public final class ByteArray extends TOP
* @see org.apache.uima.cas.ByteArrayFS#toArray()
*/
public byte[] toArray() {
- return theArray.clone();
+ return Arrays.copyOf(theArray, theArray.length);
}
/** return the size of the array */
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java?rev=1802498&r1=1802497&r2=1802498&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java Thu Jul 20 14:45:39 2017
@@ -139,7 +139,7 @@ public final class DoubleArray extends T
*/
@Override
public double[] toArray() {
- return theArray.clone();
+ return Arrays.copyOf(theArray, theArray.length);
}
/** return the size of the array */
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java?rev=1802498&r1=1802497&r2=1802498&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java Thu Jul 20 14:45:39 2017
@@ -279,7 +279,7 @@ public class FSHashSet <T extends TOP> e
return r;
}
- return (T[]) gta().clone();
+ return (T[]) Arrays.copyOf(gta(), gta().length);
}
/*
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java?rev=1802498&r1=1802497&r2=1802498&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java Thu Jul 20 14:45:39 2017
@@ -19,6 +19,8 @@
package org.apache.uima.jcas.cas;
+import java.util.Arrays;
+
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.CommonArrayFS;
import org.apache.uima.cas.impl.CASImpl;
@@ -142,7 +144,7 @@ public final class FloatArray extends TO
* @see org.apache.uima.cas.ArrayFS#toArray()
*/
public float[] toArray() {
- return theArray.clone();
+ return Arrays.copyOf(theArray, theArray.length);
}
/**
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java?rev=1802498&r1=1802497&r2=1802498&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java Thu Jul 20 14:45:39 2017
@@ -140,7 +140,7 @@ public final class IntegerArray extends
*/
@Override
public int[] toArray() {
- return theArray.clone();
+ return Arrays.copyOf(theArray, theArray.length);
}
/** return the size of the array */
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java?rev=1802498&r1=1802497&r2=1802498&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java Thu Jul 20 14:45:39 2017
@@ -140,7 +140,7 @@ public final class LongArray extends TOP
*/
@Override
public long[] toArray() {
- return theArray.clone();
+ return Arrays.copyOf(theArray, theArray.length);
}
/** return the size of the array */
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java?rev=1802498&r1=1802497&r2=1802498&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java Thu Jul 20 14:45:39 2017
@@ -19,6 +19,7 @@
package org.apache.uima.jcas.cas;
+import java.util.Arrays;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -130,7 +131,7 @@ public final class ShortArray extends TO
* @see org.apache.uima.cas.ShortArrayFS#toArray()
*/
public short[] toArray() {
- return theArray.clone();
+ return Arrays.copyOf(theArray, theArray.length);
}
/** return the size of the array */
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java?rev=1802498&r1=1802497&r2=1802498&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java Thu Jul 20 14:45:39 2017
@@ -19,6 +19,7 @@
package org.apache.uima.jcas.cas;
+import java.util.Arrays;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -130,7 +131,7 @@ public final class StringArray extends T
* @see org.apache.uima.cas.StringArrayFS#toArray()
*/
public String[] toArray() {
- return theArray.clone();
+ return Arrays.copyOf(theArray, theArray.length);
}
/** return the size of the array */