You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org> on 2016/05/20 22:51:42 UTC
Change in asterixdb[master]: some cleanup
Till Westmann has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/877
Change subject: some cleanup
......................................................................
some cleanup
Change-Id: Ie0252fef069ee93db6e32e13a13ebb11df5ce913
---
M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/jobgen/QueryLogicalExpressionJobGen.java
M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunctionDescriptorProvider.java
M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java
M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/APrintVisitor.java
4 files changed, 8 insertions(+), 19 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/77/877/1
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/jobgen/QueryLogicalExpressionJobGen.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/jobgen/QueryLogicalExpressionJobGen.java
index 5ebabf3..f4a926c 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/jobgen/QueryLogicalExpressionJobGen.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/jobgen/QueryLogicalExpressionJobGen.java
@@ -20,7 +20,6 @@
import java.util.List;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.functions.FunctionDescriptorTag;
import org.apache.asterix.external.library.ExternalFunctionDescriptorProvider;
import org.apache.asterix.formats.base.IDataFormat;
@@ -147,12 +146,8 @@
IDataFormat format = FormatUtils.getDefaultFormat();
fd = format.resolveFunction(expr, env);
} else {
- try {
- fd = ExternalFunctionDescriptorProvider
- .getExternalFunctionDescriptor((IExternalFunctionInfo) expr.getFunctionInfo());
- } catch (AsterixException ae) {
- throw new AlgebricksException(ae);
- }
+ fd = ExternalFunctionDescriptorProvider
+ .getExternalFunctionDescriptor((IExternalFunctionInfo) expr.getFunctionInfo());
}
return fd.createEvaluatorFactory(args);
}
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunctionDescriptorProvider.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunctionDescriptorProvider.java
index 877ce77..5c27561 100755
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunctionDescriptorProvider.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunctionDescriptorProvider.java
@@ -18,7 +18,6 @@
*/
package org.apache.asterix.external.library;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.om.functions.IExternalFunctionInfo;
import org.apache.asterix.om.functions.IFunctionDescriptor;
import org.apache.asterix.runtime.evaluators.base.AbstractScalarFunctionDynamicDescriptor;
@@ -30,13 +29,13 @@
public class ExternalFunctionDescriptorProvider {
public static IFunctionDescriptor getExternalFunctionDescriptor(IExternalFunctionInfo finfo)
- throws AsterixException {
+ throws AlgebricksException {
switch (finfo.getKind()) {
case SCALAR:
return new ExternalScalarFunctionDescriptor(finfo);
case AGGREGATE:
case UNNEST:
- throw new AsterixException("Unsupported function kind :" + finfo.getKind());
+ throw new AlgebricksException("Unsupported function kind :" + finfo.getKind());
default:
break;
}
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java
index d632d70..15f6c4a 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java
@@ -289,14 +289,9 @@
// write the closed part
for (int i = 0; i < fieldPermutation.length; i++) {
- int pos = fieldPermutation[i];
- IVisitablePointable field;
- if (pos >= 0) {
- field = fieldValues.get(pos);
- } else {
- field = nullReference;
- }
- IAType fType = cachedReqType.getFieldTypes()[i];
+ final int pos = fieldPermutation[i];
+ final IVisitablePointable field = pos >= 0 ? fieldValues.get(pos) : nullReference;
+ final IAType fType = cachedReqType.getFieldTypes()[i];
nestedVisitorArg.second = fType;
// recursively casting, the result of casting can always be thought
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/APrintVisitor.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/APrintVisitor.java
index d4f8652..e69134b 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/APrintVisitor.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/APrintVisitor.java
@@ -77,7 +77,7 @@
}
try {
printer.printList(accessor, arg.first, this);
- } catch (Exception e) {
+ } catch (IOException e) {
throw new AsterixException(e);
}
return null;
--
To view, visit https://asterix-gerrit.ics.uci.edu/877
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0252fef069ee93db6e32e13a13ebb11df5ce913
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>
Change in asterixdb[master]: some finals + exception cleanup
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/877
to look at the new patch set (#2).
Change subject: some finals + exception cleanup
......................................................................
some finals + exception cleanup
Change-Id: Ie0252fef069ee93db6e32e13a13ebb11df5ce913
---
M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/jobgen/QueryLogicalExpressionJobGen.java
M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunctionDescriptorProvider.java
M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java
M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/APrintVisitor.java
M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/csv/APrintVisitor.java
M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/clean/APrintVisitor.java
M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/lossless/APrintVisitor.java
7 files changed, 22 insertions(+), 29 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/77/877/2
--
To view, visit https://asterix-gerrit.ics.uci.edu/877
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie0252fef069ee93db6e32e13a13ebb11df5ce913
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Change in asterixdb[master]: some finals + exception cleanup
Posted by "Yingyi Bu (Code Review)" <do...@asterixdb.incubator.apache.org>.
Yingyi Bu has posted comments on this change.
Change subject: some finals + exception cleanup
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/877
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie0252fef069ee93db6e32e13a13ebb11df5ce913
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: some finals + exception cleanup
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: some finals + exception cleanup
......................................................................
Patch Set 2:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/1456/
--
To view, visit https://asterix-gerrit.ics.uci.edu/877
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie0252fef069ee93db6e32e13a13ebb11df5ce913
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: some finals + exception cleanup
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has submitted this change and it was merged.
Change subject: some finals + exception cleanup
......................................................................
some finals + exception cleanup
Change-Id: Ie0252fef069ee93db6e32e13a13ebb11df5ce913
Reviewed-on: https://asterix-gerrit.ics.uci.edu/877
Reviewed-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Yingyi Bu <bu...@gmail.com>
---
M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/jobgen/QueryLogicalExpressionJobGen.java
M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunctionDescriptorProvider.java
M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java
M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/APrintVisitor.java
M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/csv/APrintVisitor.java
M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/clean/APrintVisitor.java
M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/lossless/APrintVisitor.java
7 files changed, 22 insertions(+), 29 deletions(-)
Approvals:
Yingyi Bu: Looks good to me, approved
Jenkins: Looks good to me, but someone else must approve; Verified
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/jobgen/QueryLogicalExpressionJobGen.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/jobgen/QueryLogicalExpressionJobGen.java
index 5ebabf3..f4a926c 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/jobgen/QueryLogicalExpressionJobGen.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/jobgen/QueryLogicalExpressionJobGen.java
@@ -20,7 +20,6 @@
import java.util.List;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.functions.FunctionDescriptorTag;
import org.apache.asterix.external.library.ExternalFunctionDescriptorProvider;
import org.apache.asterix.formats.base.IDataFormat;
@@ -147,12 +146,8 @@
IDataFormat format = FormatUtils.getDefaultFormat();
fd = format.resolveFunction(expr, env);
} else {
- try {
- fd = ExternalFunctionDescriptorProvider
- .getExternalFunctionDescriptor((IExternalFunctionInfo) expr.getFunctionInfo());
- } catch (AsterixException ae) {
- throw new AlgebricksException(ae);
- }
+ fd = ExternalFunctionDescriptorProvider
+ .getExternalFunctionDescriptor((IExternalFunctionInfo) expr.getFunctionInfo());
}
return fd.createEvaluatorFactory(args);
}
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunctionDescriptorProvider.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunctionDescriptorProvider.java
index 877ce77..5c27561 100755
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunctionDescriptorProvider.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalFunctionDescriptorProvider.java
@@ -18,7 +18,6 @@
*/
package org.apache.asterix.external.library;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.om.functions.IExternalFunctionInfo;
import org.apache.asterix.om.functions.IFunctionDescriptor;
import org.apache.asterix.runtime.evaluators.base.AbstractScalarFunctionDynamicDescriptor;
@@ -30,13 +29,13 @@
public class ExternalFunctionDescriptorProvider {
public static IFunctionDescriptor getExternalFunctionDescriptor(IExternalFunctionInfo finfo)
- throws AsterixException {
+ throws AlgebricksException {
switch (finfo.getKind()) {
case SCALAR:
return new ExternalScalarFunctionDescriptor(finfo);
case AGGREGATE:
case UNNEST:
- throw new AsterixException("Unsupported function kind :" + finfo.getKind());
+ throw new AlgebricksException("Unsupported function kind :" + finfo.getKind());
default:
break;
}
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java
index d632d70..15f6c4a 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java
@@ -289,14 +289,9 @@
// write the closed part
for (int i = 0; i < fieldPermutation.length; i++) {
- int pos = fieldPermutation[i];
- IVisitablePointable field;
- if (pos >= 0) {
- field = fieldValues.get(pos);
- } else {
- field = nullReference;
- }
- IAType fType = cachedReqType.getFieldTypes()[i];
+ final int pos = fieldPermutation[i];
+ final IVisitablePointable field = pos >= 0 ? fieldValues.get(pos) : nullReference;
+ final IAType fType = cachedReqType.getFieldTypes()[i];
nestedVisitorArg.second = fType;
// recursively casting, the result of casting can always be thought
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/APrintVisitor.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/APrintVisitor.java
index d4f8652..7e2b4b8 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/APrintVisitor.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/APrintVisitor.java
@@ -54,6 +54,7 @@
import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
import org.apache.hyracks.algebricks.common.utils.Pair;
+import java.io.IOException;
import java.io.PrintStream;
import java.util.HashMap;
import java.util.Map;
@@ -77,7 +78,7 @@
}
try {
printer.printList(accessor, arg.first, this);
- } catch (Exception e) {
+ } catch (IOException e) {
throw new AsterixException(e);
}
return null;
@@ -92,7 +93,7 @@
}
try {
printer.printRecord(accessor, arg.first, this);
- } catch (Exception e) {
+ } catch (IOException e) {
throw new AsterixException(e);
}
return null;
@@ -212,7 +213,7 @@
}
}
return null;
- } catch (Exception e) {
+ } catch (IOException e) {
throw new IllegalStateException(e);
}
}
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/csv/APrintVisitor.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/csv/APrintVisitor.java
index 04e3e27..0254ef6 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/csv/APrintVisitor.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/csv/APrintVisitor.java
@@ -53,6 +53,7 @@
import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
import org.apache.hyracks.algebricks.common.utils.Pair;
+import java.io.IOException;
import java.io.PrintStream;
import java.util.HashMap;
import java.util.Map;
@@ -88,7 +89,7 @@
level++;
printer.printRecord(accessor, arg.first, this);
level--;
- } catch (Exception e) {
+ } catch (IOException e) {
throw new AsterixException(e);
}
return null;
@@ -204,7 +205,7 @@
}
}
return null;
- } catch (Exception e) {
+ } catch (IOException e) {
throw new IllegalStateException(e);
}
}
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/clean/APrintVisitor.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/clean/APrintVisitor.java
index 2f8e5f9..ac0b73a 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/clean/APrintVisitor.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/clean/APrintVisitor.java
@@ -54,6 +54,7 @@
import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
import org.apache.hyracks.algebricks.common.utils.Pair;
+import java.io.IOException;
import java.io.PrintStream;
import java.util.HashMap;
import java.util.Map;
@@ -77,7 +78,7 @@
}
try {
printer.printList(accessor, arg.first, this);
- } catch (Exception e) {
+ } catch (IOException e) {
throw new AsterixException(e);
}
return null;
@@ -92,7 +93,7 @@
}
try {
printer.printRecord(accessor, arg.first, this);
- } catch (Exception e) {
+ } catch (IOException e) {
throw new AsterixException(e);
}
return null;
@@ -212,7 +213,7 @@
}
}
return null;
- } catch (Exception e) {
+ } catch (IOException e) {
throw new IllegalStateException(e);
}
}
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/lossless/APrintVisitor.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/lossless/APrintVisitor.java
index 3d8958a..6a96fcd 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/lossless/APrintVisitor.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/lossless/APrintVisitor.java
@@ -54,6 +54,7 @@
import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
import org.apache.hyracks.algebricks.common.utils.Pair;
+import java.io.IOException;
import java.io.PrintStream;
import java.util.HashMap;
import java.util.Map;
@@ -77,7 +78,7 @@
}
try {
printer.printList(accessor, arg.first, this);
- } catch (Exception e) {
+ } catch (IOException e) {
throw new AsterixException(e);
}
return null;
@@ -92,7 +93,7 @@
}
try {
printer.printRecord(accessor, arg.first, this);
- } catch (Exception e) {
+ } catch (IOException e) {
throw new AsterixException(e);
}
return null;
@@ -212,7 +213,7 @@
}
}
return null;
- } catch (Exception e) {
+ } catch (IOException e) {
throw new IllegalStateException(e);
}
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/877
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0252fef069ee93db6e32e13a13ebb11df5ce913
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Change in asterixdb[master]: some cleanup
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: some cleanup
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/1455/
--
To view, visit https://asterix-gerrit.ics.uci.edu/877
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie0252fef069ee93db6e32e13a13ebb11df5ce913
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No