You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemds.apache.org by ba...@apache.org on 2021/09/20 11:59:38 UTC
[systemds] branch master updated: [SYSTEMDS-3142] Serialization
import warning in FunctionObjects
This is an automated email from the ASF dual-hosted git repository.
baunsgaard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/master by this push:
new 15d9f29 [SYSTEMDS-3142] Serialization import warning in FunctionObjects
15d9f29 is described below
commit 15d9f29739e51e6a75b16619e48e3a8fb64ea508
Author: baunsgaard <ba...@tugraz.at>
AuthorDate: Mon Sep 20 13:58:12 2021 +0200
[SYSTEMDS-3142] Serialization import warning in FunctionObjects
This commit remove the "implements Serialization" from class definitions
in functionObjects, where their super class already have the
"implements Serialization".
---
.../apache/sysds/runtime/functionobjects/And.java | 4 +---
.../sysds/runtime/functionobjects/BitwAnd.java | 4 +---
.../sysds/runtime/functionobjects/BitwOr.java | 4 +---
.../sysds/runtime/functionobjects/BitwShiftL.java | 4 +---
.../sysds/runtime/functionobjects/BitwShiftR.java | 4 +---
.../sysds/runtime/functionobjects/BitwXor.java | 4 +---
.../runtime/functionobjects/FileFunction.java | 24 ----------------------
.../runtime/functionobjects/FunctionObject.java | 5 ++++-
.../sysds/runtime/functionobjects/IfElse.java | 4 +---
.../runtime/functionobjects/IndexFunction.java | 4 +---
.../runtime/functionobjects/KahanFunction.java | 4 +---
.../sysds/runtime/functionobjects/KahanPlus.java | 4 +---
.../sysds/runtime/functionobjects/KahanPlusSq.java | 4 +---
.../sysds/runtime/functionobjects/Minus.java | 4 +---
.../runtime/functionobjects/Minus1Multiply.java | 4 +---
.../runtime/functionobjects/MinusMultiply.java | 4 +---
.../sysds/runtime/functionobjects/MinusNz.java | 4 +---
.../sysds/runtime/functionobjects/Multiply.java | 4 +---
.../apache/sysds/runtime/functionobjects/Or.java | 4 +---
.../apache/sysds/runtime/functionobjects/Plus.java | 4 +---
.../runtime/functionobjects/PlusMultiply.java | 4 +---
.../sysds/runtime/functionobjects/RevIndex.java | 4 +---
.../sysds/runtime/functionobjects/SwapIndex.java | 4 +---
.../functionobjects/TernaryValueFunction.java | 4 +---
.../functionobjects/ValueComparisonFunction.java | 4 +---
.../runtime/functionobjects/ValueFunction.java | 4 +---
.../apache/sysds/runtime/functionobjects/Xor.java | 4 +---
27 files changed, 29 insertions(+), 100 deletions(-)
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/And.java b/src/main/java/org/apache/sysds/runtime/functionobjects/And.java
index 2a8874f..5ae5017 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/And.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/And.java
@@ -19,9 +19,7 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
-public class And extends ValueFunction implements Serializable
+public class And extends ValueFunction
{
private static final long serialVersionUID = 6523146102263905602L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/BitwAnd.java b/src/main/java/org/apache/sysds/runtime/functionobjects/BitwAnd.java
index 4c7fad3..353d2c4 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/BitwAnd.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/BitwAnd.java
@@ -19,12 +19,10 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
import org.apache.sysds.runtime.util.UtilFunctions;
-public class BitwAnd extends ValueFunction implements Serializable
+public class BitwAnd extends ValueFunction
{
private static final long serialVersionUID = 6523146102263905602L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/BitwOr.java b/src/main/java/org/apache/sysds/runtime/functionobjects/BitwOr.java
index 3d78675..0c050be 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/BitwOr.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/BitwOr.java
@@ -19,11 +19,9 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
import org.apache.sysds.runtime.util.UtilFunctions;
-public class BitwOr extends ValueFunction implements Serializable
+public class BitwOr extends ValueFunction
{
private static final long serialVersionUID = -9172774392245257468L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/BitwShiftL.java b/src/main/java/org/apache/sysds/runtime/functionobjects/BitwShiftL.java
index 555209e..041b005 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/BitwShiftL.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/BitwShiftL.java
@@ -19,11 +19,9 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
import org.apache.sysds.runtime.util.UtilFunctions;
-public class BitwShiftL extends ValueFunction implements Serializable
+public class BitwShiftL extends ValueFunction
{
private static final long serialVersionUID = -6874923721694361623L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/BitwShiftR.java b/src/main/java/org/apache/sysds/runtime/functionobjects/BitwShiftR.java
index 4863222..50d536c 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/BitwShiftR.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/BitwShiftR.java
@@ -19,11 +19,9 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
import org.apache.sysds.runtime.util.UtilFunctions;
-public class BitwShiftR extends ValueFunction implements Serializable
+public class BitwShiftR extends ValueFunction
{
private static final long serialVersionUID = -6746241833459058280L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/BitwXor.java b/src/main/java/org/apache/sysds/runtime/functionobjects/BitwXor.java
index 8082899..64cb5c7 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/BitwXor.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/BitwXor.java
@@ -19,11 +19,9 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
import org.apache.sysds.runtime.util.UtilFunctions;
-public class BitwXor extends ValueFunction implements Serializable
+public class BitwXor extends ValueFunction
{
private static final long serialVersionUID = -7231003441114081755L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/FileFunction.java b/src/main/java/org/apache/sysds/runtime/functionobjects/FileFunction.java
deleted file mode 100644
index 34ce787..0000000
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/FileFunction.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.sysds.runtime.functionobjects;
-
-public abstract class FileFunction extends FunctionObject {
-
-}
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/FunctionObject.java b/src/main/java/org/apache/sysds/runtime/functionobjects/FunctionObject.java
index df8106c..d3f3e7d 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/FunctionObject.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/FunctionObject.java
@@ -19,14 +19,17 @@
package org.apache.sysds.runtime.functionobjects;
+import java.io.Serializable;
import java.util.HashMap;
import org.apache.sysds.runtime.DMLRuntimeException;
import org.apache.sysds.runtime.instructions.cp.Data;
-public abstract class FunctionObject
+public abstract class FunctionObject implements Serializable
{
+ private static final long serialVersionUID = -1L; // Abstract classes are not serialized.
+
@Override
public final Object clone() throws CloneNotSupportedException {
// cloning is not supported for singleton classes
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/IfElse.java b/src/main/java/org/apache/sysds/runtime/functionobjects/IfElse.java
index 077acbc..7f5800c 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/IfElse.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/IfElse.java
@@ -19,9 +19,7 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
-public class IfElse extends TernaryValueFunction implements Serializable
+public class IfElse extends TernaryValueFunction
{
private static final long serialVersionUID = -8660124936856173978L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/IndexFunction.java b/src/main/java/org/apache/sysds/runtime/functionobjects/IndexFunction.java
index c924ee9..0b0fe5a 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/IndexFunction.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/IndexFunction.java
@@ -23,9 +23,7 @@ import org.apache.sysds.runtime.matrix.data.MatrixIndexes;
import org.apache.sysds.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysds.runtime.meta.DataCharacteristics;
-import java.io.Serializable;
-
-public abstract class IndexFunction extends FunctionObject implements Serializable
+public abstract class IndexFunction extends FunctionObject
{
private static final long serialVersionUID = -7672111359444767237L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/KahanFunction.java b/src/main/java/org/apache/sysds/runtime/functionobjects/KahanFunction.java
index ac4eafd..b2c7ddd 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/KahanFunction.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/KahanFunction.java
@@ -19,8 +19,6 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
import org.apache.sysds.runtime.instructions.cp.KahanObject;
@@ -28,7 +26,7 @@ import org.apache.sysds.runtime.instructions.cp.KahanObject;
* Runtime function type to perform the summation of values using
* the Kahan summation algorithm.
*/
-public abstract class KahanFunction extends ValueFunction implements Serializable {
+public abstract class KahanFunction extends ValueFunction {
private static final long serialVersionUID = -8880016655817461398L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/KahanPlus.java b/src/main/java/org/apache/sysds/runtime/functionobjects/KahanPlus.java
index 64b2b50..f98663f 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/KahanPlus.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/KahanPlus.java
@@ -19,13 +19,11 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
import org.apache.sysds.runtime.instructions.cp.Data;
import org.apache.sysds.runtime.instructions.cp.KahanObject;
-public class KahanPlus extends KahanFunction implements Serializable
+public class KahanPlus extends KahanFunction
{
private static final long serialVersionUID = -8338160609569967791L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/KahanPlusSq.java b/src/main/java/org/apache/sysds/runtime/functionobjects/KahanPlusSq.java
index d31a11c..dcd927d 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/KahanPlusSq.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/KahanPlusSq.java
@@ -19,8 +19,6 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
import org.apache.sysds.runtime.instructions.cp.Data;
import org.apache.sysds.runtime.instructions.cp.KahanObject;
@@ -29,7 +27,7 @@ import org.apache.sysds.runtime.instructions.cp.KahanObject;
* Runtime function to perform the summation of squared values using
* the Kahan summation algorithm.
*/
-public class KahanPlusSq extends KahanFunction implements Serializable {
+public class KahanPlusSq extends KahanFunction {
private static final long serialVersionUID = 5774388904472231717L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/Minus.java b/src/main/java/org/apache/sysds/runtime/functionobjects/Minus.java
index 16df3b3..f9f953a 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/Minus.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/Minus.java
@@ -19,9 +19,7 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
-public class Minus extends ValueFunction implements Serializable
+public class Minus extends ValueFunction
{
private static final long serialVersionUID = 8433928060333018056L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/Minus1Multiply.java b/src/main/java/org/apache/sysds/runtime/functionobjects/Minus1Multiply.java
index 481d41d..2a4449d 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/Minus1Multiply.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/Minus1Multiply.java
@@ -19,9 +19,7 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
-public class Minus1Multiply extends ValueFunction implements Serializable
+public class Minus1Multiply extends ValueFunction
{
private static final long serialVersionUID = 8211391941572535083L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/MinusMultiply.java b/src/main/java/org/apache/sysds/runtime/functionobjects/MinusMultiply.java
index 3d56d8c..207b625 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/MinusMultiply.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/MinusMultiply.java
@@ -19,12 +19,10 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
import org.apache.sysds.runtime.functionobjects.TernaryValueFunction.ValueFunctionWithConstant;
import org.apache.sysds.runtime.matrix.operators.BinaryOperator;
-public class MinusMultiply extends TernaryValueFunction implements ValueFunctionWithConstant, Serializable
+public class MinusMultiply extends TernaryValueFunction implements ValueFunctionWithConstant
{
private static final long serialVersionUID = 2801982061205871665L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/MinusNz.java b/src/main/java/org/apache/sysds/runtime/functionobjects/MinusNz.java
index 0c097d6..97ce3ef 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/MinusNz.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/MinusNz.java
@@ -19,9 +19,7 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
-public class MinusNz extends ValueFunction implements Serializable
+public class MinusNz extends ValueFunction
{
private static final long serialVersionUID = -949397965417772299L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/Multiply.java b/src/main/java/org/apache/sysds/runtime/functionobjects/Multiply.java
index 6c75943..1773b5c 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/Multiply.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/Multiply.java
@@ -19,9 +19,7 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
-public class Multiply extends ValueFunction implements Serializable
+public class Multiply extends ValueFunction
{
private static final long serialVersionUID = 2801982061205871665L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/Or.java b/src/main/java/org/apache/sysds/runtime/functionobjects/Or.java
index d603924..61587cf 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/Or.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/Or.java
@@ -19,9 +19,7 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
-public class Or extends ValueFunction implements Serializable
+public class Or extends ValueFunction
{
private static final long serialVersionUID = -2847467729680510910L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/Plus.java b/src/main/java/org/apache/sysds/runtime/functionobjects/Plus.java
index 1e2f63c..39697bb 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/Plus.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/Plus.java
@@ -19,11 +19,9 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
// Singleton class
-public class Plus extends ValueFunction implements Serializable
+public class Plus extends ValueFunction
{
private static final long serialVersionUID = -3573790367761963555L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/PlusMultiply.java b/src/main/java/org/apache/sysds/runtime/functionobjects/PlusMultiply.java
index 85033b3..4a0bcad 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/PlusMultiply.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/PlusMultiply.java
@@ -19,12 +19,10 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
import org.apache.sysds.runtime.functionobjects.TernaryValueFunction.ValueFunctionWithConstant;
import org.apache.sysds.runtime.matrix.operators.BinaryOperator;
-public class PlusMultiply extends TernaryValueFunction implements ValueFunctionWithConstant, Serializable
+public class PlusMultiply extends TernaryValueFunction implements ValueFunctionWithConstant
{
private static final long serialVersionUID = 2801982061205871665L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/RevIndex.java b/src/main/java/org/apache/sysds/runtime/functionobjects/RevIndex.java
index e0b4710..46c9f4f 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/RevIndex.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/RevIndex.java
@@ -24,10 +24,8 @@ import org.apache.sysds.runtime.matrix.data.MatrixIndexes;
import org.apache.sysds.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysds.runtime.meta.DataCharacteristics;
-import java.io.Serializable;
-
-public class RevIndex extends IndexFunction implements Serializable
+public class RevIndex extends IndexFunction
{
private static final long serialVersionUID = -1002715543022547788L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/SwapIndex.java b/src/main/java/org/apache/sysds/runtime/functionobjects/SwapIndex.java
index 6ae0a34..3d2c9e8 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/SwapIndex.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/SwapIndex.java
@@ -23,10 +23,8 @@ import org.apache.sysds.runtime.matrix.data.MatrixIndexes;
import org.apache.sysds.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysds.runtime.meta.DataCharacteristics;
-import java.io.Serializable;
-
-public class SwapIndex extends IndexFunction implements Serializable
+public class SwapIndex extends IndexFunction
{
private static final long serialVersionUID = -8898087610410746689L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/TernaryValueFunction.java b/src/main/java/org/apache/sysds/runtime/functionobjects/TernaryValueFunction.java
index 9930bce..f6c5073 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/TernaryValueFunction.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/TernaryValueFunction.java
@@ -19,11 +19,9 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
import org.apache.sysds.runtime.matrix.operators.BinaryOperator;
-public abstract class TernaryValueFunction extends ValueFunction implements Serializable
+public abstract class TernaryValueFunction extends ValueFunction
{
private static final long serialVersionUID = 4837616587192612216L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/ValueComparisonFunction.java b/src/main/java/org/apache/sysds/runtime/functionobjects/ValueComparisonFunction.java
index f24a634..23c18ee 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/ValueComparisonFunction.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/ValueComparisonFunction.java
@@ -19,13 +19,11 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
/**
* Abstraction for comparison (relational) operators in order to
* force a proper implementation by all relevant subclasses.
*/
-public abstract class ValueComparisonFunction extends ValueFunction implements Serializable
+public abstract class ValueComparisonFunction extends ValueFunction
{
private static final long serialVersionUID = 6021132561216734747L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/ValueFunction.java b/src/main/java/org/apache/sysds/runtime/functionobjects/ValueFunction.java
index 2d4aa07..f418e77 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/ValueFunction.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/ValueFunction.java
@@ -19,9 +19,7 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
-public abstract class ValueFunction extends FunctionObject implements Serializable
+public abstract class ValueFunction extends FunctionObject
{
private static final long serialVersionUID = -4985988545393861058L;
diff --git a/src/main/java/org/apache/sysds/runtime/functionobjects/Xor.java b/src/main/java/org/apache/sysds/runtime/functionobjects/Xor.java
index 35d0dce..ccd39af 100644
--- a/src/main/java/org/apache/sysds/runtime/functionobjects/Xor.java
+++ b/src/main/java/org/apache/sysds/runtime/functionobjects/Xor.java
@@ -19,9 +19,7 @@
package org.apache.sysds.runtime.functionobjects;
-import java.io.Serializable;
-
-public class Xor extends ValueFunction implements Serializable
+public class Xor extends ValueFunction
{
private static final long serialVersionUID = -2847467729680510910L;