This is an automated email from the ASF dual-hosted git repository. dlych pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit eaa38d8c2cb82b55505762252055c80edc525ab2 Author: Ali Alsuliman <[email protected]> AuthorDate: Mon Sep 30 11:29:32 2019 -0700 [NO ISSUE][FUN] Clean up of warn utility method - user model changes: no - storage format changes: no - interface changes: no Details: clean up of warnTypeMismatch methods to avoid confusion betweent the two methods. Change-Id: I7ae7c85fa3cc549cfd622f179f36486e016d9643 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/3581 Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> --- .../main/java/org/apache/asterix/om/exceptions/ExceptionUtil.java | 2 +- .../runtime/evaluators/functions/AbstractBinaryStringEval.java | 4 ++-- .../runtime/evaluators/functions/AbstractTripleStringEval.java | 6 +++--- .../runtime/evaluators/functions/AbstractUnaryStringStringEval.java | 2 +- .../runtime/evaluators/functions/StringLengthDescriptor.java | 2 +- .../asterix/runtime/evaluators/functions/StringSplitDescriptor.java | 6 +++--- .../runtime/evaluators/functions/StringToCodePointDescriptor.java | 2 +- .../runtime/evaluators/functions/SubstringAfterDescriptor.java | 4 ++-- .../runtime/evaluators/functions/SubstringBeforeDescriptor.java | 4 ++-- .../functions/bitwise/AbstractBitMultipleValuesEvaluator.java | 4 ++-- .../functions/bitwise/AbstractBitSingleValueEvaluator.java | 2 +- .../functions/bitwise/AbstractBitValuePositionEvaluator.java | 4 ++-- .../evaluators/functions/bitwise/BitValueCountFlagEvaluator.java | 6 +++--- .../evaluators/functions/bitwise/BitValuePositionFlagEvaluator.java | 6 +++--- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/ExceptionUtil.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/ExceptionUtil.java index 6c92673..0791576 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/ExceptionUtil.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/exceptions/ExceptionUtil.java @@ -87,7 +87,7 @@ public class ExceptionUtil { } public static void warnTypeMismatch(IEvaluatorContext ctx, SourceLocation srcLoc, FunctionIdentifier fid, - int argIdx, byte actualType, ATypeTag expectedType) { + byte actualType, int argIdx, ATypeTag expectedType) { IWarningCollector warningCollector = ctx.getWarningCollector(); if (warningCollector.shouldWarn()) { warningCollector.warn(WarningUtil.forAsterix(srcLoc, ErrorCode.TYPE_MISMATCH_FUNCTION, fid.getName(), diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractBinaryStringEval.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractBinaryStringEval.java index 808239d..400126e 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractBinaryStringEval.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractBinaryStringEval.java @@ -90,12 +90,12 @@ public abstract class AbstractBinaryStringEval implements IScalarEvaluator { // Type check. if (bytes0[offset0] != ATypeTag.SERIALIZED_STRING_TYPE_TAG) { PointableHelper.setNull(resultPointable); - ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, funcID, 0, bytes0[offset0], ATypeTag.STRING); + ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, funcID, bytes0[offset0], 0, ATypeTag.STRING); return; } if (bytes1[offset1] != ATypeTag.SERIALIZED_STRING_TYPE_TAG) { PointableHelper.setNull(resultPointable); - ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, funcID, 1, bytes1[offset1], ATypeTag.STRING); + ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, funcID, bytes1[offset1], 1, ATypeTag.STRING); return; } diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringEval.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringEval.java index 24abd09..837a690 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringEval.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractTripleStringEval.java @@ -96,17 +96,17 @@ abstract class AbstractTripleStringEval implements IScalarEvaluator { // Type check. if (bytes0[start0] != ATypeTag.SERIALIZED_STRING_TYPE_TAG) { PointableHelper.setNull(result); - ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, funcID, 0, bytes0[start0], ATypeTag.STRING); + ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, funcID, bytes0[start0], 0, ATypeTag.STRING); return; } if (bytes1[start1] != ATypeTag.SERIALIZED_STRING_TYPE_TAG) { PointableHelper.setNull(result); - ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, funcID, 1, bytes1[start1], ATypeTag.STRING); + ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, funcID, bytes1[start1], 1, ATypeTag.STRING); return; } if (bytes2[start2] != ATypeTag.SERIALIZED_STRING_TYPE_TAG) { PointableHelper.setNull(result); - ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, funcID, 2, bytes2[start2], ATypeTag.STRING); + ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, funcID, bytes2[start2], 2, ATypeTag.STRING); return; } diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractUnaryStringStringEval.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractUnaryStringStringEval.java index d8f9132..5efe529 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractUnaryStringStringEval.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractUnaryStringStringEval.java @@ -76,7 +76,7 @@ abstract class AbstractUnaryStringStringEval implements IScalarEvaluator { byte inputTypeTag = argBytes[offset]; if (inputTypeTag != ATypeTag.SERIALIZED_STRING_TYPE_TAG) { PointableHelper.setNull(resultPointable); - ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, funcID, 0, argBytes[offset], ATypeTag.STRING); + ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, funcID, argBytes[offset], 0, ATypeTag.STRING); return; } stringPtr.set(argBytes, offset + 1, argPtr.getLength() - 1); diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringLengthDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringLengthDescriptor.java index ed6d270..72b6a47 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringLengthDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringLengthDescriptor.java @@ -87,7 +87,7 @@ public class StringLengthDescriptor extends AbstractScalarFunctionDynamicDescrip if (serString[offset] != ATypeTag.SERIALIZED_STRING_TYPE_TAG) { PointableHelper.setNull(resultPointable); - ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, getIdentifier(), 0, serString[offset], + ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, getIdentifier(), serString[offset], 0, ATypeTag.STRING); return; } diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringSplitDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringSplitDescriptor.java index 69ddbd3..aef92c5 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringSplitDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringSplitDescriptor.java @@ -104,7 +104,7 @@ public class StringSplitDescriptor extends AbstractScalarFunctionDynamicDescript // Type check for the first argument. if (srcString[srcOffset] != ATypeTag.SERIALIZED_STRING_TYPE_TAG) { PointableHelper.setNull(result); - ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, getIdentifier(), 0, srcString[srcOffset], + ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, getIdentifier(), srcString[srcOffset], 0, ATypeTag.STRING); return; } @@ -116,8 +116,8 @@ public class StringSplitDescriptor extends AbstractScalarFunctionDynamicDescript // Type check for the second argument. if (patternString[patternOffset] != ATypeTag.SERIALIZED_STRING_TYPE_TAG) { PointableHelper.setNull(result); - ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, getIdentifier(), 1, - patternString[patternOffset], ATypeTag.STRING); + ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, getIdentifier(), + patternString[patternOffset], 1, ATypeTag.STRING); return; } diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringToCodePointDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringToCodePointDescriptor.java index 38ad408..e4fb37b 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringToCodePointDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/StringToCodePointDescriptor.java @@ -95,7 +95,7 @@ public class StringToCodePointDescriptor extends AbstractScalarFunctionDynamicDe if (serString[offset] != ATypeTag.SERIALIZED_STRING_TYPE_TAG) { PointableHelper.setNull(result); - ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, getIdentifier(), 0, serString[offset], + ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, getIdentifier(), serString[offset], 0, ATypeTag.STRING); return; } diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SubstringAfterDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SubstringAfterDescriptor.java index e725aa9..44c1094 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SubstringAfterDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SubstringAfterDescriptor.java @@ -89,13 +89,13 @@ public class SubstringAfterDescriptor extends AbstractScalarFunctionDynamicDescr if (src[srcOffset] != ATypeTag.SERIALIZED_STRING_TYPE_TAG) { PointableHelper.setNull(result); - ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, getIdentifier(), 0, src[srcOffset], + ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, getIdentifier(), src[srcOffset], 0, ATypeTag.STRING); return; } if (pattern[patternOffset] != ATypeTag.SERIALIZED_STRING_TYPE_TAG) { PointableHelper.setNull(result); - ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, getIdentifier(), 1, pattern[patternOffset], + ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, getIdentifier(), pattern[patternOffset], 1, ATypeTag.STRING); return; } diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SubstringBeforeDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SubstringBeforeDescriptor.java index 1802407..4da815f 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SubstringBeforeDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SubstringBeforeDescriptor.java @@ -90,13 +90,13 @@ public class SubstringBeforeDescriptor extends AbstractScalarFunctionDynamicDesc if (src[srcOffset] != ATypeTag.SERIALIZED_STRING_TYPE_TAG) { PointableHelper.setNull(result); - ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, getIdentifier(), 0, src[srcOffset], + ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, getIdentifier(), src[srcOffset], 0, ATypeTag.STRING); return; } if (pattern[patternOffset] != ATypeTag.SERIALIZED_STRING_TYPE_TAG) { PointableHelper.setNull(result); - ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, getIdentifier(), 1, pattern[patternOffset], + ExceptionUtil.warnTypeMismatch(ctx, sourceLoc, getIdentifier(), pattern[patternOffset], 1, ATypeTag.STRING); return; } diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/AbstractBitMultipleValuesEvaluator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/AbstractBitMultipleValuesEvaluator.java index c242a4b..1f9e046 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/AbstractBitMultipleValuesEvaluator.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/AbstractBitMultipleValuesEvaluator.java @@ -116,7 +116,7 @@ abstract class AbstractBitMultipleValuesEvaluator extends AbstractScalarEval { // Type and value validity check if (!PointableHelper.isValidLongValue(bytes, startOffset, true)) { - ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, 0, bytes[startOffset], + ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, bytes[startOffset], 0, ATypeTag.BIGINT); PointableHelper.setNull(result); return; @@ -132,7 +132,7 @@ abstract class AbstractBitMultipleValuesEvaluator extends AbstractScalarEval { // Type and value validity check if (!PointableHelper.isValidLongValue(bytes, startOffset, true)) { - ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, i, bytes[startOffset], + ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, bytes[startOffset], i, ATypeTag.BIGINT); PointableHelper.setNull(result); return; diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/AbstractBitSingleValueEvaluator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/AbstractBitSingleValueEvaluator.java index 1525b76..b212310 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/AbstractBitSingleValueEvaluator.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/AbstractBitSingleValueEvaluator.java @@ -85,7 +85,7 @@ abstract class AbstractBitSingleValueEvaluator extends AbstractScalarEval { // Validity check if (!PointableHelper.isValidLongValue(bytes, startOffset, true)) { - ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, 0, bytes[startOffset], + ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, bytes[startOffset], 0, ATypeTag.BIGINT); PointableHelper.setNull(result); return; diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/AbstractBitValuePositionEvaluator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/AbstractBitValuePositionEvaluator.java index 759e821..cdf77e8 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/AbstractBitValuePositionEvaluator.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/AbstractBitValuePositionEvaluator.java @@ -126,7 +126,7 @@ abstract class AbstractBitValuePositionEvaluator extends AbstractScalarEval { // Type and value validity check if (!PointableHelper.isValidLongValue(valueBytes, valueStartOffset, true)) { - ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, 0, valueBytes[valueStartOffset], + ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, valueBytes[valueStartOffset], 0, ATypeTag.BIGINT); PointableHelper.setNull(result); return; @@ -222,7 +222,7 @@ abstract class AbstractBitValuePositionEvaluator extends AbstractScalarEval { // Value validity check if (!PointableHelper.isValidLongValue(bytes, startOffset, true)) { - ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, 1, bytes[startOffset], + ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, bytes[startOffset], 1, ATypeTag.BIGINT); return false; } diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/BitValueCountFlagEvaluator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/BitValueCountFlagEvaluator.java index 6e3c280..c5851b2 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/BitValueCountFlagEvaluator.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/BitValueCountFlagEvaluator.java @@ -116,7 +116,7 @@ class BitValueCountFlagEvaluator extends AbstractScalarEval { // Type and value validity check if (!PointableHelper.isValidLongValue(valueBytes, valueStartOffset, true)) { - ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, 0, valueBytes[valueStartOffset], + ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, valueBytes[valueStartOffset], 0, ATypeTag.BIGINT); PointableHelper.setNull(result); return; @@ -128,7 +128,7 @@ class BitValueCountFlagEvaluator extends AbstractScalarEval { // Type and Value validity check if (!PointableHelper.isValidLongValue(countBytes, countStartOffset, true)) { - ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, 1, countBytes[countStartOffset], + ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, countBytes[countStartOffset], 1, ATypeTag.BIGINT); PointableHelper.setNull(result); return; @@ -142,7 +142,7 @@ class BitValueCountFlagEvaluator extends AbstractScalarEval { ATypeTag flagTypeTag = EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(flagBytes[flagStartOffset]); if (flagTypeTag != ATypeTag.BOOLEAN) { - ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, 2, flagBytes[flagStartOffset], + ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, flagBytes[flagStartOffset], 2, ATypeTag.BOOLEAN); PointableHelper.setNull(result); return; diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/BitValuePositionFlagEvaluator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/BitValuePositionFlagEvaluator.java index e579237..4c41515 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/BitValuePositionFlagEvaluator.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/bitwise/BitValuePositionFlagEvaluator.java @@ -148,7 +148,7 @@ class BitValuePositionFlagEvaluator extends AbstractScalarEval { // Type and value validity check if (!PointableHelper.isValidLongValue(valueBytes, valueStartOffset, true)) { - ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, 0, valueBytes[valueStartOffset], + ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, valueBytes[valueStartOffset], 0, ATypeTag.BIGINT); PointableHelper.setNull(result); return; @@ -177,7 +177,7 @@ class BitValuePositionFlagEvaluator extends AbstractScalarEval { ATypeTag flagTypeTag = EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(flagBytes[flagStartOffset]); if (flagTypeTag != ATypeTag.BOOLEAN) { - ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, 2, flagBytes[flagStartOffset], + ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, flagBytes[flagStartOffset], 2, ATypeTag.BOOLEAN); PointableHelper.setNull(result); return; @@ -271,7 +271,7 @@ class BitValuePositionFlagEvaluator extends AbstractScalarEval { // Value validity check if (!PointableHelper.isValidLongValue(bytes, startOffset, true)) { - ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, 1, bytes[startOffset], + ExceptionUtil.warnTypeMismatch(context, sourceLoc, functionIdentifier, bytes[startOffset], 1, ATypeTag.BIGINT); return false; }
