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 <[email protected]>
