You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2019/02/04 20:59:03 UTC
[asterixdb] branch master updated (ddec765 -> d2c7071)
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git.
from ddec765 [NO ISSUE][FUN] Drop fractional millis digits after 3rd precision
new 2dc111d [NO ISSUE] Ensure serialVersionUIDs are present
new 5ae6b5d Merge commit '2dc111d' from 'stabilization-f69489' into 'master'
new d2c7071 Merge "Merge commit '2dc111d' from 'stabilization-f69489' into 'master'"
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/asterix/translator/ExecutionPlans.java | 1 +
.../org/apache/asterix/translator/IStatementExecutor.java | 2 ++
.../org/apache/asterix/translator/ResultProperties.java | 1 +
.../asterix/common/exceptions/ReplicationException.java | 1 +
.../asterix/common/messaging/CcIdentifiedMessage.java | 2 ++
.../org/apache/asterix/common/utils/NcLocalCounters.java | 1 +
.../asterix/lang/sqlpp/parser/SqlppParseException.java | 1 +
.../org/apache/asterix/metadata/CachingTxnIdFactory.java | 1 +
.../CompactionPolicyTupleTranslator.java | 2 ++
.../DatasourceAdapterTupleTranslator.java | 1 +
.../entitytupletranslators/DatatypeTupleTranslator.java | 2 ++
.../entitytupletranslators/DataverseTupleTranslator.java | 2 ++
.../ExternalFileTupleTranslator.java | 2 ++
.../FeedConnectionTupleTranslator.java | 1 +
.../entitytupletranslators/FeedPolicyTupleTranslator.java | 2 ++
.../entitytupletranslators/FeedTupleTranslator.java | 2 ++
.../entitytupletranslators/FunctionTupleTranslator.java | 2 ++
.../entitytupletranslators/LibraryTupleTranslator.java | 2 ++
.../entitytupletranslators/NodeTupleTranslator.java | 1 +
.../src/main/java/org/apache/asterix/om/base/AString.java | 1 +
.../asterix/om/exceptions/IncompatibleTypeException.java | 1 +
.../asterix/om/exceptions/InvalidExpressionException.java | 1 +
.../asterix/om/exceptions/TypeMismatchException.java | 1 +
.../om/exceptions/UnsupportedItemTypeException.java | 1 +
.../asterix/om/exceptions/UnsupportedTypeException.java | 1 +
.../org/apache/asterix/om/functions/FunctionInfo.java | 1 +
.../functions/AbstractNumericArithmeticEval.java | 2 +-
.../runtime/evaluators/functions/ToObjectDescriptor.java | 2 ++
.../runtime/exceptions/IncompatibleTypeException.java | 1 +
.../runtime/exceptions/InvalidDataFormatException.java | 1 +
.../asterix/runtime/exceptions/OverflowException.java | 2 ++
.../asterix/runtime/exceptions/TypeMismatchException.java | 1 +
.../asterix/runtime/exceptions/UnderflowException.java | 1 +
.../runtime/exceptions/UnsupportedItemTypeException.java | 1 +
.../runtime/exceptions/UnsupportedTypeException.java | 1 +
.../asterix/runtime/functions/FunctionCollection.java | 1 +
.../transaction/management/service/logging/LogBuffer.java | 1 +
.../api/client/HyracksClientInterfaceFunctions.java | 1 +
.../apache/hyracks/api/job/resource/ClusterCapacity.java | 1 +
.../org/apache/hyracks/api/job/resource/NodeCapacity.java | 1 +
.../org/apache/hyracks/client/stats/AggregateCounter.java | 1 +
.../hyracks/control/common/config/ConfigManager.java | 6 ++++++
.../hyracks/control/common/config/IConfigSetter.java | 2 ++
.../hyracks/control/common/controllers/CCConfig.java | 1 +
.../control/common/job/profiling/OperatorStats.java | 1 +
.../control/common/job/profiling/StatsCollector.java | 1 +
.../control/common/job/profiling/counters/Counter.java | 2 ++
.../hyracks/data/std/primitive/DoublePointable.java | 2 ++
.../hyracks/data/std/primitive/IntegerPointable.java | 2 ++
.../dataflow/common/data/partition/range/RangeMap.java | 15 ++++++++-------
.../am/rtree/frames/RTreeNSMInteriorFrameFactory.java | 2 ++
.../storage/am/rtree/frames/RTreeNSMLeafFrameFactory.java | 1 +
52 files changed, 81 insertions(+), 8 deletions(-)
[asterixdb] 01/03: [NO ISSUE] Ensure serialVersionUIDs are present
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 2dc111dbdfb084d3a416ab19f03283b30e51467f
Author: Michael Blow <mb...@apache.org>
AuthorDate: Fri Feb 1 21:57:51 2019 -0500
[NO ISSUE] Ensure serialVersionUIDs are present
Serializable classes should define a serialVersionUID; define those
where missing. For classes present in 0.9.4.x, initialize the value
to the auto-configured serialVersionUID on those versions of the class
Change-Id: Ia92d0c81f3681dce7ec0f643e2edf77e2ac4dbc5
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3141
Tested-by: Michael Blow <mb...@apache.org>
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
---
.../src/main/java/org/apache/asterix/translator/ExecutionPlans.java | 1 +
.../main/java/org/apache/asterix/translator/IStatementExecutor.java | 2 ++
.../main/java/org/apache/asterix/translator/ResultProperties.java | 1 +
.../org/apache/asterix/common/exceptions/ReplicationException.java | 1 +
.../org/apache/asterix/common/messaging/CcIdentifiedMessage.java | 2 ++
.../main/java/org/apache/asterix/common/utils/NcLocalCounters.java | 1 +
.../org/apache/asterix/lang/sqlpp/parser/SqlppParseException.java | 1 +
.../main/java/org/apache/asterix/metadata/CachingTxnIdFactory.java | 1 +
.../entitytupletranslators/CompactionPolicyTupleTranslator.java | 2 ++
.../entitytupletranslators/DatasourceAdapterTupleTranslator.java | 1 +
.../metadata/entitytupletranslators/DatatypeTupleTranslator.java | 2 ++
.../metadata/entitytupletranslators/DataverseTupleTranslator.java | 2 ++
.../entitytupletranslators/ExternalFileTupleTranslator.java | 2 ++
.../entitytupletranslators/FeedConnectionTupleTranslator.java | 1 +
.../metadata/entitytupletranslators/FeedPolicyTupleTranslator.java | 2 ++
.../metadata/entitytupletranslators/FeedTupleTranslator.java | 2 ++
.../metadata/entitytupletranslators/FunctionTupleTranslator.java | 2 ++
.../metadata/entitytupletranslators/LibraryTupleTranslator.java | 2 ++
.../metadata/entitytupletranslators/NodeTupleTranslator.java | 1 +
.../src/main/java/org/apache/asterix/om/base/AString.java | 1 +
.../org/apache/asterix/om/exceptions/IncompatibleTypeException.java | 1 +
.../apache/asterix/om/exceptions/InvalidExpressionException.java | 1 +
.../org/apache/asterix/om/exceptions/TypeMismatchException.java | 1 +
.../apache/asterix/om/exceptions/UnsupportedItemTypeException.java | 1 +
.../org/apache/asterix/om/exceptions/UnsupportedTypeException.java | 1 +
.../src/main/java/org/apache/asterix/om/functions/FunctionInfo.java | 1 +
.../runtime/evaluators/functions/AbstractNumericArithmeticEval.java | 2 +-
.../asterix/runtime/evaluators/functions/ToObjectDescriptor.java | 2 ++
.../asterix/runtime/exceptions/IncompatibleTypeException.java | 1 +
.../asterix/runtime/exceptions/InvalidDataFormatException.java | 1 +
.../org/apache/asterix/runtime/exceptions/OverflowException.java | 2 ++
.../apache/asterix/runtime/exceptions/TypeMismatchException.java | 1 +
.../org/apache/asterix/runtime/exceptions/UnderflowException.java | 1 +
.../asterix/runtime/exceptions/UnsupportedItemTypeException.java | 1 +
.../apache/asterix/runtime/exceptions/UnsupportedTypeException.java | 1 +
.../org/apache/asterix/runtime/functions/FunctionCollection.java | 1 +
.../asterix/transaction/management/service/logging/LogBuffer.java | 1 +
.../apache/hyracks/api/client/HyracksClientInterfaceFunctions.java | 1 +
.../java/org/apache/hyracks/api/job/resource/ClusterCapacity.java | 1 +
.../main/java/org/apache/hyracks/api/job/resource/NodeCapacity.java | 1 +
.../main/java/org/apache/hyracks/client/stats/AggregateCounter.java | 1 +
.../org/apache/hyracks/control/common/config/ConfigManager.java | 6 ++++++
.../org/apache/hyracks/control/common/config/IConfigSetter.java | 2 ++
.../org/apache/hyracks/control/common/controllers/CCConfig.java | 1 +
.../apache/hyracks/control/common/job/profiling/OperatorStats.java | 1 +
.../apache/hyracks/control/common/job/profiling/StatsCollector.java | 1 +
.../hyracks/control/common/job/profiling/counters/Counter.java | 2 ++
.../java/org/apache/hyracks/data/std/primitive/DoublePointable.java | 2 ++
.../org/apache/hyracks/data/std/primitive/IntegerPointable.java | 2 ++
.../hyracks/dataflow/common/data/partition/range/RangeMap.java | 2 ++
.../storage/am/rtree/frames/RTreeNSMInteriorFrameFactory.java | 2 ++
.../hyracks/storage/am/rtree/frames/RTreeNSMLeafFrameFactory.java | 1 +
52 files changed, 75 insertions(+), 1 deletion(-)
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ExecutionPlans.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ExecutionPlans.java
index d77164c..511b74c 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ExecutionPlans.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ExecutionPlans.java
@@ -21,6 +21,7 @@ package org.apache.asterix.translator;
import java.io.Serializable;
public class ExecutionPlans implements Serializable {
+ private static final long serialVersionUID = 6853904213354224457L;
private String expressionTree;
private String rewrittenExpressionTree;
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java
index db9b743..9bc86da 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java
@@ -75,6 +75,8 @@ public interface IStatementExecutor {
}
class Stats implements Serializable {
+ private static final long serialVersionUID = 5885273238208454610L;
+
private long count;
private long size;
private long processedObjects;
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ResultProperties.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ResultProperties.java
index 4866c6d..84d3885 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ResultProperties.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ResultProperties.java
@@ -21,6 +21,7 @@ package org.apache.asterix.translator;
import java.io.Serializable;
public class ResultProperties implements Serializable {
+ private static final long serialVersionUID = -4741260459407538016L;
public static final long DEFAULT_MAX_READS = 1;
private final IStatementExecutor.ResultDelivery delivery;
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ReplicationException.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ReplicationException.java
index 034d668..a746316 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ReplicationException.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ReplicationException.java
@@ -19,6 +19,7 @@
package org.apache.asterix.common.exceptions;
public class ReplicationException extends RuntimeException {
+ private static final long serialVersionUID = 8035037902984423617L;
public ReplicationException(Throwable cause) {
super(cause);
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/messaging/CcIdentifiedMessage.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/messaging/CcIdentifiedMessage.java
index d8a68ef..71901e1 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/messaging/CcIdentifiedMessage.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/messaging/CcIdentifiedMessage.java
@@ -24,6 +24,8 @@ import org.apache.asterix.common.messaging.api.ICcIdentifiedMessage;
import org.apache.hyracks.api.control.CcId;
public abstract class CcIdentifiedMessage implements ICcIdentifiedMessage, Serializable {
+ private static final long serialVersionUID = -7529473341458281278L;
+
private CcId ccId;
@Override
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/NcLocalCounters.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/NcLocalCounters.java
index 7cd61d8..5cf6724 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/NcLocalCounters.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/NcLocalCounters.java
@@ -27,6 +27,7 @@ import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.control.nc.NodeControllerService;
public class NcLocalCounters implements Serializable {
+ private static final long serialVersionUID = 3798954558299915995L;
private final long maxResourceId;
private final long maxTxnId;
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/SqlppParseException.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/SqlppParseException.java
index 52752bb..5cd4f8f 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/SqlppParseException.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/SqlppParseException.java
@@ -22,6 +22,7 @@ package org.apache.asterix.lang.sqlpp.parser;
import org.apache.hyracks.api.exceptions.SourceLocation;
public final class SqlppParseException extends ParseException {
+ private static final long serialVersionUID = -7395094812307808714L;
private final SourceLocation sourceLoc;
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/CachingTxnIdFactory.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/CachingTxnIdFactory.java
index f530afe..a284658 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/CachingTxnIdFactory.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/CachingTxnIdFactory.java
@@ -98,5 +98,6 @@ class CachingTxnIdFactory implements ITxnIdFactory {
}
private static class BlockExhaustedException extends Exception {
+ private static final long serialVersionUID = 8967868415735213490L;
}
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/CompactionPolicyTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/CompactionPolicyTupleTranslator.java
index 6595d97..38f4206 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/CompactionPolicyTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/CompactionPolicyTupleTranslator.java
@@ -38,6 +38,8 @@ import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
* Translates a Dataset metadata entity to an ITupleReference and vice versa.
*/
public class CompactionPolicyTupleTranslator extends AbstractTupleTranslator<CompactionPolicy> {
+ private static final long serialVersionUID = 5291424952240239023L;
+
// Field indexes of serialized CompactionPolicy in a tuple.
// Key field.
public static final int COMPACTION_POLICY_DATAVERSE_NAME_FIELD_INDEX = 0;
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasourceAdapterTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasourceAdapterTupleTranslator.java
index a58e5d6..8f630cf 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasourceAdapterTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasourceAdapterTupleTranslator.java
@@ -38,6 +38,7 @@ import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
public class DatasourceAdapterTupleTranslator extends AbstractTupleTranslator<DatasourceAdapter> {
+ private static final long serialVersionUID = 6183434454125673504L;
// Field indexes of serialized Adapter in a tuple.
// First key field.
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java
index 6721327..32951d5 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java
@@ -61,6 +61,8 @@ import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
* Translates a Datatype metadata entity to an ITupleReference and vice versa.
*/
public class DatatypeTupleTranslator extends AbstractTupleTranslator<Datatype> {
+ private static final long serialVersionUID = -2324433490801381399L;
+
// Field indexes of serialized Dataset in a tuple.
// First key field.
public static final int DATATYPE_DATAVERSENAME_TUPLE_FIELD_INDEX = 0;
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java
index 3100b10..133ab35 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java
@@ -42,6 +42,8 @@ import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
* Translates a Dataverse metadata entity to an ITupleReference and vice versa.
*/
public class DataverseTupleTranslator extends AbstractTupleTranslator<Dataverse> {
+ private static final long serialVersionUID = -3196752600543191613L;
+
// Field indexes of serialized Dataverse in a tuple.
// Key field.
public static final int DATAVERSE_DATAVERSENAME_TUPLE_FIELD_INDEX = 0;
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/ExternalFileTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/ExternalFileTupleTranslator.java
index d058d90..a9fada0 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/ExternalFileTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/ExternalFileTupleTranslator.java
@@ -43,6 +43,8 @@ import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
public class ExternalFileTupleTranslator extends AbstractTupleTranslator<ExternalFile> {
+ private static final long serialVersionUID = -4966958481117396312L;
+
// Field indexes of serialized ExternalFile in a tuple.
// First key field.
public static final int EXTERNAL_FILE_DATAVERSENAME_TUPLE_FIELD_INDEX = 0;
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedConnectionTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedConnectionTupleTranslator.java
index 5b3a915..800e5df 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedConnectionTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedConnectionTupleTranslator.java
@@ -46,6 +46,7 @@ import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
public class FeedConnectionTupleTranslator extends AbstractTupleTranslator<FeedConnection> {
+ private static final long serialVersionUID = -1798961999812829511L;
public static final int FEED_CONN_DATAVERSE_NAME_FIELD_INDEX = 0;
public static final int FEED_CONN_FEED_NAME_FIELD_INDEX = 1;
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedPolicyTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedPolicyTupleTranslator.java
index e80b96f..a7fc822 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedPolicyTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedPolicyTupleTranslator.java
@@ -51,6 +51,8 @@ import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
* Translates a Dataset metadata entity to an ITupleReference and vice versa.
*/
public class FeedPolicyTupleTranslator extends AbstractTupleTranslator<FeedPolicyEntity> {
+ private static final long serialVersionUID = 826298425589924684L;
+
// Field indexes of serialized FeedPolicy in a tuple.
// Key field.
public static final int FEED_POLICY_DATAVERSE_NAME_FIELD_INDEX = 0;
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java
index 4e1056e..8cc801d 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java
@@ -51,6 +51,8 @@ import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
* Translates a Feed metadata entity to an ITupleReference and vice versa.
*/
public class FeedTupleTranslator extends AbstractTupleTranslator<Feed> {
+ private static final long serialVersionUID = -5967081194106401387L;
+
// Field indexes of serialized Feed in a tuple.
// Key field.
public static final int FEED_DATAVERSE_NAME_FIELD_INDEX = 0;
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java
index 9085235..c4e42d1 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java
@@ -47,6 +47,8 @@ import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
* Translates a Function metadata entity to an ITupleReference and vice versa.
*/
public class FunctionTupleTranslator extends AbstractTupleTranslator<Function> {
+ private static final long serialVersionUID = 1147594449575992161L;
+
// Field indexes of serialized Function in a tuple.
// First key field.
public static final int FUNCTION_DATAVERSENAME_TUPLE_FIELD_INDEX = 0;
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java
index f001ec4..8d216ff 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java
@@ -39,6 +39,8 @@ import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
* Translates a Library metadata entity to an ITupleReference and vice versa.
*/
public class LibraryTupleTranslator extends AbstractTupleTranslator<Library> {
+ private static final long serialVersionUID = -7574173417999340281L;
+
// Field indexes of serialized Library in a tuple.
// First key field.
public static final int LIBRARY_DATAVERSENAME_TUPLE_FIELD_INDEX = 0;
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeTupleTranslator.java
index 80e3621..8510535 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeTupleTranslator.java
@@ -36,6 +36,7 @@ import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
* Translates a Node metadata entity to an ITupleReference and vice versa.
*/
public class NodeTupleTranslator extends AbstractTupleTranslator<Node> {
+ private static final long serialVersionUID = -5257435809246039182L;
// Field indexes of serialized Node in a tuple.
// First key field.
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AString.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AString.java
index e6b8f7c8..678ab16 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AString.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AString.java
@@ -27,6 +27,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
public class AString implements IAObject, Serializable {
+ private static final long serialVersionUID = -5482850888016554079L;
protected String value;
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/IncompatibleTypeException.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/IncompatibleTypeException.java
index 1a5d5c6..3035bd5 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/IncompatibleTypeException.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/IncompatibleTypeException.java
@@ -26,6 +26,7 @@ import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.api.exceptions.SourceLocation;
public class IncompatibleTypeException extends CompilationException {
+ private static final long serialVersionUID = 8381231750372706059L;
// Incompatible input parameters, e.g., "1.0" > 1.0
public IncompatibleTypeException(FunctionIdentifier fid, ATypeTag typeTagLeft, ATypeTag typeTagRight) {
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/InvalidExpressionException.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/InvalidExpressionException.java
index 099930f..c3c8fd2 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/InvalidExpressionException.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/InvalidExpressionException.java
@@ -30,6 +30,7 @@ import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.api.exceptions.SourceLocation;
public class InvalidExpressionException extends CompilationException {
+ private static final long serialVersionUID = -3601791480135148643L;
public InvalidExpressionException(FunctionIdentifier fid, int index, ILogicalExpression actualExpr,
LogicalExpressionTag... exprKinds) {
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/TypeMismatchException.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/TypeMismatchException.java
index 14622aa..bcf8b84 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/TypeMismatchException.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/TypeMismatchException.java
@@ -29,6 +29,7 @@ import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.api.exceptions.SourceLocation;
public class TypeMismatchException extends CompilationException {
+ private static final long serialVersionUID = -3069967719104299912L;
// Function parameter type mismatch.
public TypeMismatchException(FunctionIdentifier fid, Integer i, ATypeTag actualTypeTag,
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/UnsupportedItemTypeException.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/UnsupportedItemTypeException.java
index 06491f6..d0f0bf2 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/UnsupportedItemTypeException.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/UnsupportedItemTypeException.java
@@ -26,6 +26,7 @@ import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.api.exceptions.SourceLocation;
public class UnsupportedItemTypeException extends CompilationException {
+ private static final long serialVersionUID = -8192292060995420548L;
// Unsupported item type.
public UnsupportedItemTypeException(FunctionIdentifier fid, ATypeTag itemTypeTag) {
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/UnsupportedTypeException.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/UnsupportedTypeException.java
index 5441cf4..c4a8372 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/UnsupportedTypeException.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/UnsupportedTypeException.java
@@ -26,6 +26,7 @@ import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.api.exceptions.SourceLocation;
public class UnsupportedTypeException extends CompilationException {
+ private static final long serialVersionUID = -641723317638101625L;
// Unsupported input type.
public UnsupportedTypeException(FunctionIdentifier fid, ATypeTag actualTypeTag) {
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/FunctionInfo.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/FunctionInfo.java
index 994b2a9..484f374 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/FunctionInfo.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/FunctionInfo.java
@@ -26,6 +26,7 @@ import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
public class FunctionInfo implements IFunctionInfo {
+ private static final long serialVersionUID = 5460606629941107898L;
private final FunctionIdentifier functionIdentifier;
private final boolean isFunctional;
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractNumericArithmeticEval.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractNumericArithmeticEval.java
index 746273f..fac7847 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractNumericArithmeticEval.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractNumericArithmeticEval.java
@@ -64,8 +64,8 @@ import org.apache.hyracks.data.std.primitive.VoidPointable;
import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
import org.apache.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
-@SuppressWarnings("serial")
public abstract class AbstractNumericArithmeticEval extends AbstractScalarFunctionDynamicDescriptor {
+ private static final long serialVersionUID = 527445160961348706L;
/**
* abstract method for arithmetic operation between two integer values
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ToObjectDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ToObjectDescriptor.java
index 82dbd95..b981fcf 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ToObjectDescriptor.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ToObjectDescriptor.java
@@ -38,6 +38,8 @@ import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
import org.apache.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
public class ToObjectDescriptor extends AbstractScalarFunctionDynamicDescriptor {
+ private static final long serialVersionUID = -4146417699529927812L;
+
public static final IFunctionDescriptorFactory FACTORY = new IFunctionDescriptorFactory() {
@Override
public IFunctionDescriptor createFunctionDescriptor() {
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/IncompatibleTypeException.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/IncompatibleTypeException.java
index 503958b..ebb7222 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/IncompatibleTypeException.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/IncompatibleTypeException.java
@@ -26,6 +26,7 @@ import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.api.exceptions.SourceLocation;
public class IncompatibleTypeException extends RuntimeDataException {
+ private static final long serialVersionUID = 3967461820552150509L;
// Incompatible input parameters, e.g., "1.0" > 1.0
public IncompatibleTypeException(SourceLocation sourceLoc, FunctionIdentifier fid, byte typeTagLeft,
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/InvalidDataFormatException.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/InvalidDataFormatException.java
index 3350fed..bb94ca6 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/InvalidDataFormatException.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/InvalidDataFormatException.java
@@ -26,6 +26,7 @@ import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.api.exceptions.SourceLocation;
public class InvalidDataFormatException extends RuntimeDataException {
+ private static final long serialVersionUID = 7927137063741221011L;
public InvalidDataFormatException(SourceLocation sourceLoc, FunctionIdentifier fid, byte expectedTypeTag) {
super(ErrorCode.INVALID_FORMAT, sourceLoc, fid.getName(),
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/OverflowException.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/OverflowException.java
index fde465d..1d84a60 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/OverflowException.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/OverflowException.java
@@ -25,6 +25,8 @@ import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.api.exceptions.SourceLocation;
public class OverflowException extends RuntimeDataException {
+ private static final long serialVersionUID = -9108000688790364894L;
+
// Overflow.
public OverflowException(SourceLocation sourceLoc, FunctionIdentifier fid) {
super(ErrorCode.OVERFLOW, sourceLoc, fid.getName());
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/TypeMismatchException.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/TypeMismatchException.java
index 36f6813..d5472d0 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/TypeMismatchException.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/TypeMismatchException.java
@@ -29,6 +29,7 @@ import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.api.exceptions.SourceLocation;
public class TypeMismatchException extends RuntimeDataException {
+ private static final long serialVersionUID = -668005043013338591L;
// Function parameter type mismatch.
public TypeMismatchException(FunctionIdentifier fid, Integer i, byte actualTypeTag, byte... expectedTypeTags) {
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnderflowException.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnderflowException.java
index 27bbcaa..926367c 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnderflowException.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnderflowException.java
@@ -25,6 +25,7 @@ import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.api.exceptions.SourceLocation;
public class UnderflowException extends RuntimeDataException {
+ private static final long serialVersionUID = -8808136503804136973L;
// Underflow.
public UnderflowException(SourceLocation sourceLoc, FunctionIdentifier fid) {
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnsupportedItemTypeException.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnsupportedItemTypeException.java
index 25cfe29..680f20e 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnsupportedItemTypeException.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnsupportedItemTypeException.java
@@ -26,6 +26,7 @@ import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.api.exceptions.SourceLocation;
public class UnsupportedItemTypeException extends RuntimeDataException {
+ private static final long serialVersionUID = -3443141044058396191L;
// Unsupported item type.
public UnsupportedItemTypeException(SourceLocation sourceLoc, FunctionIdentifier fid, byte itemTypeTag) {
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnsupportedTypeException.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnsupportedTypeException.java
index 32e9239..91a571e 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnsupportedTypeException.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/exceptions/UnsupportedTypeException.java
@@ -26,6 +26,7 @@ import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.api.exceptions.SourceLocation;
public class UnsupportedTypeException extends RuntimeDataException {
+ private static final long serialVersionUID = 1627870063930883067L;
// Unsupported input type.
public UnsupportedTypeException(SourceLocation sourceLoc, FunctionIdentifier fid, byte actualTypeTag) {
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java
index 6b0b5d5..d885ce5 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java
@@ -374,6 +374,7 @@ import org.apache.asterix.runtime.unnestingfunctions.std.SubsetCollectionDescrip
* This class holds a list of function descriptor factories.
*/
public final class FunctionCollection implements IFunctionCollection {
+ private static final long serialVersionUID = -8308873930697425307L;
private static final String FACTORY = "FACTORY";
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java
index 4085fb4..28290bb 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java
@@ -324,6 +324,7 @@ public class LogBuffer implements ILogBuffer {
}
private class MutableTxnId extends TxnId {
+ private static final long serialVersionUID = 579540092176284383L;
public MutableTxnId(long id) {
super(id);
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceFunctions.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceFunctions.java
index 72bdc3e..36ce18f 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceFunctions.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceFunctions.java
@@ -446,6 +446,7 @@ public class HyracksClientInterfaceFunctions {
}
public static class ThreadDumpFunction extends Function {
+ private static final long serialVersionUID = 2956155746070390274L;
private final String node;
public ThreadDumpFunction(String node) {
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/resource/ClusterCapacity.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/resource/ClusterCapacity.java
index 712d575..6b03968 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/resource/ClusterCapacity.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/resource/ClusterCapacity.java
@@ -28,6 +28,7 @@ import org.apache.hyracks.api.exceptions.HyracksException;
import org.apache.hyracks.util.StorageUtil;
public class ClusterCapacity implements IClusterCapacity {
+ private static final long serialVersionUID = 3487998182013966747L;
private long aggregatedMemoryByteSize = 0;
private int aggregatedCores = 0;
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/resource/NodeCapacity.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/resource/NodeCapacity.java
index 7902e7d..87988fb 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/resource/NodeCapacity.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/resource/NodeCapacity.java
@@ -25,6 +25,7 @@ import java.io.Serializable;
* Specifies the capacity for computation on a particular node, i.e., a NCDriver process.
*/
public class NodeCapacity implements Serializable {
+ private static final long serialVersionUID = -6124502740160006465L;
// All memory for computations -- this is not changed during the lifetime of a running instance.
private final long memoryByteSize;
diff --git a/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/stats/AggregateCounter.java b/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/stats/AggregateCounter.java
index 5d51340..6cb90e3 100644
--- a/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/stats/AggregateCounter.java
+++ b/hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/stats/AggregateCounter.java
@@ -22,6 +22,7 @@ package org.apache.hyracks.client.stats;
import org.apache.hyracks.control.common.job.profiling.counters.Counter;
public class AggregateCounter extends Counter {
+ private static final long serialVersionUID = 9140555872026977436L;
private long sum = 0;
private long numOfItems = 0;
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
index 1dae48c..4b3934b 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
@@ -384,6 +384,8 @@ public class ConfigManager implements IConfigManager, Serializable {
return map.get(option);
} else {
Object value = resolveDefault(option, new ConfigManagerApplicationConfig(this) {
+ private static final long serialVersionUID = -5505664489371709335L;
+
@Override
public Object getStatic(IOption option) {
return getOrDefault(map, option, nodeId);
@@ -453,6 +455,8 @@ public class ConfigManager implements IConfigManager, Serializable {
final Map<IOption, Object> nodeMap = nodeSpecificDefaultMap.get(nodeId);
Map<IOption, Object> nodeEffectiveMap = getNodeEffectiveMap(nodeId);
return new ConfigManagerApplicationConfig(this) {
+ private static final long serialVersionUID = 3166949269001016392L;
+
@Override
public Object getStatic(IOption option) {
if (!nodeEffectiveMap.containsKey(option)) {
@@ -582,6 +586,8 @@ public class ConfigManager implements IConfigManager, Serializable {
}
private static class NoOpMapMutator implements CompositeMap.MapMutator<IOption, Object> {
+ private static final long serialVersionUID = -7239155627408457440L;
+
@Override
public Object put(CompositeMap<IOption, Object> compositeMap, Map<IOption, Object>[] maps, IOption iOption,
Object o) {
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/IConfigSetter.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/IConfigSetter.java
index 2234cca..72265f9 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/IConfigSetter.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/IConfigSetter.java
@@ -23,6 +23,8 @@ public interface IConfigSetter {
void set(String nodeId, Object value, boolean isDefault) throws SetException;
class SetException extends RuntimeException {
+ private static final long serialVersionUID = 700327181143546634L;
+
public SetException(Exception e) {
super(e);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java
index 1cb2d05..57cf339 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java
@@ -41,6 +41,7 @@ import org.ini4j.Ini;
@SuppressWarnings("SameParameterValue")
public class CCConfig extends ControllerConfig {
+ private static final long serialVersionUID = 4118822454622201176L;
public enum Option implements IOption {
APP_CLASS(STRING, (String) null),
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/OperatorStats.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/OperatorStats.java
index 718ac3d..185e197 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/OperatorStats.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/OperatorStats.java
@@ -27,6 +27,7 @@ import org.apache.hyracks.api.job.profiling.counters.ICounter;
import org.apache.hyracks.control.common.job.profiling.counters.Counter;
public class OperatorStats implements IOperatorStats {
+ private static final long serialVersionUID = 6401830963367567167L;
public final String operatorName;
public final ICounter tupleCounter;
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/StatsCollector.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/StatsCollector.java
index 90cdc72..e95c107 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/StatsCollector.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/StatsCollector.java
@@ -29,6 +29,7 @@ import org.apache.hyracks.api.job.profiling.IOperatorStats;
import org.apache.hyracks.api.job.profiling.IStatsCollector;
public class StatsCollector implements IStatsCollector {
+ private static final long serialVersionUID = 6858817639895434577L;
private final Map<String, IOperatorStats> operatorStatsMap = new HashMap<>();
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/counters/Counter.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/counters/Counter.java
index e914878..0bcb246 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/counters/Counter.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/counters/Counter.java
@@ -23,6 +23,8 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.hyracks.api.job.profiling.counters.ICounter;
public class Counter implements ICounter {
+ private static final long serialVersionUID = -3935601595055562080L;
+
private final String name;
private final AtomicLong counter;
diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/DoublePointable.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/DoublePointable.java
index 9306818..f34bb13 100644
--- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/DoublePointable.java
+++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/DoublePointable.java
@@ -35,6 +35,8 @@ public final class DoublePointable extends AbstractPointable implements IHashabl
public static final DoublePointableFactory FACTORY = new DoublePointableFactory();
public static final ITypeTraits TYPE_TRAITS = new FixedLengthTypeTrait(8) {
+ private static final long serialVersionUID = 7348262203696059687L;
+
//TODO fix RTREE logic based on class comparision in LSMRTreeUtils#proposeBestLinearizer
@Override
public boolean isFixedLength() {
diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/IntegerPointable.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/IntegerPointable.java
index b36d6a4..9c29ddd 100644
--- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/IntegerPointable.java
+++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/IntegerPointable.java
@@ -35,6 +35,8 @@ public final class IntegerPointable extends AbstractPointable implements IHashab
public static final IntegerPointableFactory FACTORY = new IntegerPointableFactory();
public static final ITypeTraits TYPE_TRAITS = new FixedLengthTypeTrait(4) {
+ private static final long serialVersionUID = -7178318032449879790L;
+
//TODO fix RTREE logic based on class comparision in LSMRTreeUtils#proposeBestLinearizer
@Override
public boolean isFixedLength() {
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/data/partition/range/RangeMap.java b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/data/partition/range/RangeMap.java
index 98acbc0..0495cfa 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/data/partition/range/RangeMap.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/data/partition/range/RangeMap.java
@@ -28,6 +28,8 @@ import org.apache.hyracks.data.std.primitive.VoidPointable;
* The first split value for each field followed by the second split value for each field, etc.
*/
public class RangeMap implements IRangeMap, Serializable {
+ private static final long serialVersionUID = -7523433293419648234L;
+
private final int fields;
private final byte[] bytes;
private final int[] offsets;
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrameFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrameFactory.java
index 5550e1f..2bd8c59 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrameFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrameFactory.java
@@ -26,6 +26,8 @@ import org.apache.hyracks.storage.am.rtree.tuples.RTreeTypeAwareTupleWriterFacto
public class RTreeNSMInteriorFrameFactory extends RTreeFrameFactory {
+ private static final long serialVersionUID = -8880568594091620229L;
+
public RTreeNSMInteriorFrameFactory(RTreeTypeAwareTupleWriterFactory tupleWriterFactory,
IPrimitiveValueProviderFactory[] keyValueProviderFactories, RTreePolicyType rtreePolicyType,
boolean isPointMBR) {
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMLeafFrameFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMLeafFrameFactory.java
index 16b22c0..166ece9 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMLeafFrameFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMLeafFrameFactory.java
@@ -25,6 +25,7 @@ import org.apache.hyracks.storage.am.rtree.api.IRTreeLeafFrame;
import org.apache.hyracks.storage.am.rtree.tuples.RTreeTypeAwareTupleWriterFactory;
public class RTreeNSMLeafFrameFactory extends RTreeFrameFactory {
+ private static final long serialVersionUID = 1360338463029768516L;
public RTreeNSMLeafFrameFactory(RTreeTypeAwareTupleWriterFactory tupleWriterFactory,
IPrimitiveValueProviderFactory[] keyValueProviderFactories, RTreePolicyType rtreePolicyType,
[asterixdb] 03/03: Merge "Merge commit '2dc111d' from
'stabilization-f69489' into 'master'"
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit d2c70717e9c9a41864b9344913905260ba90c3c3
Merge: ddec765 5ae6b5d
Author: Apache AsterixDB Gerrit <do...@asterixdb.incubator.apache.org>
AuthorDate: Mon Feb 4 12:58:10 2019 -0800
Merge "Merge commit '2dc111d' from 'stabilization-f69489' into 'master'"
.../org/apache/asterix/translator/ExecutionPlans.java | 1 +
.../org/apache/asterix/translator/IStatementExecutor.java | 2 ++
.../org/apache/asterix/translator/ResultProperties.java | 1 +
.../asterix/common/exceptions/ReplicationException.java | 1 +
.../asterix/common/messaging/CcIdentifiedMessage.java | 2 ++
.../org/apache/asterix/common/utils/NcLocalCounters.java | 1 +
.../asterix/lang/sqlpp/parser/SqlppParseException.java | 1 +
.../org/apache/asterix/metadata/CachingTxnIdFactory.java | 1 +
.../CompactionPolicyTupleTranslator.java | 2 ++
.../DatasourceAdapterTupleTranslator.java | 1 +
.../entitytupletranslators/DatatypeTupleTranslator.java | 2 ++
.../entitytupletranslators/DataverseTupleTranslator.java | 2 ++
.../ExternalFileTupleTranslator.java | 2 ++
.../FeedConnectionTupleTranslator.java | 1 +
.../entitytupletranslators/FeedPolicyTupleTranslator.java | 2 ++
.../entitytupletranslators/FeedTupleTranslator.java | 2 ++
.../entitytupletranslators/FunctionTupleTranslator.java | 2 ++
.../entitytupletranslators/LibraryTupleTranslator.java | 2 ++
.../entitytupletranslators/NodeTupleTranslator.java | 1 +
.../src/main/java/org/apache/asterix/om/base/AString.java | 1 +
.../asterix/om/exceptions/IncompatibleTypeException.java | 1 +
.../asterix/om/exceptions/InvalidExpressionException.java | 1 +
.../asterix/om/exceptions/TypeMismatchException.java | 1 +
.../om/exceptions/UnsupportedItemTypeException.java | 1 +
.../asterix/om/exceptions/UnsupportedTypeException.java | 1 +
.../org/apache/asterix/om/functions/FunctionInfo.java | 1 +
.../functions/AbstractNumericArithmeticEval.java | 2 +-
.../runtime/evaluators/functions/ToObjectDescriptor.java | 2 ++
.../runtime/exceptions/IncompatibleTypeException.java | 1 +
.../runtime/exceptions/InvalidDataFormatException.java | 1 +
.../asterix/runtime/exceptions/OverflowException.java | 2 ++
.../asterix/runtime/exceptions/TypeMismatchException.java | 1 +
.../asterix/runtime/exceptions/UnderflowException.java | 1 +
.../runtime/exceptions/UnsupportedItemTypeException.java | 1 +
.../runtime/exceptions/UnsupportedTypeException.java | 1 +
.../asterix/runtime/functions/FunctionCollection.java | 1 +
.../transaction/management/service/logging/LogBuffer.java | 1 +
.../api/client/HyracksClientInterfaceFunctions.java | 1 +
.../apache/hyracks/api/job/resource/ClusterCapacity.java | 1 +
.../org/apache/hyracks/api/job/resource/NodeCapacity.java | 1 +
.../org/apache/hyracks/client/stats/AggregateCounter.java | 1 +
.../hyracks/control/common/config/ConfigManager.java | 6 ++++++
.../hyracks/control/common/config/IConfigSetter.java | 2 ++
.../hyracks/control/common/controllers/CCConfig.java | 1 +
.../control/common/job/profiling/OperatorStats.java | 1 +
.../control/common/job/profiling/StatsCollector.java | 1 +
.../control/common/job/profiling/counters/Counter.java | 2 ++
.../hyracks/data/std/primitive/DoublePointable.java | 2 ++
.../hyracks/data/std/primitive/IntegerPointable.java | 2 ++
.../dataflow/common/data/partition/range/RangeMap.java | 15 ++++++++-------
.../am/rtree/frames/RTreeNSMInteriorFrameFactory.java | 2 ++
.../storage/am/rtree/frames/RTreeNSMLeafFrameFactory.java | 1 +
52 files changed, 81 insertions(+), 8 deletions(-)
[asterixdb] 02/03: Merge commit '2dc111d' from
'stabilization-f69489' into 'master'
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 5ae6b5d6da66e4d047e4549e39fe8c661a392f1e
Merge: 53a5c22 2dc111d
Author: Michael Blow <mb...@apache.org>
AuthorDate: Mon Feb 4 10:17:13 2019 -0500
Merge commit '2dc111d' from 'stabilization-f69489' into 'master'
Change-Id: I84505e94bdfc916d389288b36612081e778b1e53
.../org/apache/asterix/translator/ExecutionPlans.java | 1 +
.../org/apache/asterix/translator/IStatementExecutor.java | 2 ++
.../org/apache/asterix/translator/ResultProperties.java | 1 +
.../asterix/common/exceptions/ReplicationException.java | 1 +
.../asterix/common/messaging/CcIdentifiedMessage.java | 2 ++
.../org/apache/asterix/common/utils/NcLocalCounters.java | 1 +
.../asterix/lang/sqlpp/parser/SqlppParseException.java | 1 +
.../org/apache/asterix/metadata/CachingTxnIdFactory.java | 1 +
.../CompactionPolicyTupleTranslator.java | 2 ++
.../DatasourceAdapterTupleTranslator.java | 1 +
.../entitytupletranslators/DatatypeTupleTranslator.java | 2 ++
.../entitytupletranslators/DataverseTupleTranslator.java | 2 ++
.../ExternalFileTupleTranslator.java | 2 ++
.../FeedConnectionTupleTranslator.java | 1 +
.../entitytupletranslators/FeedPolicyTupleTranslator.java | 2 ++
.../entitytupletranslators/FeedTupleTranslator.java | 2 ++
.../entitytupletranslators/FunctionTupleTranslator.java | 2 ++
.../entitytupletranslators/LibraryTupleTranslator.java | 2 ++
.../entitytupletranslators/NodeTupleTranslator.java | 1 +
.../src/main/java/org/apache/asterix/om/base/AString.java | 1 +
.../asterix/om/exceptions/IncompatibleTypeException.java | 1 +
.../asterix/om/exceptions/InvalidExpressionException.java | 1 +
.../asterix/om/exceptions/TypeMismatchException.java | 1 +
.../om/exceptions/UnsupportedItemTypeException.java | 1 +
.../asterix/om/exceptions/UnsupportedTypeException.java | 1 +
.../org/apache/asterix/om/functions/FunctionInfo.java | 1 +
.../functions/AbstractNumericArithmeticEval.java | 2 +-
.../runtime/evaluators/functions/ToObjectDescriptor.java | 2 ++
.../runtime/exceptions/IncompatibleTypeException.java | 1 +
.../runtime/exceptions/InvalidDataFormatException.java | 1 +
.../asterix/runtime/exceptions/OverflowException.java | 2 ++
.../asterix/runtime/exceptions/TypeMismatchException.java | 1 +
.../asterix/runtime/exceptions/UnderflowException.java | 1 +
.../runtime/exceptions/UnsupportedItemTypeException.java | 1 +
.../runtime/exceptions/UnsupportedTypeException.java | 1 +
.../asterix/runtime/functions/FunctionCollection.java | 1 +
.../transaction/management/service/logging/LogBuffer.java | 1 +
.../api/client/HyracksClientInterfaceFunctions.java | 1 +
.../apache/hyracks/api/job/resource/ClusterCapacity.java | 1 +
.../org/apache/hyracks/api/job/resource/NodeCapacity.java | 1 +
.../org/apache/hyracks/client/stats/AggregateCounter.java | 1 +
.../hyracks/control/common/config/ConfigManager.java | 6 ++++++
.../hyracks/control/common/config/IConfigSetter.java | 2 ++
.../hyracks/control/common/controllers/CCConfig.java | 1 +
.../control/common/job/profiling/OperatorStats.java | 1 +
.../control/common/job/profiling/StatsCollector.java | 1 +
.../control/common/job/profiling/counters/Counter.java | 2 ++
.../hyracks/data/std/primitive/DoublePointable.java | 2 ++
.../hyracks/data/std/primitive/IntegerPointable.java | 2 ++
.../dataflow/common/data/partition/range/RangeMap.java | 15 ++++++++-------
.../am/rtree/frames/RTreeNSMInteriorFrameFactory.java | 2 ++
.../storage/am/rtree/frames/RTreeNSMLeafFrameFactory.java | 1 +
52 files changed, 81 insertions(+), 8 deletions(-)
diff --cc hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/data/partition/range/RangeMap.java
index 714e3c0,0495cfa..3719144
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/data/partition/range/RangeMap.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/data/partition/range/RangeMap.java
@@@ -19,79 -19,72 +19,80 @@@
package org.apache.hyracks.dataflow.common.data.partition.range;
import java.io.Serializable;
-
-import org.apache.hyracks.data.std.api.IPointable;
-import org.apache.hyracks.data.std.primitive.VoidPointable;
+import java.util.Arrays;
- import java.util.Objects;
/**
- * The range map stores the field split values in an byte array.
- * The first split value for each field followed by the second split value for each field, etc.
+ * <pre>
+ * The range map stores the fields split values in a byte array.
+ * The first split value for each field followed by the second split value for each field, etc. For example:
+ * split_point_idx0 split_point_idx1 split_point_idx2 split_point_idx3 split_point_idx4
+ * in the byte[]: f0,f1,f2 f0,f1,f2 f0,f1,f2 f0,f1,f2 f0,f1,f2
+ * numFields would be = 3
+ * we have 5 split points, which gives us 6 partitions:
+ * p1 | p2 | p3 | p4 | p5 | p6
+ * sp0 sp1 sp2 sp3 sp4
+ * endOffsets.length would be = 15
+ * </pre>
*/
-public class RangeMap implements IRangeMap, Serializable {
+public class RangeMap implements Serializable {
- private final int numFields;
+ private static final long serialVersionUID = -7523433293419648234L;
+
+ private final int fields;
private final byte[] bytes;
- private final int[] offsets;
+ private final int[] endOffsets;
- public RangeMap(int fields, byte[] bytes, int[] offsets) {
- this.fields = fields;
+ public RangeMap(int numFields, byte[] bytes, int[] endOffsets) {
- this.numFields = numFields;
++ this.fields = numFields;
this.bytes = bytes;
- this.offsets = offsets;
- }
-
- @Override
- public IPointable getFieldSplit(int columnIndex, int splitIndex) {
- IPointable p = VoidPointable.FACTORY.createPointable();
- int index = getFieldIndex(columnIndex, splitIndex);
- p.set(bytes, getFieldStart(index), getFieldLength(index));
- return p;
+ this.endOffsets = endOffsets;
}
- @Override
public int getSplitCount() {
- return endOffsets.length / numFields;
- return offsets.length / fields;
++ return endOffsets.length / fields;
}
- @Override
- public byte[] getByteArray(int columnIndex, int splitIndex) {
+ public byte[] getByteArray() {
return bytes;
}
- @Override
- public int getTag(int columnIndex, int splitIndex) {
- return getFieldTag(getFieldIndex(columnIndex, splitIndex));
+ public int getTag(int fieldIndex, int splitIndex) {
+ return getSplitValueTag(getSplitValueIndex(fieldIndex, splitIndex));
}
- @Override
- public int getStartOffset(int columnIndex, int splitIndex) {
- return getFieldStart(getFieldIndex(columnIndex, splitIndex));
+ public int getStartOffset(int fieldIndex, int splitIndex) {
+ return getSplitValueStart(getSplitValueIndex(fieldIndex, splitIndex));
}
- @Override
- public int getLength(int columnIndex, int splitIndex) {
- return getFieldLength(getFieldIndex(columnIndex, splitIndex));
+ public int getLength(int fieldIndex, int splitIndex) {
+ return getSplitValueLength(getSplitValueIndex(fieldIndex, splitIndex));
}
- private int getFieldIndex(int columnIndex, int splitIndex) {
- return splitIndex * fields + columnIndex;
+ /** Translates fieldIndex & splitIndex into an index which is used to find information about that split value.
+ * The combination of a fieldIndex & splitIndex uniquely identifies a split value of interest.
+ * @param fieldIndex the field index within the splitIndex of interest (0 <= fieldIndex < numFields)
+ * @param splitIndex starts with 0,1,2,.. etc
+ * @return the index of the desired split value that could be used with {@code bytes} & {@code endOffsets}.
+ */
+ private int getSplitValueIndex(int fieldIndex, int splitIndex) {
- return splitIndex * numFields + fieldIndex;
++ return splitIndex * fields + fieldIndex;
}
- private int getFieldTag(int index) {
- return bytes[getFieldStart(index)];
+ /**
+ * @param splitValueIndex is the combination of the split index + the field index within that split index
+ * @return the type tag of a specific field in a specific split point
+ */
+ private int getSplitValueTag(int splitValueIndex) {
+ return bytes[getSplitValueStart(splitValueIndex)];
}
- private int getFieldStart(int index) {
+ /**
+ * @param splitValueIndex is the combination of the split index + the field index within that split index
+ * @return the location of a split value in the byte array {@code bytes}
+ */
+ private int getSplitValueStart(int splitValueIndex) {
int start = 0;
- if (index != 0) {
- start = offsets[index - 1];
+ if (splitValueIndex != 0) {
+ start = endOffsets[splitValueIndex - 1];
}
return start;
}
@@@ -108,21 -97,4 +109,21 @@@
return length;
}
+ @Override
+ public int hashCode() {
- return numFields + Arrays.hashCode(bytes) + Arrays.hashCode(endOffsets);
++ return fields + Arrays.hashCode(bytes) + Arrays.hashCode(endOffsets);
+ }
+
+ @Override
+ public boolean equals(Object object) {
+ if (this == object) {
+ return true;
+ }
+ if (!(object instanceof RangeMap)) {
+ return false;
+ }
+ RangeMap other = (RangeMap) object;
- return numFields == other.numFields && Arrays.equals(endOffsets, other.endOffsets)
++ return fields == other.fields && Arrays.equals(endOffsets, other.endOffsets)
+ && Arrays.equals(bytes, other.bytes);
+ }
}