Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Hussain Towaileb has submitted this change and it was merged. (
https://asterix-gerrit.ics.uci.edu/3403 )
Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes
..
[NO ISSUE][FUN] Remove unnecessary inner classes
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Remove unnecessary inner classes. Use the evaluator
factories length to check if the end position argument
is passed.
Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3403
Contrib: Jenkins
Sonar-Qube: Jenkins
Tested-by: Jenkins
Integration-Tests: Jenkins
Reviewed-by: Dmitry Lychagin
---
R
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ArraySliceEvaluator.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ArraySliceWithEndPositionDescriptor.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ArraySliceWithoutEndPositionDescriptor.java
3 files changed, 23 insertions(+), 59 deletions(-)
Approvals:
Jenkins: Verified; No violations found; ; Verified
Dmitry Lychagin: Looks good to me, approved
Objections:
Anon. E. Moose (1000171): Violations found
diff --git
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractArraySliceEval.java
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ArraySliceEvaluator.java
similarity index 90%
rename from
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractArraySliceEval.java
rename to
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ArraySliceEvaluator.java
index 036447a..c907720 100644
---
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractArraySliceEval.java
+++
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ArraySliceEvaluator.java
@@ -75,32 +75,31 @@
*
*/
-public abstract class AbstractArraySliceEval extends AbstractScalarEval {
+class ArraySliceEvaluator extends AbstractScalarEval {
+
// List type
private final IAType inputListType;
// Storage
-private final ArrayBackedValueStorage storage = new
ArrayBackedValueStorage();
+private final ArrayBackedValueStorage resultStorage = new
ArrayBackedValueStorage();
-// Evaluators
+// Evaluators and pointables
private final IScalarEvaluator listEval;
private final IScalarEvaluator startPositionEval;
-private final IScalarEvaluator endPositionEval;
-
-// Pointables
+private IScalarEvaluator endPositionEval;
private final IPointable listPointable = new VoidPointable();
private final IPointable startPositionPointable = new VoidPointable();
-private final IPointable endPositionPointable = new VoidPointable();
+private IPointable endPositionPointable;
// Accessors
private final ListAccessor listAccessor = new ListAccessor();
// List Builders
-private IAsterixListBuilder orderedListBuilder = new OrderedListBuilder();
-private IAsterixListBuilder unorderedListBuilder = new
UnorderedListBuilder();
+private final IAsterixListBuilder orderedListBuilder = new
OrderedListBuilder();
+private final IAsterixListBuilder unorderedListBuilder = new
UnorderedListBuilder();
// Constructor
-public AbstractArraySliceEval(IScalarEvaluatorFactory[] args,
IHyracksTaskContext ctx, SourceLocation sourceLoc,
+ArraySliceEvaluator(IScalarEvaluatorFactory[] argEvalFactories,
IHyracksTaskContext ctx, SourceLocation sourceLoc,
FunctionIdentifier functionIdentifier, IAType inputListType)
throws HyracksDataException {
// Source location
super(sourceLoc, functionIdentifier);
@@ -109,20 +108,18 @@
this.inputListType = inputListType;
// Evaluators
-listEval = args[0].createScalarEvaluator(ctx);
-startPositionEval = args[1].createScalarEvaluator(ctx);
+listEval = argEvalFactories[0].createScalarEvaluator(ctx);
+startPositionEval = argEvalFactories[1].createScalarEvaluator(ctx);
// Check for optional parameter
-endPositionEval = getEndPositionEval(args, ctx);
+if (argEvalFactories.length > 2) {
+endPositionEval = argEvalFactories[2].createScalarEvaluator(ctx);
+endPositionPointable = new VoidPointable();
+}
}
-
-protected abstract IScalarEvaluator
getEndPositionEval(IScalarEvaluatorFactory[] args, IHyracksTaskContext ctx)
-throws HyracksDataException;
@Override
public void evaluate(IFrameTupleReference tuple, IPointable result) throws
HyracksDataException {
-// Reset storage
-storage.reset();
// Evaluate
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Dmitry Lychagin has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Dmitry Lychagin Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 23 May 2019 17:49:07 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Anon. E. Moose (1000171) has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Contrib-2 Analytics Compatibility Tests Failed https://cbjenkins.page.link/L3s9pjGtMryZvJqF9 : UNSTABLE -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 23 May 2019 01:14:00 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/8591/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Thu, 23 May 2019 00:43:42 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Contrib+1 BAD Compatibility Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/4440/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:50:45 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Anon. E. Moose (1000171) has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Analytics Compatibility Compilation Successful https://cbjenkins.page.link/bN5SXAQT3RPttBWK6 : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Anon. E. Moose (1000171) Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:34:42 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/4440/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:33:47 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-format/5793/ (9/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:30:30 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/11304/ (10/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:30:32 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/5812/ (6/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:30:26 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/8591/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:31:35 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ssl-compression/594/ (8/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:30:28 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-stabilization-f69489-compat/1089/ (15/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:30:42 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-openjdk11/1180/ (11/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:30:33 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/6395/ (14/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:30:40 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/6035/ (12/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:30:35 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/9771/ (13/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:30:38 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-txnlog/991/ (16/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:30:44 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/5980/ (7/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:30:27 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-spidersilk-tests/753/ (4/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:30:25 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/3824/ (5/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:30:25 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/6185/ (3/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:30:24 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/5830/ (2/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:30:24 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/3403 ) Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/5729/ (1/16) -- To view, visit https://asterix-gerrit.ics.uci.edu/3403 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f Gerrit-Change-Number: 3403 Gerrit-PatchSet: 1 Gerrit-Owner: Hussain Towaileb Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 22 May 2019 23:30:24 + Gerrit-HasComments: No
Change in asterixdb[master]: [NO ISSUE][FUN] Remove unnecessary inner classes
Hussain Towaileb has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/3403
Change subject: [NO ISSUE][FUN] Remove unnecessary inner classes
..
[NO ISSUE][FUN] Remove unnecessary inner classes
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Remove unnecessary inner classes. Use the evaluator
factories length to check if the end position argument
is passed.
Change-Id: I5cc8c57888e62b26684082dd07a4314b45f9fa7f
---
R
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ArraySliceEvaluator.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ArraySliceWithEndPositionDescriptor.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ArraySliceWithoutEndPositionDescriptor.java
3 files changed, 23 insertions(+), 59 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/03/3403/1
diff --git
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractArraySliceEval.java
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ArraySliceEvaluator.java
similarity index 90%
rename from
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractArraySliceEval.java
rename to
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ArraySliceEvaluator.java
index 036447a..c907720 100644
---
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractArraySliceEval.java
+++
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/ArraySliceEvaluator.java
@@ -75,32 +75,31 @@
*
*/
-public abstract class AbstractArraySliceEval extends AbstractScalarEval {
+class ArraySliceEvaluator extends AbstractScalarEval {
+
// List type
private final IAType inputListType;
// Storage
-private final ArrayBackedValueStorage storage = new
ArrayBackedValueStorage();
+private final ArrayBackedValueStorage resultStorage = new
ArrayBackedValueStorage();
-// Evaluators
+// Evaluators and pointables
private final IScalarEvaluator listEval;
private final IScalarEvaluator startPositionEval;
-private final IScalarEvaluator endPositionEval;
-
-// Pointables
+private IScalarEvaluator endPositionEval;
private final IPointable listPointable = new VoidPointable();
private final IPointable startPositionPointable = new VoidPointable();
-private final IPointable endPositionPointable = new VoidPointable();
+private IPointable endPositionPointable;
// Accessors
private final ListAccessor listAccessor = new ListAccessor();
// List Builders
-private IAsterixListBuilder orderedListBuilder = new OrderedListBuilder();
-private IAsterixListBuilder unorderedListBuilder = new
UnorderedListBuilder();
+private final IAsterixListBuilder orderedListBuilder = new
OrderedListBuilder();
+private final IAsterixListBuilder unorderedListBuilder = new
UnorderedListBuilder();
// Constructor
-public AbstractArraySliceEval(IScalarEvaluatorFactory[] args,
IHyracksTaskContext ctx, SourceLocation sourceLoc,
+ArraySliceEvaluator(IScalarEvaluatorFactory[] argEvalFactories,
IHyracksTaskContext ctx, SourceLocation sourceLoc,
FunctionIdentifier functionIdentifier, IAType inputListType)
throws HyracksDataException {
// Source location
super(sourceLoc, functionIdentifier);
@@ -109,20 +108,18 @@
this.inputListType = inputListType;
// Evaluators
-listEval = args[0].createScalarEvaluator(ctx);
-startPositionEval = args[1].createScalarEvaluator(ctx);
+listEval = argEvalFactories[0].createScalarEvaluator(ctx);
+startPositionEval = argEvalFactories[1].createScalarEvaluator(ctx);
// Check for optional parameter
-endPositionEval = getEndPositionEval(args, ctx);
+if (argEvalFactories.length > 2) {
+endPositionEval = argEvalFactories[2].createScalarEvaluator(ctx);
+endPositionPointable = new VoidPointable();
+}
}
-
-protected abstract IScalarEvaluator
getEndPositionEval(IScalarEvaluatorFactory[] args, IHyracksTaskContext ctx)
-throws HyracksDataException;
@Override
public void evaluate(IFrameTupleReference tuple, IPointable result) throws
HyracksDataException {
-// Reset storage
-storage.reset();
// Evaluate
listEval.evaluate(tuple, listPointable);
@@ -231,18 +228,18 @@
try {
// Create the subset list based on the positions
for (int i = startPositionValue; i < endPositionValue; i++) {
-storage.reset();
-
