Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 04612627640e
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3cbf5ff7131d
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Aug 27, 2017

  1. MINOR: Dry up RubyArray and improve performance in a few spots

    @original-brownbear
    original-brownbear committed Aug 27, 2017
    Copy the full SHA
    5152772 View commit details

Commits on Sep 5, 2017

  1. Merge pull request #4751 from original-brownbear/cleanup-ruby-array 

    MINOR: Dry up RubyArray and improve performance in a few spots
    @kares
    kares authored Sep 5, 2017
    Copy the full SHA
    3cbf5ff View commit details
153 changes: 73 additions & 80 deletions core/src/main/java/org/jruby/RubyArray.java
View file
Original file line number Diff line number Diff line change
@@ -37,6 +37,18 @@
***** END LICENSE BLOCK *****/
package org.jruby;

import java.io.IOException;
import java.lang.reflect.Array;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.RandomAccess;
import org.jcodings.specific.USASCIIEncoding;
import org.jruby.anno.JRubyClass;
import org.jruby.anno.JRubyMethod;
@@ -69,26 +81,13 @@
import org.jruby.util.TypeConverter;
import org.jruby.util.cli.Options;

import java.io.IOException;
import java.lang.reflect.Array;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.RandomAccess;

import static org.jruby.RubyEnumerator.SizeFn;
import static org.jruby.RubyEnumerator.enumeratorize;
import static org.jruby.RubyEnumerator.enumeratorizeWithSize;
import static org.jruby.runtime.Helpers.arrayOf;
import static org.jruby.runtime.Helpers.hashEnd;
import static org.jruby.runtime.Helpers.murmurCombine;
import static org.jruby.runtime.Visibility.PRIVATE;
import static org.jruby.RubyEnumerator.SizeFn;

