Repository: incubator-systemml Updated Branches: refs/heads/master 3fc2bce2e -> 21ac752d8
[SYSTEMML-1162] Fix commons-lang3 incompatibility on hadoop 2.x Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/21ac752d Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/21ac752d Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/21ac752d Branch: refs/heads/master Commit: 21ac752d82097604fdde1ddde8f48df2da416a98 Parents: 3fc2bce Author: Matthias Boehm <[email protected]> Authored: Thu Dec 22 12:25:33 2016 +0100 Committer: Matthias Boehm <[email protected]> Committed: Thu Dec 22 12:25:50 2016 +0100 ---------------------------------------------------------------------- .../runtime/instructions/cp/BooleanObject.java | 2 +- .../sysml/runtime/matrix/data/FrameBlock.java | 40 ++++++++++---------- .../transform/decode/DecoderFactory.java | 2 +- .../transform/encode/EncoderFactory.java | 2 +- .../runtime/transform/meta/TfMetaUtils.java | 2 +- .../functions/jmlc/FrameReadMetaTest.java | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/21ac752d/src/main/java/org/apache/sysml/runtime/instructions/cp/BooleanObject.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/BooleanObject.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/BooleanObject.java index a55f51a..6c7d67d 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/cp/BooleanObject.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/BooleanObject.java @@ -19,7 +19,7 @@ package org.apache.sysml.runtime.instructions.cp; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.sysml.api.DMLScript; import org.apache.sysml.api.mlcontext.ScriptType; import org.apache.sysml.parser.Expression.ValueType; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/21ac752d/src/main/java/org/apache/sysml/runtime/matrix/data/FrameBlock.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/FrameBlock.java b/src/main/java/org/apache/sysml/runtime/matrix/data/FrameBlock.java index 5096624..3420e32 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/data/FrameBlock.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/data/FrameBlock.java @@ -33,7 +33,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang.ArrayUtils; import org.apache.hadoop.io.Writable; import org.apache.sysml.lops.Lop; import org.apache.sysml.parser.Expression.ValueType; @@ -405,10 +405,10 @@ public class FrameBlock implements Writable, CacheBlock, Externalizable public void appendColumn(String[] col) { ensureColumnCompatibility(col.length); String[] colnames = getColumnNames(); //before schema modification - _colnames = ArrayUtils.add(colnames, createColName(_schema.length)); - _schema = ArrayUtils.add(_schema, ValueType.STRING); + _colnames = (String[]) ArrayUtils.add(colnames, createColName(_schema.length)); + _schema = (ValueType[]) ArrayUtils.add(_schema, ValueType.STRING); _coldata = (_coldata==null) ? new Array[]{new StringArray(col)} : - ArrayUtils.add(_coldata, new StringArray(col)); + (Array[]) ArrayUtils.add(_coldata, new StringArray(col)); _numRows = col.length; } @@ -422,10 +422,10 @@ public class FrameBlock implements Writable, CacheBlock, Externalizable public void appendColumn(boolean[] col) { ensureColumnCompatibility(col.length); String[] colnames = getColumnNames(); //before schema modification - _schema = ArrayUtils.add(_schema, ValueType.BOOLEAN); - _colnames = ArrayUtils.add(colnames, createColName(_schema.length)); + _schema = (ValueType[]) ArrayUtils.add(_schema, ValueType.BOOLEAN); + _colnames = (String[]) ArrayUtils.add(colnames, createColName(_schema.length)); _coldata = (_coldata==null) ? new Array[]{new BooleanArray(col)} : - ArrayUtils.add(_coldata, new BooleanArray(col)); + (Array[]) ArrayUtils.add(_coldata, new BooleanArray(col)); _numRows = col.length; } @@ -439,10 +439,10 @@ public class FrameBlock implements Writable, CacheBlock, Externalizable public void appendColumn(long[] col) { ensureColumnCompatibility(col.length); String[] colnames = getColumnNames(); //before schema modification - _schema = ArrayUtils.add(_schema, ValueType.INT); - _colnames = ArrayUtils.add(colnames, createColName(_schema.length)); + _schema = (ValueType[]) ArrayUtils.add(_schema, ValueType.INT); + _colnames = (String[]) ArrayUtils.add(colnames, createColName(_schema.length)); _coldata = (_coldata==null) ? new Array[]{new LongArray(col)} : - ArrayUtils.add(_coldata, new LongArray(col)); + (Array[]) ArrayUtils.add(_coldata, new LongArray(col)); _numRows = col.length; } @@ -456,10 +456,10 @@ public class FrameBlock implements Writable, CacheBlock, Externalizable public void appendColumn(double[] col) { ensureColumnCompatibility(col.length); String[] colnames = getColumnNames(); //before schema modification - _schema = ArrayUtils.add(_schema, ValueType.DOUBLE); - _colnames = ArrayUtils.add(colnames, createColName(_schema.length)); + _schema = (ValueType[]) ArrayUtils.add(_schema, ValueType.DOUBLE); + _colnames = (String[]) ArrayUtils.add(colnames, createColName(_schema.length)); _coldata = (_coldata==null) ? new Array[]{new DoubleArray(col)} : - ArrayUtils.add(_coldata, new DoubleArray(col)); + (Array[]) ArrayUtils.add(_coldata, new DoubleArray(col)); _numRows = col.length; } @@ -477,10 +477,10 @@ public class FrameBlock implements Writable, CacheBlock, Externalizable Array[] tmpData = new Array[ncol]; for( int j=0; j<ncol; j++ ) tmpData[j] = new DoubleArray(cols[j]); - _colnames = empty ? null : ArrayUtils.addAll(getColumnNames(), + _colnames = empty ? null : (String[]) ArrayUtils.addAll(getColumnNames(), createColNames(getNumColumns(), ncol)); //before schema modification - _schema = empty ? tmpSchema : ArrayUtils.addAll(_schema, tmpSchema); - _coldata = empty ? tmpData : ArrayUtils.addAll(_coldata, tmpData); + _schema = empty ? tmpSchema : (ValueType[]) ArrayUtils.addAll(_schema, tmpSchema); + _coldata = empty ? tmpData : (Array[]) ArrayUtils.addAll(_coldata, tmpData); _numRows = cols[0].length; } @@ -892,12 +892,12 @@ public class FrameBlock implements Writable, CacheBlock, Externalizable ret._numRows = _numRows; //concatenate schemas (w/ deep copy to prevent side effects) - ret._schema = ArrayUtils.addAll(_schema, that._schema); - ret._colnames = ArrayUtils.addAll(getColumnNames(), that.getColumnNames()); - ret._colmeta = ArrayUtils.addAll(_colmeta, that._colmeta); + ret._schema = (ValueType[]) ArrayUtils.addAll(_schema, that._schema); + ret._colnames = (String[]) ArrayUtils.addAll(getColumnNames(), that.getColumnNames()); + ret._colmeta = (ColumnMetadata[]) ArrayUtils.addAll(_colmeta, that._colmeta); //concatenate column data (w/ deep copy to prevent side effects) - ret._coldata = ArrayUtils.addAll(_coldata, that._coldata); + ret._coldata = (Array[]) ArrayUtils.addAll(_coldata, that._coldata); for( int i=0; i<ret._coldata.length; i++ ) ret._coldata[i] = ret._coldata[i].clone(); } http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/21ac752d/src/main/java/org/apache/sysml/runtime/transform/decode/DecoderFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/transform/decode/DecoderFactory.java b/src/main/java/org/apache/sysml/runtime/transform/decode/DecoderFactory.java index 7d71006..425466a 100644 --- a/src/main/java/org/apache/sysml/runtime/transform/decode/DecoderFactory.java +++ b/src/main/java/org/apache/sysml/runtime/transform/decode/DecoderFactory.java @@ -24,7 +24,7 @@ import java.util.Arrays; import java.util.List; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang.ArrayUtils; import org.apache.sysml.parser.Expression.ValueType; import org.apache.sysml.runtime.DMLRuntimeException; import org.apache.sysml.runtime.matrix.data.FrameBlock; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/21ac752d/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderFactory.java b/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderFactory.java index 4474e40..f7ceefd 100644 --- a/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderFactory.java +++ b/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderFactory.java @@ -24,7 +24,7 @@ import java.util.Arrays; import java.util.List; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang.ArrayUtils; import org.apache.sysml.parser.Expression.ValueType; import org.apache.sysml.runtime.DMLRuntimeException; import org.apache.sysml.runtime.matrix.data.FrameBlock; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/21ac752d/src/main/java/org/apache/sysml/runtime/transform/meta/TfMetaUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/transform/meta/TfMetaUtils.java b/src/main/java/org/apache/sysml/runtime/transform/meta/TfMetaUtils.java index 9cc3df4..62b90b4 100644 --- a/src/main/java/org/apache/sysml/runtime/transform/meta/TfMetaUtils.java +++ b/src/main/java/org/apache/sysml/runtime/transform/meta/TfMetaUtils.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Map.Entry; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang.ArrayUtils; import org.apache.sysml.api.jmlc.Connection; import org.apache.sysml.lops.Lop; import org.apache.sysml.parser.Expression.ValueType; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/21ac752d/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java index 5311101..e1b3143 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java @@ -27,7 +27,7 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; -import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang.ArrayUtils; import org.apache.sysml.api.jmlc.Connection; import org.apache.sysml.api.jmlc.PreparedScript; import org.apache.sysml.api.jmlc.ResultVariables;
