Murtadha Hubail has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/2887
Change subject: [NO ISSUE][OTH] Cleanup Redundant Type Cast ...................................................................... [NO ISSUE][OTH] Cleanup Redundant Type Cast - user model changes: no - storage format changes: no - interface changes: no Change-Id: I9c93ce90ad4aa789ae46284431e172ae4777bf55 --- M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AnalysisUtil.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CancelUnnestWithNestedListifyRule.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CountVarToCountOneRule.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FullTextContainsParameterCheckRule.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FuzzyJoinRule.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceRandomPartitioningFeedComputationRule.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/RemoveRedundantListifyRule.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SetAsterixPhysicalOperatorsRule.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceJoinAccessMethodRule.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/MetadataNodeResponseMessage.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataParser.java M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/TupleCopyValueExtractor.java M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInterval.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/FullTextContainsEvaluator.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/AbstractComparisonEvaluator.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/GetRecordFieldsEvalFactory.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordLengthDescriptor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordNamesDescriptor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/AbstractIntervalLogicFuncDescriptor.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetOverlappingIntervalDescriptor.java M hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/BinaryHashSet.java M hyracks-fullstack/hyracks/hyracks-dataflow-common/src/test/java/org/apache/hyracks/dataflow/common/data/normalizers/IntegerNormalizedKeyComputerFactoryTest.java M hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupWriteOperatorNodePushable.java M hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/AbstractExternalGroupbyTest.java M hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/compressors/FieldPrefixCompressor.java M hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeCountingSearchCursor.java M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/ProbabilityHelper.java M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestJobletContext.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemorySortRunner.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTuplesTest.java 31 files changed, 45 insertions(+), 58 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/87/2887/1 diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AnalysisUtil.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AnalysisUtil.java index 93c7d79..9bef7ee 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AnalysisUtil.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AnalysisUtil.java @@ -58,7 +58,7 @@ } public static int numberOfVarsInExpr(ILogicalExpression e) { - switch (((AbstractLogicalExpression) e).getExpressionTag()) { + switch (e.getExpressionTag()) { case CONSTANT: { return 0; } diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CancelUnnestWithNestedListifyRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CancelUnnestWithNestedListifyRule.java index 567e6c3..0369bc7 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CancelUnnestWithNestedListifyRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CancelUnnestWithNestedListifyRule.java @@ -207,7 +207,7 @@ LogicalVariable aggVar = agg.getVariables().get(0); ILogicalExpression aggFun = agg.getExpressions().get(0).getValue(); if (!aggVar.equals(unnestedVar) - || ((AbstractLogicalExpression) aggFun).getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) { + || aggFun.getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) { return false; } AbstractFunctionCallExpression f = (AbstractFunctionCallExpression) aggFun; @@ -218,7 +218,7 @@ return false; } ILogicalExpression arg0 = f.getArguments().get(0).getValue(); - if (((AbstractLogicalExpression) arg0).getExpressionTag() != LogicalExpressionTag.VARIABLE) { + if (arg0.getExpressionTag() != LogicalExpressionTag.VARIABLE) { return false; } LogicalVariable paramVar = ((VariableReferenceExpression) arg0).getVariableReference(); diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CountVarToCountOneRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CountVarToCountOneRule.java index 46c441a..092464f 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CountVarToCountOneRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CountVarToCountOneRule.java @@ -81,7 +81,7 @@ if (exp3.getExpressionTag() != LogicalExpressionTag.VARIABLE) { return false; } - if (((AbstractLogicalOperator) agg.getInputs().get(0).getValue()) + if (agg.getInputs().get(0).getValue() .getOperatorTag() != LogicalOperatorTag.NESTEDTUPLESOURCE) { return false; } diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FullTextContainsParameterCheckRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FullTextContainsParameterCheckRule.java index 9a44022..7d5d533 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FullTextContainsParameterCheckRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FullTextContainsParameterCheckRule.java @@ -100,7 +100,7 @@ @Override public boolean transform(Mutable<ILogicalExpression> exprRef) throws AlgebricksException { ILogicalExpression e = exprRef.getValue(); - switch (((AbstractLogicalExpression) e).getExpressionTag()) { + switch (e.getExpressionTag()) { case FUNCTION_CALL: return transformFunctionCallExpression((AbstractFunctionCallExpression) e); default: diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FuzzyJoinRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FuzzyJoinRule.java index fae10e1..d814ba0 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FuzzyJoinRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FuzzyJoinRule.java @@ -335,7 +335,7 @@ break; } case LEFT_OUTER: { - if (((AbstractLogicalOperator) outputOp).getOperatorTag() != LogicalOperatorTag.LEFTOUTERJOIN) { + if (outputOp.getOperatorTag() != LogicalOperatorTag.LEFTOUTERJOIN) { throw new IllegalStateException(); } LeftOuterJoinOperator topJoin = (LeftOuterJoinOperator) outputOp; diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceRandomPartitioningFeedComputationRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceRandomPartitioningFeedComputationRule.java index fd6ff25..d896dd0 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceRandomPartitioningFeedComputationRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceRandomPartitioningFeedComputationRule.java @@ -73,7 +73,7 @@ exchangeOp.setPhysicalOperator(new RandomPartitionExchangePOperator(runtimeDomain)); op.getInputs().get(0).setValue(exchangeOp); exchangeOp.getInputs().add(new MutableObject<ILogicalOperator>(scanOp)); - ExecutionMode em = ((AbstractLogicalOperator) scanOp).getExecutionMode(); + ExecutionMode em = scanOp.getExecutionMode(); exchangeOp.setExecutionMode(em); exchangeOp.computeDeliveredPhysicalProperties(context); context.computeAndSetTypeEnvironmentForOperator(exchangeOp); diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/RemoveRedundantListifyRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/RemoveRedundantListifyRule.java index 96b052b..f544119 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/RemoveRedundantListifyRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/RemoveRedundantListifyRule.java @@ -186,7 +186,7 @@ LogicalVariable aggVar = agg.getVariables().get(0); ILogicalExpression aggFun = agg.getExpressions().get(0).getValue(); if (!aggVar.equals(unnestedVar) - || ((AbstractLogicalExpression) aggFun).getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) { + || aggFun.getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) { return false; } AbstractFunctionCallExpression f = (AbstractFunctionCallExpression) aggFun; @@ -197,7 +197,7 @@ return false; } ILogicalExpression arg0 = f.getArguments().get(0).getValue(); - if (((AbstractLogicalExpression) arg0).getExpressionTag() != LogicalExpressionTag.VARIABLE) { + if (arg0.getExpressionTag() != LogicalExpressionTag.VARIABLE) { return false; } LogicalVariable paramVar = ((VariableReferenceExpression) arg0).getVariableReference(); @@ -256,7 +256,7 @@ return false; } ILogicalExpression arg0 = f.getArguments().get(0).getValue(); - if (((AbstractLogicalExpression) arg0).getExpressionTag() != LogicalExpressionTag.VARIABLE) { + if (arg0.getExpressionTag() != LogicalExpressionTag.VARIABLE) { return false; } LogicalVariable aggInputVar = ((VariableReferenceExpression) arg0).getVariableReference(); diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SetAsterixPhysicalOperatorsRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SetAsterixPhysicalOperatorsRule.java index fed17bd..c956f72 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SetAsterixPhysicalOperatorsRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SetAsterixPhysicalOperatorsRule.java @@ -103,7 +103,7 @@ ILogicalPlan p0 = gby.getNestedPlans().get(0); if (p0.getRoots().size() == 1) { Mutable<ILogicalOperator> r0 = p0.getRoots().get(0); - if (((AbstractLogicalOperator) (r0.getValue())).getOperatorTag() + if (r0.getValue().getOperatorTag() .equals(LogicalOperatorTag.AGGREGATE)) { AggregateOperator aggOp = (AggregateOperator) r0.getValue(); boolean serializable = true; diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceJoinAccessMethodRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceJoinAccessMethodRule.java index 324668d..e05a107 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceJoinAccessMethodRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceJoinAccessMethodRule.java @@ -199,7 +199,7 @@ if (op1.getInputs().size() != 1) { return false; } - if (((AbstractLogicalOperator) op1.getInputs().get(0).getValue()) + if (op1.getInputs().get(0).getValue() .getOperatorTag() != LogicalOperatorTag.LEFTOUTERJOIN) { return false; } diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/MetadataNodeResponseMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/MetadataNodeResponseMessage.java index 815d878..ac3957f 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/MetadataNodeResponseMessage.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/MetadataNodeResponseMessage.java @@ -41,7 +41,7 @@ @Override public void handle(ICcApplicationContext appCtx) throws HyracksDataException, InterruptedException { - ((CcApplicationContext) appCtx).getNcLifecycleCoordinator().process(this); + appCtx.getNcLifecycleCoordinator().process(this); } @Override diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java index 3634bf1..22dec60 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java @@ -224,7 +224,7 @@ Thread t = new Thread(() -> { TransactionManager spyTxnMgr = spy((TransactionManager) nc.getTransactionManager()); - doAnswer((Answer) i -> { + doAnswer(i -> { stallAbortTxn(Thread.currentThread(), txnCtx, nc.getTransactionSubsystem(), (TxnId) i.getArguments()[0]); return null; diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataParser.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataParser.java index f3d8c89..5dbc383 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataParser.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataParser.java @@ -70,7 +70,7 @@ case ARRAY: { OrderedListBuilder listBuilder = new OrderedListBuilder(); - listBuilder.reset((AOrderedListType) ((AMutableOrderedList) obj).getType()); + listBuilder.reset((AOrderedListType) obj.getType()); IACursor cursor = ((AMutableOrderedList) obj).getCursor(); ArrayBackedValueStorage listItemValue = new ArrayBackedValueStorage(); while (cursor.next()) { @@ -85,7 +85,7 @@ case MULTISET: { UnorderedListBuilder listBuilder = new UnorderedListBuilder(); - listBuilder.reset((AUnorderedListType) ((AMutableUnorderedList) obj).getType()); + listBuilder.reset((AUnorderedListType) obj.getType()); IACursor cursor = ((AMutableUnorderedList) obj).getCursor(); ArrayBackedValueStorage listItemValue = new ArrayBackedValueStorage(); while (cursor.next()) { diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/TupleCopyValueExtractor.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/TupleCopyValueExtractor.java index 8960ba6..c9fb39c 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/TupleCopyValueExtractor.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/TupleCopyValueExtractor.java @@ -44,7 +44,7 @@ public TupleCopyValueExtractor(ITypeTraits[] typeTraits) { this.tupleWriter = new TypeAwareTupleWriter(typeTraits); - this.tupleReference = (TypeAwareTupleReference) tupleWriter.createTupleReference(); + this.tupleReference = tupleWriter.createTupleReference(); } @Override diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInterval.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInterval.java index 150575f..4fb0b67 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInterval.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AInterval.java @@ -71,7 +71,7 @@ @Override public int hashCode() { - return (int) (((int) (this.intervalStart ^ (this.intervalStart >>> 32))) * 31 + return (((int) (this.intervalStart ^ (this.intervalStart >>> 32))) * 31 + (int) (this.intervalEnd ^ (this.intervalEnd >>> 32))) * 31 + (int) this.typetag; } diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/FullTextContainsEvaluator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/FullTextContainsEvaluator.java index dafc034..fd429d0 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/FullTextContainsEvaluator.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/FullTextContainsEvaluator.java @@ -57,10 +57,8 @@ protected final ArrayBackedValueStorage resultStorage = new ArrayBackedValueStorage(); protected final DataOutput out = resultStorage.getDataOutput(); - protected final TaggedValuePointable argLeft = - (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable(); - protected final TaggedValuePointable argRight = - (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable(); + protected final TaggedValuePointable argLeft = TaggedValuePointable.FACTORY.createPointable(); + protected final TaggedValuePointable argRight = TaggedValuePointable.FACTORY.createPointable(); protected TaggedValuePointable[] argOptions; protected final IScalarEvaluator evalLeft; protected final IScalarEvaluator evalRight; @@ -122,7 +120,7 @@ for (int i = 0; i < optionArgsLength; i++) { this.evalOptions[i] = args[i + 2].createScalarEvaluator(context); this.outOptions[i] = VoidPointable.FACTORY.createPointable(); - this.argOptions[i] = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable(); + this.argOptions[i] = TaggedValuePointable.FACTORY.createPointable(); } } diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/AbstractComparisonEvaluator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/AbstractComparisonEvaluator.java index 8194c99..50e3932 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/AbstractComparisonEvaluator.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/AbstractComparisonEvaluator.java @@ -39,10 +39,8 @@ protected final ArrayBackedValueStorage resultStorage = new ArrayBackedValueStorage(); protected final DataOutput out = resultStorage.getDataOutput(); - protected final TaggedValuePointable argLeft = - (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable(); - protected final TaggedValuePointable argRight = - (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable(); + protected final TaggedValuePointable argLeft = TaggedValuePointable.FACTORY.createPointable(); + protected final TaggedValuePointable argRight = TaggedValuePointable.FACTORY.createPointable(); protected final IPointable outLeft = VoidPointable.FACTORY.createPointable(); protected final IPointable outRight = VoidPointable.FACTORY.createPointable(); protected final IScalarEvaluator evalLeft; diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/GetRecordFieldsEvalFactory.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/GetRecordFieldsEvalFactory.java index 16e24b4..7723719 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/GetRecordFieldsEvalFactory.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/GetRecordFieldsEvalFactory.java @@ -55,8 +55,7 @@ public IScalarEvaluator createScalarEvaluator(final IHyracksTaskContext ctx) throws HyracksDataException { return new IScalarEvaluator() { - private final ARecordPointable recordPointable = - (ARecordPointable) ARecordPointable.FACTORY.createPointable(); + private final ARecordPointable recordPointable = ARecordPointable.FACTORY.createPointable(); private IPointable inputArg0 = new VoidPointable(); private IScalarEvaluator eval0 = recordEvalFactory.createScalarEvaluator(ctx); private ArrayBackedValueStorage resultStorage = new ArrayBackedValueStorage(); diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordLengthDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordLengthDescriptor.java index cda069d..cd24ef7 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordLengthDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordLengthDescriptor.java @@ -79,8 +79,7 @@ private IScalarEvaluator eval0 = args[0].createScalarEvaluator(ctx); private final IPointable argPtr = new VoidPointable(); - private final ARecordPointable recordPointable = - (ARecordPointable) ARecordPointable.FACTORY.createPointable(); + private final ARecordPointable recordPointable = ARecordPointable.FACTORY.createPointable(); private final AMutableInt64 aInt64 = new AMutableInt64(0); @SuppressWarnings("unchecked") private final ISerializerDeserializer<AInt64> int64Serde = diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordNamesDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordNamesDescriptor.java index 1719980..0ba2aa3 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordNamesDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordNamesDescriptor.java @@ -77,8 +77,7 @@ private IScalarEvaluator eval0 = args[0].createScalarEvaluator(ctx); private final IPointable argPtr = new VoidPointable(); - private final ARecordPointable recordPointable = - (ARecordPointable) ARecordPointable.FACTORY.createPointable(); + private final ARecordPointable recordPointable = ARecordPointable.FACTORY.createPointable(); private final AOrderedListType listType = new AOrderedListType(BuiltinType.ASTRING, null); private final OrderedListBuilder listBuilder = new OrderedListBuilder(); private final ArrayBackedValueStorage itemStorage = new ArrayBackedValueStorage(); diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/AbstractIntervalLogicFuncDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/AbstractIntervalLogicFuncDescriptor.java index 6edfb48..5e396a3 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/AbstractIntervalLogicFuncDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/AbstractIntervalLogicFuncDescriptor.java @@ -54,10 +54,8 @@ protected final IntervalLogic il = new IntervalLogic(sourceLoc); private ArrayBackedValueStorage resultStorage = new ArrayBackedValueStorage(); private DataOutput out = resultStorage.getDataOutput(); - private TaggedValuePointable argPtr0 = - (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable(); - private TaggedValuePointable argPtr1 = - (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable(); + private TaggedValuePointable argPtr0 = TaggedValuePointable.FACTORY.createPointable(); + private TaggedValuePointable argPtr1 = TaggedValuePointable.FACTORY.createPointable(); private AIntervalPointable interval0 = (AIntervalPointable) AIntervalPointable.FACTORY.createPointable(); private AIntervalPointable interval1 = diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetOverlappingIntervalDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetOverlappingIntervalDescriptor.java index 7a15151..9374aba 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetOverlappingIntervalDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/GetOverlappingIntervalDescriptor.java @@ -65,10 +65,8 @@ protected final IntervalLogic il = new IntervalLogic(sourceLoc); private ArrayBackedValueStorage resultStorage = new ArrayBackedValueStorage(); private DataOutput out = resultStorage.getDataOutput(); - private TaggedValuePointable argPtr0 = - (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable(); - private TaggedValuePointable argPtr1 = - (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable(); + private TaggedValuePointable argPtr0 = TaggedValuePointable.FACTORY.createPointable(); + private TaggedValuePointable argPtr1 = TaggedValuePointable.FACTORY.createPointable(); private AIntervalPointable interval0 = (AIntervalPointable) AIntervalPointable.FACTORY.createPointable(); private AIntervalPointable interval1 = diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/BinaryHashSet.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/BinaryHashSet.java index c5b8e8a..1e6ce50 100644 --- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/BinaryHashSet.java +++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/BinaryHashSet.java @@ -232,11 +232,11 @@ } private int getFrameIndex(int ptr) { - return (int) (ptr >> 16); + return (ptr >> 16); } private int getFrameOffset(int ptr) { - return (int) (ptr & 0xffff); + return (ptr & 0xffff); } public int size() { diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/test/java/org/apache/hyracks/dataflow/common/data/normalizers/IntegerNormalizedKeyComputerFactoryTest.java b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/test/java/org/apache/hyracks/dataflow/common/data/normalizers/IntegerNormalizedKeyComputerFactoryTest.java index 9122721..cd0cbeb 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/test/java/org/apache/hyracks/dataflow/common/data/normalizers/IntegerNormalizedKeyComputerFactoryTest.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/test/java/org/apache/hyracks/dataflow/common/data/normalizers/IntegerNormalizedKeyComputerFactoryTest.java @@ -51,7 +51,7 @@ } private IPointable getIntPointable(int value) { - IntegerPointable pointable = (IntegerPointable) IntegerPointable.FACTORY.createPointable(); + IntegerPointable pointable = IntegerPointable.FACTORY.createPointable(); pointable.set(new byte[Integer.BYTES], 0, Integer.BYTES); pointable.setInteger(value); return pointable; diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupWriteOperatorNodePushable.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupWriteOperatorNodePushable.java index 95994f3..999dbac 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupWriteOperatorNodePushable.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupWriteOperatorNodePushable.java @@ -125,7 +125,7 @@ int groupByColumnsCount = mergeGroupFields.length; int hashTableCardinality = ExternalGroupOperatorDescriptor.calculateGroupByTableCardinality( memoryBudgetInBytes, groupByColumnsCount, ctx.getInitialFrameSize()); - hashTableCardinality = (int) Math.min(hashTableCardinality, numOfTuples[i]); + hashTableCardinality = Math.min(hashTableCardinality, numOfTuples[i]); ISpillableTable partitionTable = spillableTableFactory.buildSpillableTable(ctx, hashTableCardinality, runs[i].getFileSize(), mergeGroupFields, groupByComparators, nmkComputer, mergeAggregatorFactory, partialAggRecordDesc, outRecordDesc, frameLimit, level); diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/AbstractExternalGroupbyTest.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/AbstractExternalGroupbyTest.java index b55b64e..4c0d89f 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/AbstractExternalGroupbyTest.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/AbstractExternalGroupbyTest.java @@ -144,7 +144,7 @@ resultAccessor.getAbsoluteFieldStartOffset(tid, fid)); outRecord[fid] = outputRec.getFields()[fid].deserialize(di); } - Result result = answer.remove((String) outRecord[0]); + Result result = answer.remove(outRecord[0]); assertNotNull(result); assertEquals(result.sum, (int) outRecord[1]); assertEquals(result.count, (int) outRecord[2]); diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/compressors/FieldPrefixCompressor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/compressors/FieldPrefixCompressor.java index 86497a8..8c327f7 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/compressors/FieldPrefixCompressor.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/compressors/FieldPrefixCompressor.java @@ -77,7 +77,7 @@ ByteBuffer buf = frame.getBuffer(); byte[] pageArray = buf.array(); - IPrefixSlotManager slotManager = (IPrefixSlotManager) frame.getSlotManager(); + IPrefixSlotManager slotManager = frame.getSlotManager(); // perform analysis pass ArrayList<KeyPartition> keyPartitions = getKeyPartitions(frame, cmp, occurrenceThreshold); @@ -334,7 +334,7 @@ int maxCmps = cmps.length - 1; ByteBuffer buf = frame.getBuffer(); byte[] pageArray = buf.array(); - IPrefixSlotManager slotManager = (IPrefixSlotManager) frame.getSlotManager(); + IPrefixSlotManager slotManager = frame.getSlotManager(); ArrayList<KeyPartition> keyPartitions = new ArrayList<KeyPartition>(); KeyPartition kp = new KeyPartition(maxCmps); diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeCountingSearchCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeCountingSearchCursor.java index f7e0ce0..1491424 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeCountingSearchCursor.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeCountingSearchCursor.java @@ -78,7 +78,7 @@ @Override public void doOpen(ICursorInitialState initialState, ISearchPredicate searchPred) throws HyracksDataException { - page = ((BTreeCursorInitialState) initialState).getPage(); + page = initialState.getPage(); isPageDirty = false; frame.setPage(page); diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/ProbabilityHelper.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/ProbabilityHelper.java index c7fbd3f..ccfa00b 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/ProbabilityHelper.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/ProbabilityHelper.java @@ -34,10 +34,10 @@ double[] probDist = new double[numChoices]; double divisor = 0; for (int i = 1; i <= numChoices; i++) { - divisor += 1.0 / (double) Math.pow((double) i, (double) zipfSkew); + divisor += 1.0 / Math.pow((double) i, (double) zipfSkew); } for (int i = 1; i <= numChoices; i++) { - probDist[i - 1] = (1.0 / (double) Math.pow((double) i, (double) zipfSkew)) / divisor; + probDist[i - 1] = (1.0 / Math.pow((double) i, (double) zipfSkew)) / divisor; } return probDist; } diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestJobletContext.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestJobletContext.java index b022b15..2809343 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestJobletContext.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestJobletContext.java @@ -45,7 +45,7 @@ this.frameSize = frameSize; this.serviceContext = serviceContext; this.jobId = jobId; - fileFactory = new WorkspaceFileFactory(this, (IIOManager) getIOManager()); + fileFactory = new WorkspaceFileFactory(this, getIOManager()); this.frameManger = new FrameManager(frameSize); this.jobStartTime = System.currentTimeMillis(); } diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemorySortRunner.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemorySortRunner.java index 62aeb3e..4501485 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemorySortRunner.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemorySortRunner.java @@ -72,12 +72,12 @@ this.typeTraits = typeTraits; tupleCmp = new TupleComparator(cmp); tupleWriterFactory = new TypeAwareTupleWriterFactory(typeTraits); - tupleWriter = (TypeAwareTupleWriter) tupleWriterFactory.createTupleWriter(); + tupleWriter = tupleWriterFactory.createTupleWriter(); int numTuples = numBatches * batchSize; tuples = new ArrayList<TypeAwareTupleReference>(); tupleBuf = ByteBuffer.allocate(numTuples * tupleSize); for (int i = 0; i < numTuples; i++) { - tuples.add((TypeAwareTupleReference) tupleWriter.createTupleReference()); + tuples.add(tupleWriter.createTupleReference()); } } diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTuplesTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTuplesTest.java index c0d9bb8..8510229 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTuplesTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTuplesTest.java @@ -73,8 +73,7 @@ ITupleReference maxTuple = TupleUtils.createTuple(maxFieldSerdes, (Object[]) maxFields); ByteBuffer maxMatterBuf = writeTuple(maxTuple, maxMatterTupleWriter); // Tuple reference should work for both matter and antimatter tuples (doesn't matter which factory creates it). - LSMBTreeTupleReference maxLsmBTreeTuple = - (LSMBTreeTupleReference) maxMatterTupleWriter.createTupleReference(); + LSMBTreeTupleReference maxLsmBTreeTuple = maxMatterTupleWriter.createTupleReference(); ISerializerDeserializer[] fieldSerdes = Arrays.copyOfRange(maxFieldSerdes, 0, numFields); ITypeTraits[] typeTraits = SerdeUtils.serdesToTypeTraits(fieldSerdes); @@ -99,8 +98,7 @@ } // Tuple reference should work for both matter and antimatter tuples (doesn't matter which factory creates it). - LSMBTreeTupleReference lsmBTreeTuple = - (LSMBTreeTupleReference) matterTupleWriter.createTupleReference(); + LSMBTreeTupleReference lsmBTreeTuple = matterTupleWriter.createTupleReference(); // Use LSMBTree tuple reference to interpret the written tuples. // Repeat the block inside to test that repeated resetting to matter/antimatter tuples works. -- To view, visit https://asterix-gerrit.ics.uci.edu/2887 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c93ce90ad4aa789ae46284431e172ae4777bf55 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Murtadha Hubail <mhub...@apache.org>