/**
* The implementation of the built-in class Array in Ruby.
@@ -246,37 +245,59 @@ public static RubyArray newEmptyArray(Ruby runtime) {
*
*/
public static RubyArray newArray(Ruby runtime, IRubyObject[] args) {
switch (args.length) {
case 0:
return newEmptyArray(runtime);
case 1:
if (USE_PACKED_ARRAYS) return new RubyArrayOneObject(runtime, args[0]);
break;
case 2:
if (USE_PACKED_ARRAYS) return new RubyArrayTwoObject(runtime, args[0], args[1]);
break;
final int size = args.length;
if (size == 0) {
return newEmptyArray(runtime);
}
RubyArray arr = new RubyArray(runtime, new IRubyObject[args.length]);
System.arraycopy(args, 0, arr.values, 0, args.length);
arr.realLength = args.length;
return arr;
return isPackedArray(size) ? packedArray(runtime, args)
: new RubyArray(runtime, args.clone());
}

public static RubyArray newArray(Ruby runtime, Collection<? extends IRubyObject> collection) {
if (collection.isEmpty()) {
return newEmptyArray(runtime);
}
final IRubyObject[] arr = collection.toArray(IRubyObject.NULL_ARRAY);
return isPackedArray(collection) ? packedArray(runtime, arr) : new RubyArray(runtime, arr);
}

public static RubyArray newArray(Ruby runtime, List<? extends IRubyObject> list) {
if (list.isEmpty()) {
return newEmptyArray(runtime);
}
return isPackedArray(list) ? packedArray(runtime, list)
: new RubyArray(runtime, list.toArray(IRubyObject.NULL_ARRAY));
}

private static RubyArray packedArray(final Ruby runtime, final IRubyObject[] args) {
if (args.length == 1) {
return new RubyArrayOneObject(runtime, args[0]);
} else {
return new RubyArrayTwoObject(runtime, args[0], args[1]);
}
}

private static RubyArray packedArray(final Ruby runtime, final List<? extends IRubyObject> args) {
if (args.size() == 1) {
return new RubyArrayOneObject(runtime, args.get(0));
} else {
return new RubyArrayTwoObject(runtime, args.get(0), args.get(1));
}
}

private static boolean isPackedArray(final int size) {
return USE_PACKED_ARRAYS && size <= 2;
}

private static boolean isPackedArray(final Collection<? extends IRubyObject> collection) {
return USE_PACKED_ARRAYS && collection.size() <= 2;
}

/**
* @see RubyArray#newArrayMayCopy(Ruby, IRubyObject[], int, int)
*/
public static RubyArray newArrayMayCopy(Ruby runtime, IRubyObject... args) {
switch (args.length) {
case 0:
return newEmptyArray(runtime);
case 1:
if (USE_PACKED_ARRAYS) return new RubyArrayOneObject(runtime, args[0]);
break;
case 2:
if (USE_PACKED_ARRAYS) return new RubyArrayTwoObject(runtime, args[0], args[1]);
break;
}
return newArrayNoCopy(runtime, args, 0, args.length);
return newArrayMayCopy(runtime, args, 0, args.length);
}

/**
@@ -299,15 +320,16 @@ public static RubyArray newArrayMayCopy(Ruby runtime, IRubyObject[] args, int st
* @return an array referencing the given elements
*/
public static RubyArray newArrayMayCopy(Ruby runtime, IRubyObject[] args, int start, int length) {
switch (length) {
case 0:
return newEmptyArray(runtime);
case 1:
if (USE_PACKED_ARRAYS) return new RubyArrayOneObject(runtime, args[start]);
break;
case 2:
if (USE_PACKED_ARRAYS) return new RubyArrayTwoObject(runtime, args[start], args[start + 1]);
break;
if (length == 0) {
return newEmptyArray(runtime);
}
if (USE_PACKED_ARRAYS) {
if (length == 1) {
return new RubyArrayOneObject(runtime, args[start]);
}
if (length == 2) {
return new RubyArrayTwoObject(runtime, args[start], args[start + 1]);
}
}
return newArrayNoCopy(runtime, args, start, length);
}
@@ -334,35 +356,6 @@ public static RubyArray newArrayNoCopyLight(Ruby runtime, IRubyObject[] args) {
return arr;
}

public static RubyArray newArray(Ruby runtime, Collection<? extends IRubyObject> collection) {
// This may seem inefficient for packed arrays, but the cost of this versus is not really worse
// than the cost of constructing and walking an Iterator.
IRubyObject[] values = collection.toArray(new IRubyObject[collection.size()]);
switch (values.length) {
case 0: return newEmptyArray(runtime);
case 1:
if (USE_PACKED_ARRAYS) return new RubyArrayOneObject(runtime, values[0]);
break;
case 2:
if (USE_PACKED_ARRAYS) return new RubyArrayTwoObject(runtime, values[0], values[1]);
break;
}
return new RubyArray(runtime, values);
}

public static RubyArray newArray(Ruby runtime, List<? extends IRubyObject> list) {
switch (list.size()) {
case 0: return newEmptyArray(runtime);
case 1:
if (USE_PACKED_ARRAYS) return new RubyArrayOneObject(runtime, list.get(0));
break;
case 2:
if (USE_PACKED_ARRAYS) return new RubyArrayTwoObject(runtime, list.get(0), list.get(1));
break;
}
return new RubyArray(runtime, list.toArray(new IRubyObject[list.size()]));
}

public static final int ARRAY_DEFAULT_SIZE = 16;

// volatile to ensure that initial nil-fill is visible to other threads
@@ -3828,7 +3821,7 @@ public IRubyObject size(IRubyObject[] args) {
};
}

private IRubyObject binomialCoefficient(ThreadContext context, long comb, long size) {
private static IRubyObject binomialCoefficient(ThreadContext context, long comb, long size) {
Ruby runtime = context.runtime;
if (comb > size - comb) {
comb = size - comb;
@@ -4029,7 +4022,7 @@ public IRubyObject size(IRubyObject[] args) {
};
}

private IRubyObject descendingFactorial(ThreadContext context, long from, long howMany) {
private static IRubyObject descendingFactorial(ThreadContext context, long from, long howMany) {
Ruby runtime = context.runtime;
IRubyObject cnt = howMany >= 0 ? RubyFixnum.one(runtime) : RubyFixnum.zero(runtime);
CallSite op_times = sites(context).op_times;
@@ -4059,7 +4052,7 @@ public IRubyObject shuffle_bang(ThreadContext context, IRubyObject[] args) {
if (args.length > 0) {
IRubyObject hash = TypeConverter.checkHashType(context.runtime, args[args.length - 1]);
if (!hash.isNil()) {
IRubyObject[] rets = ArgsUtil.extractKeywordArgs(context, (RubyHash) hash, new String[] { "random" });
IRubyObject[] rets = ArgsUtil.extractKeywordArgs(context, (RubyHash) hash, "random");
if (!rets[0].isNil()) randgen = rets[0];
}
}
@@ -4100,7 +4093,7 @@ public IRubyObject sample(ThreadContext context, IRubyObject[] args) {
if (args.length > 0) {
IRubyObject hash = TypeConverter.checkHashType(context.runtime, args[args.length - 1]);
if (!hash.isNil()) {
IRubyObject[] rets = ArgsUtil.extractKeywordArgs(context, (RubyHash) hash, new String[] { "random" });
IRubyObject[] rets = ArgsUtil.extractKeywordArgs(context, (RubyHash) hash, "random");
if (!rets[0].isNil()) randgen = rets[0];
args = ArraySupport.newCopy(args, args.length - 1);
}
4 changes: 0 additions & 4 deletions core/src/main/java/org/jruby/specialized/RubyArrayOneObject.java
View file
Original file line number Diff line number Diff line change
@@ -4,16 +4,12 @@
import org.jruby.Ruby;
import org.jruby.RubyArray;
import org.jruby.RubyClass;
import org.jruby.RubyFixnum;
import org.jruby.RubyString;
import org.jruby.javasupport.JavaUtil;
import org.jruby.runtime.Block;
import org.jruby.runtime.Constants;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.util.io.EncodingUtils;

import static org.jruby.RubyEnumerator.enumeratorizeWithSize;
import static org.jruby.runtime.Helpers.arrayOf;

/**
3 changes: 0 additions & 3 deletions core/src/main/java/org/jruby/specialized/RubyArrayTwoObject.java
View file
Original file line number Diff line number Diff line change
@@ -9,14 +9,11 @@
import org.jruby.RubyString;
import org.jruby.javasupport.JavaUtil;
import org.jruby.runtime.Block;
import org.jruby.runtime.Constants;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.runtime.invokedynamic.MethodNames;
import org.jruby.util.ByteList;
import org.jruby.util.io.EncodingUtils;

import static org.jruby.RubyEnumerator.enumeratorizeWithSize;
import static org.jruby.runtime.Helpers.arrayOf;
import static org.jruby.runtime.Helpers.invokedynamic;