Repository: asterixdb Updated Branches: refs/heads/master 81c09a98a -> 23761dd78
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/MetadataLockUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/MetadataLockUtil.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/MetadataLockUtil.java index 4cf25f7..baac712 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/MetadataLockUtil.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/MetadataLockUtil.java @@ -19,8 +19,8 @@ package org.apache.asterix.metadata.utils; import org.apache.asterix.common.api.IMetadataLockManager; -import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.common.metadata.LockList; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; public class MetadataLockUtil { @@ -30,7 +30,7 @@ public class MetadataLockUtil { public static void createDatasetBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, String itemTypeDataverseName, String itemTypeFullyQualifiedName, String metaItemTypeDataverseName, String metaItemTypeFullyQualifiedName, String nodeGroupName, String compactionPolicyName, - String datasetFullyQualifiedName, boolean isDefaultCompactionPolicy) throws AsterixException { + String datasetFullyQualifiedName, boolean isDefaultCompactionPolicy) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, dataverseName); if (!dataverseName.equals(itemTypeDataverseName)) { lockMgr.acquireDataverseReadLock(locks, itemTypeDataverseName); @@ -54,113 +54,113 @@ public class MetadataLockUtil { } public static void createIndexBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String datasetFullyQualifiedName) throws AsterixException { + String datasetFullyQualifiedName) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, dataverseName); lockMgr.acquireDatasetCreateIndexLock(locks, datasetFullyQualifiedName); } public static void dropIndexBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String datasetFullyQualifiedName) throws AsterixException { + String datasetFullyQualifiedName) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, dataverseName); lockMgr.acquireDatasetWriteLock(locks, datasetFullyQualifiedName); } public static void createTypeBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String itemTypeFullyQualifiedName) throws AsterixException { + String itemTypeFullyQualifiedName) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, dataverseName); lockMgr.acquireDataTypeWriteLock(locks, itemTypeFullyQualifiedName); } public static void dropDatasetBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String datasetFullyQualifiedName) throws AsterixException { + String datasetFullyQualifiedName) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, dataverseName); lockMgr.acquireDatasetWriteLock(locks, datasetFullyQualifiedName); } public static void dropTypeBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String dataTypeFullyQualifiedName) throws AsterixException { + String dataTypeFullyQualifiedName) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, dataverseName); lockMgr.acquireDataTypeWriteLock(locks, dataTypeFullyQualifiedName); } public static void functionStatementBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String functionFullyQualifiedName) throws AsterixException { + String functionFullyQualifiedName) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, dataverseName); lockMgr.acquireFunctionWriteLock(locks, functionFullyQualifiedName); } public static void modifyDatasetBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String datasetFullyQualifiedName) throws AsterixException { + String datasetFullyQualifiedName) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, dataverseName); lockMgr.acquireDatasetModifyLock(locks, datasetFullyQualifiedName); } public static void insertDeleteUpsertBegin(IMetadataLockManager lockMgr, LockList locks, - String datasetFullyQualifiedName) throws AsterixException { + String datasetFullyQualifiedName) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, MetadataUtil.getDataverseFromFullyQualifiedName(datasetFullyQualifiedName)); lockMgr.acquireDatasetModifyLock(locks, datasetFullyQualifiedName); } public static void dropFeedBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String feedFullyQualifiedName) throws AsterixException { + String feedFullyQualifiedName) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, dataverseName); lockMgr.acquireActiveEntityWriteLock(locks, feedFullyQualifiedName); } public static void dropFeedPolicyBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String policyName) throws AsterixException { + String policyName) throws AlgebricksException { lockMgr.acquireActiveEntityWriteLock(locks, policyName); lockMgr.acquireDataverseReadLock(locks, dataverseName); } public static void startFeedBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String feedName) throws AsterixException { + String feedName) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, dataverseName); lockMgr.acquireActiveEntityReadLock(locks, feedName); } public static void stopFeedBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String feedName) throws AsterixException { + String feedName) throws AlgebricksException { // TODO: dataset lock? lockMgr.acquireDataverseReadLock(locks, dataverseName); lockMgr.acquireActiveEntityReadLock(locks, feedName); } public static void createFeedBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String feedFullyQualifiedName) throws AsterixException { + String feedFullyQualifiedName) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, dataverseName); lockMgr.acquireActiveEntityWriteLock(locks, feedFullyQualifiedName); } public static void connectFeedBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String datasetFullyQualifiedName, String feedFullyQualifiedName) throws AsterixException { + String datasetFullyQualifiedName, String feedFullyQualifiedName) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, dataverseName); lockMgr.acquireActiveEntityReadLock(locks, feedFullyQualifiedName); lockMgr.acquireDatasetReadLock(locks, datasetFullyQualifiedName); } public static void createFeedPolicyBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String policyName) throws AsterixException { + String policyName) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, dataverseName); lockMgr.acquireFeedPolicyWriteLock(locks, policyName); } public static void disconnectFeedBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String datasetFullyQualifiedName, String feedFullyQualifiedName) throws AsterixException { + String datasetFullyQualifiedName, String feedFullyQualifiedName) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, dataverseName); lockMgr.acquireActiveEntityReadLock(locks, feedFullyQualifiedName); lockMgr.acquireDatasetReadLock(locks, datasetFullyQualifiedName); } public static void compactBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String datasetFullyQualifiedName) throws AsterixException { + String datasetFullyQualifiedName) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, dataverseName); lockMgr.acquireDatasetReadLock(locks, datasetFullyQualifiedName); } public static void refreshDatasetBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName, - String datasetFullyQualifiedName) throws AsterixException { + String datasetFullyQualifiedName) throws AlgebricksException { lockMgr.acquireDataverseReadLock(locks, dataverseName); lockMgr.acquireDatasetExclusiveModificationLock(locks, datasetFullyQualifiedName); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedRTreeOperationsHelper.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedRTreeOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedRTreeOperationsHelper.java index b663b42..9106193 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedRTreeOperationsHelper.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedRTreeOperationsHelper.java @@ -155,7 +155,7 @@ public class SecondaryCorrelatedRTreeOperationsHelper extends SecondaryCorrelate } @Override - public JobSpecification buildLoadingJobSpec() throws AsterixException, AlgebricksException { + public JobSpecification buildLoadingJobSpec() throws AlgebricksException { /*************************************************** * [ About PointMBR Optimization ] * Instead of storing a MBR(4 doubles) for a point(2 doubles) in RTree leaf node, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryRTreeOperationsHelper.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryRTreeOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryRTreeOperationsHelper.java index 1726470..b11b527 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryRTreeOperationsHelper.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryRTreeOperationsHelper.java @@ -172,7 +172,7 @@ public class SecondaryRTreeOperationsHelper extends SecondaryTreeIndexOperations } @Override - public JobSpecification buildLoadingJobSpec() throws AsterixException, AlgebricksException { + public JobSpecification buildLoadingJobSpec() throws AlgebricksException { /*************************************************** * [ About PointMBR Optimization ] * Instead of storing a MBR(4 doubles) for a point(2 doubles) in RTree leaf node, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java index df720f1..9307627 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.asterix.builders.OrderedListBuilder; -import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; import org.apache.asterix.om.base.AOrderedList; import org.apache.asterix.om.base.IAObject; @@ -97,7 +96,7 @@ public class AOrderedListSerializerDeserializer implements ISerializerDeserializ } AOrderedListType type = new AOrderedListType(currentItemType, "orderedlist"); return new AOrderedList(type, items); - } catch (AsterixException | IOException e) { + } catch (IOException e) { throw HyracksDataException.create(e); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java index b9afeb0..438a9bf 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java @@ -36,6 +36,7 @@ import org.apache.asterix.om.types.EnumDeserializer; import org.apache.asterix.om.types.IAType; import org.apache.asterix.om.types.TypeTagUtil; import org.apache.asterix.om.utils.NonTaggedFormatUtil; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; @@ -98,7 +99,7 @@ public class AUnorderedListSerializerDeserializer implements ISerializerDeserial } AUnorderedListType type = new AUnorderedListType(currentItemType, "unorderedlist"); return new AUnorderedList(type, items); - } catch (AsterixException | IOException e) { + } catch (IOException e) { throw HyracksDataException.create(e); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/PointableAllocator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/PointableAllocator.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/PointableAllocator.java index 3322924..5f463e6 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/PointableAllocator.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/PointableAllocator.java @@ -19,7 +19,6 @@ package org.apache.asterix.om.pointables; -import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.om.pointables.base.DefaultOpenFieldType; import org.apache.asterix.om.pointables.base.IVisitablePointable; import org.apache.asterix.om.types.AOrderedListType; @@ -30,6 +29,7 @@ import org.apache.asterix.om.types.TypeTagUtil; import org.apache.asterix.om.util.container.IObjectFactory; import org.apache.asterix.om.util.container.IObjectPool; import org.apache.asterix.om.util.container.ListObjectPool; +import org.apache.hyracks.api.exceptions.HyracksDataException; /** * This class is the ONLY place to create IVisitablePointable object instances, @@ -95,7 +95,7 @@ public class PointableAllocator { * @param typeTag * @return the pointable object */ - public IVisitablePointable allocateFieldValue(ATypeTag typeTag, byte[] b, int offset) throws AsterixException { + public IVisitablePointable allocateFieldValue(ATypeTag typeTag, byte[] b, int offset) throws HyracksDataException { if (typeTag == null) return flatValueAllocator.allocate(null); else if (typeTag.equals(ATypeTag.OBJECT)) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/AListPointable.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/AListPointable.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/AListPointable.java index 7a2efe0..114ff2b 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/AListPointable.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/AListPointable.java @@ -190,7 +190,7 @@ public class AListPointable extends AbstractPointable { } public void getItemValue(AbstractCollectionType inputType, int index, DataOutput dOut) - throws IOException, AsterixException { + throws IOException { if (getType() != ATypeTag.ANY.serialize()) { dOut.writeByte(getType()); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/ARecordPointable.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/ARecordPointable.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/ARecordPointable.java index 0aa256f..af7e29f 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/ARecordPointable.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/ARecordPointable.java @@ -220,7 +220,7 @@ public class ARecordPointable extends AbstractPointable { // ----------------------- public void getClosedFieldValue(ARecordType recordType, int fieldId, DataOutput dOut) - throws IOException, AsterixException { + throws IOException { if (isClosedFieldNull(recordType, fieldId)) { dOut.writeByte(ATypeTag.SERIALIZED_NULL_TYPE_TAG); } else if (isClosedFieldMissing(recordType, fieldId)) { @@ -287,7 +287,7 @@ public class ARecordPointable extends AbstractPointable { // ----------------------- public void getOpenFieldValue(ARecordType recordType, int fieldId, DataOutput dOut) - throws IOException, AsterixException { + throws IOException { dOut.write(bytes, getOpenFieldValueOffset(recordType, fieldId), getOpenFieldValueSize(recordType, fieldId)); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/TypeTagUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/TypeTagUtil.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/TypeTagUtil.java index 5d91d2f..cfc1b55 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/TypeTagUtil.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/TypeTagUtil.java @@ -18,13 +18,13 @@ */ package org.apache.asterix.om.types; -import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.om.utils.RecordUtil; +import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference; public class TypeTagUtil { - public static IAType getBuiltinTypeByTag(ATypeTag typeTag) throws AsterixException { + public static IAType getBuiltinTypeByTag(ATypeTag typeTag) throws HyracksDataException { switch (typeTag) { case TINYINT: return BuiltinType.AINT8; @@ -89,7 +89,8 @@ public class TypeTagUtil { case ARRAY: return AOrderedListType.FULL_OPEN_ORDEREDLIST_TYPE; default: - throw new AsterixException("Typetag " + typeTag + " is not a built-in type"); + // TODO(tillw) should be an internal error + throw new HyracksDataException("Typetag " + typeTag + " is not a built-in type"); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/DeepEqualAssessor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/DeepEqualAssessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/DeepEqualAssessor.java index 0c397f0..1faf75c 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/DeepEqualAssessor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/DeepEqualAssessor.java @@ -43,7 +43,7 @@ public class DeepEqualAssessor { private final DeepEqualityVisitor equalityVisitor = new DeepEqualityVisitor(); public boolean isEqual(IVisitablePointable leftPointable, IVisitablePointable rightPointable) - throws HyracksDataException, AsterixException { + throws HyracksDataException { if (leftPointable == null || rightPointable == null) { return false; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PointableHelper.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PointableHelper.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PointableHelper.java index 5a293f3..df8fc75 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PointableHelper.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PointableHelper.java @@ -21,7 +21,6 @@ package org.apache.asterix.runtime.evaluators.functions; import java.io.DataOutput; import java.io.IOException; -import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.om.pointables.base.IVisitablePointable; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.EnumDeserializer; @@ -41,8 +40,8 @@ import org.apache.hyracks.util.string.UTF8StringWriter; */ public class PointableHelper { - private static final IBinaryComparator STRING_BINARY_COMPARATOR = PointableBinaryComparatorFactory.of( - UTF8StringPointable.FACTORY).createBinaryComparator(); + private static final IBinaryComparator STRING_BINARY_COMPARATOR = + PointableBinaryComparatorFactory.of(UTF8StringPointable.FACTORY).createBinaryComparator(); private final UTF8StringWriter utf8Writer; public PointableHelper() { @@ -112,7 +111,7 @@ public class PointableHelper { * @param writeTag * Specifying whether a tag for the string should also be written */ - public void serializeString(String str, IMutableValueStorage vs, boolean writeTag) throws AsterixException { + public void serializeString(String str, IMutableValueStorage vs, boolean writeTag) throws HyracksDataException { vs.reset(); try { DataOutput output = vs.getDataOutput(); @@ -121,7 +120,7 @@ public class PointableHelper { } utf8Writer.writeUTF8(str, output); } catch (IOException e) { - throw new AsterixException("Could not serialize " + str); + throw new HyracksDataException("Could not serialize " + str); } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/GetRecordFieldsEvalFactory.java ---------------------------------------------------------------------- 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 72d2e69..2019b55 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 @@ -78,8 +78,6 @@ public class GetRecordFieldsEvalFactory implements IScalarEvaluatorFactory { rfu.processRecord(recordPointable, recordType, out, 0); } catch (IOException e) { throw new HyracksDataException(e); - } catch (AsterixException e) { - throw new HyracksDataException(e); } result.set(resultStorage); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordAddFieldsDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordAddFieldsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordAddFieldsDescriptor.java index 97a9ee0..71a8291 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordAddFieldsDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordAddFieldsDescriptor.java @@ -113,12 +113,8 @@ public class RecordAddFieldsDescriptor extends AbstractScalarFunctionDynamicDesc final ArrayBackedValueStorage fieldNamePointable = new ArrayBackedValueStorage(); final ArrayBackedValueStorage fieldValuePointer = new ArrayBackedValueStorage(); final PointableHelper pointableHelper = new PointableHelper(); - try { - pointableHelper.serializeString("field-name", fieldNamePointable, true); - pointableHelper.serializeString("field-value", fieldValuePointer, true); - } catch (AsterixException e) { - throw new HyracksDataException(e); - } + pointableHelper.serializeString("field-name", fieldNamePointable, true); + pointableHelper.serializeString("field-value", fieldValuePointer, true); return new IScalarEvaluator() { public static final int TABLE_FRAME_SIZE = 32768; // the default 32k frame size http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordFieldsUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordFieldsUtil.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordFieldsUtil.java index 6127c28..6c0eb06 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordFieldsUtil.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordFieldsUtil.java @@ -82,7 +82,7 @@ public class RecordFieldsUtil { private final static ARecordType openType = DefaultOpenFieldType.NESTED_OPEN_RECORD_TYPE; public void processRecord(ARecordPointable recordAccessor, ARecordType recType, DataOutput out, int level) - throws IOException, AsterixException { + throws IOException { if (level == 0) { // Resets pools for recycling objects before processing a top-level record. resetPools(); @@ -176,7 +176,7 @@ public class RecordFieldsUtil { } public void addNameField(IValueReference nameArg, IARecordBuilder fieldRecordBuilder) - throws HyracksDataException, AsterixException { + throws HyracksDataException { ArrayBackedValueStorage fieldAbvs = getTempBuffer(); fieldAbvs.reset(); @@ -185,7 +185,7 @@ public class RecordFieldsUtil { } public void addFieldType(byte tagId, IARecordBuilder fieldRecordBuilder) - throws HyracksDataException, AsterixException { + throws HyracksDataException { ArrayBackedValueStorage fieldAbvs = getTempBuffer(); ArrayBackedValueStorage valueAbvs = getTempBuffer(); @@ -202,7 +202,7 @@ public class RecordFieldsUtil { } public void addIsOpenField(boolean isOpen, IARecordBuilder fieldRecordBuilder) - throws HyracksDataException, AsterixException { + throws HyracksDataException { ArrayBackedValueStorage fieldAbvs = getTempBuffer(); ArrayBackedValueStorage valueAbvs = getTempBuffer(); @@ -220,7 +220,7 @@ public class RecordFieldsUtil { } public void addListField(IValueReference listArg, IAType fieldType, IARecordBuilder fieldRecordBuilder, int level) - throws AsterixException, IOException { + throws IOException { ArrayBackedValueStorage fieldAbvs = getTempBuffer(); ArrayBackedValueStorage valueAbvs = getTempBuffer(); @@ -234,7 +234,7 @@ public class RecordFieldsUtil { } public void addNestedField(IValueReference recordArg, IAType fieldType, IARecordBuilder fieldRecordBuilder, - int level) throws IOException, AsterixException { + int level) throws IOException { ArrayBackedValueStorage fieldAbvs = getTempBuffer(); ArrayBackedValueStorage valueAbvs = getTempBuffer(); @@ -256,7 +256,7 @@ public class RecordFieldsUtil { } public void processListValue(IValueReference listArg, IAType fieldType, DataOutput out, int level) - throws AsterixException, IOException { + throws IOException { ArrayBackedValueStorage itemValue = getTempBuffer(); IARecordBuilder listRecordBuilder = getRecordBuilder(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordMergeDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordMergeDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordMergeDescriptor.java index ce7ed6e..63b58ed 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordMergeDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordMergeDescriptor.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.asterix.builders.RecordBuilder; -import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.common.exceptions.ErrorCode; import org.apache.asterix.common.exceptions.RuntimeDataException; import org.apache.asterix.om.functions.BuiltinFunctions; @@ -132,7 +131,7 @@ public class RecordMergeDescriptor extends AbstractScalarFunctionDynamicDescript try { mergeFields(outRecType, rp0, rp1, true, 0); rbStack.get(0).write(out, true); - } catch (IOException | AsterixException e) { + } catch (IOException e) { throw new HyracksDataException(e); } result.set(resultStorage); @@ -140,7 +139,7 @@ public class RecordMergeDescriptor extends AbstractScalarFunctionDynamicDescript private void mergeFields(ARecordType combinedType, ARecordVisitablePointable leftRecord, ARecordVisitablePointable rightRecord, boolean openFromParent, int nestedLevel) - throws IOException, AsterixException, HyracksDataException { + throws IOException { if (rbStack.size() < (nestedLevel + 1)) { rbStack.add(new RecordBuilder()); } @@ -207,7 +206,7 @@ public class RecordMergeDescriptor extends AbstractScalarFunctionDynamicDescript */ private void addFieldToSubRecord(ARecordType combinedType, IVisitablePointable fieldNamePointable, IVisitablePointable leftValue, IVisitablePointable rightValue, boolean openFromParent, - int nestedLevel) throws IOException, AsterixException, HyracksDataException { + int nestedLevel) throws IOException { runtimeRecordTypeInfo.reset(combinedType); int pos = runtimeRecordTypeInfo.getFieldIndex(fieldNamePointable.getByteArray(), http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordRemoveFieldsEvalFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordRemoveFieldsEvalFactory.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordRemoveFieldsEvalFactory.java index 2f55cd7..74f7259 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordRemoveFieldsEvalFactory.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordRemoveFieldsEvalFactory.java @@ -118,7 +118,7 @@ class RecordRemoveFieldsEvalFactory implements IScalarEvaluatorFactory { rbStack.clear(); processRecord(requiredRecType, recordPointable, listPointable, 0); rbStack.get(0).write(out, true); - } catch (IOException | AsterixException e) { + } catch (IOException e) { throw new HyracksDataException(e); } result.set(resultStorage); @@ -126,7 +126,7 @@ class RecordRemoveFieldsEvalFactory implements IScalarEvaluatorFactory { private void processRecord(ARecordType requiredType, ARecordVisitablePointable srp, AListVisitablePointable inputList, int nestedLevel) - throws IOException, AsterixException, HyracksDataException { + throws IOException { if (rbStack.size() < (nestedLevel + 1)) { rbStack.add(new RecordBuilder()); } @@ -157,7 +157,7 @@ class RecordRemoveFieldsEvalFactory implements IScalarEvaluatorFactory { private void addKeptFieldToSubRecord(ARecordType requiredType, IVisitablePointable fieldNamePointable, IVisitablePointable fieldValuePointable, IVisitablePointable fieldTypePointable, AListVisitablePointable inputList, int nestedLevel) - throws IOException, AsterixException, HyracksDataException { + throws IOException { runtimeRecordTypeInfo.reset(requiredType); int pos = runtimeRecordTypeInfo.getFieldIndex(fieldNamePointable.getByteArray(), http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java index 4664938..4855a27 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java @@ -330,7 +330,7 @@ public class LSMPrimaryUpsertOperatorNodePushable extends LSMIndexInsertUpdateDe appender.write(writer, true); } - private void appendFilterToPrevTuple() throws IOException, AsterixException { + private void appendFilterToPrevTuple() throws IOException { if (isFiltered) { prevRecWithPKWithFilterValue.reset(); for (int i = 0; i < prevTuple.getFieldCount(); i++) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/CcApplicationContext.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/CcApplicationContext.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/CcApplicationContext.java index 855031e..0bd8b9e 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/CcApplicationContext.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/CcApplicationContext.java @@ -44,6 +44,7 @@ import org.apache.asterix.common.metadata.IMetadataBootstrap; import org.apache.asterix.common.replication.IFaultToleranceStrategy; import org.apache.asterix.common.transactions.IResourceIdManager; import org.apache.asterix.runtime.transaction.ResourceIdManager; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.api.application.ICCServiceContext; import org.apache.hyracks.api.client.HyracksConnection; import org.apache.hyracks.api.client.IHyracksClientConnection; @@ -86,7 +87,7 @@ public class CcApplicationContext implements ICcApplicationContext { ILibraryManager libraryManager, Supplier<IMetadataBootstrap> metadataBootstrapSupplier, IGlobalRecoveryManager globalRecoveryManager, IFaultToleranceStrategy ftStrategy, IJobLifecycleListener activeLifeCycleListener, IStorageComponentProvider storageComponentProvider, - IMetadataLockManager mdLockManager) throws AsterixException, IOException { + IMetadataLockManager mdLockManager) throws AlgebricksException, IOException { this.ccServiceCtx = ccServiceCtx; this.hcc = hcc; this.libraryManager = libraryManager; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java index ac83b71..10926e0 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java @@ -44,6 +44,7 @@ import org.apache.asterix.common.transactions.IResourceIdManager; import org.apache.asterix.event.schema.cluster.Cluster; import org.apache.asterix.event.schema.cluster.Node; import org.apache.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.api.config.IOption; import org.apache.hyracks.api.config.Section; import org.apache.hyracks.api.exceptions.HyracksDataException; @@ -396,7 +397,7 @@ public class ClusterStateManager implements IClusterStateManager { @Override public synchronized void registerNodePartitions(String nodeId, ClusterPartition[] nodePartitions) - throws AsterixException { + throws AlgebricksException { if (LOGGER.isLoggable(Level.INFO)) { LOGGER.info("Registering node partitions for node " + nodeId + ": " + Arrays.toString(nodePartitions)); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/AdmDataGen.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/AdmDataGen.java b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/AdmDataGen.java index 3b2d0ce..70bf864 100644 --- a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/AdmDataGen.java +++ b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/AdmDataGen.java @@ -937,7 +937,7 @@ public class AdmDataGen { this.outputDir = outputDir; } - public void init() throws IOException, ParseException, AsterixException, ACIDException, MetadataException, + public void init() throws IOException, ParseException, ACIDException, AlgebricksException { FileReader aql = new FileReader(schemaFile); IParser parser = parserFactory.createParser(aql); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java index 94389b2..9d60995 100644 --- a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java +++ b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java @@ -47,7 +47,7 @@ public class ADGenDmlTranslator extends AbstractLangTranslator { this.aqlStatements = aqlStatements; } - public void translate() throws AsterixException, MetadataException, AlgebricksException { + public void translate() throws AlgebricksException { String defaultDataverse = getDefaultDataverse(); types = new HashMap<TypeSignature, IAType>(); typeDataGenMap = new HashMap<TypeSignature, TypeDataGen>(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-transactions/pom.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/pom.xml b/asterixdb/asterix-transactions/pom.xml index 5c067e7..b7e1871 100644 --- a/asterixdb/asterix-transactions/pom.xml +++ b/asterixdb/asterix-transactions/pom.xml @@ -145,6 +145,10 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-runtime</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/DatasetIdFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/DatasetIdFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/DatasetIdFactory.java index 7acefe9..ffc0268 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/DatasetIdFactory.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/DatasetIdFactory.java @@ -20,6 +20,7 @@ package org.apache.asterix.transaction.management.service.transaction; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.common.exceptions.ErrorCode; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; public class DatasetIdFactory { private static int id = 0; @@ -34,7 +35,7 @@ public class DatasetIdFactory { isInitialized = true; } - public static synchronized int generateDatasetId() throws AsterixException { + public static synchronized int generateDatasetId() throws AlgebricksException { if (id == Integer.MAX_VALUE) { throw new AsterixException(ErrorCode.DATASET_ID_EXHAUSTED); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-yarn/pom.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-yarn/pom.xml b/asterixdb/asterix-yarn/pom.xml index 0a9fa17..5e67c8e 100644 --- a/asterixdb/asterix-yarn/pom.xml +++ b/asterixdb/asterix-yarn/pom.xml @@ -459,6 +459,10 @@ <artifactId>hyracks-control-cc</artifactId> </dependency> <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-common</artifactId> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/23761dd7/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/AsterixApplicationMaster.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/AsterixApplicationMaster.java b/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/AsterixApplicationMaster.java index 4a900e1..8aeb718 100644 --- a/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/AsterixApplicationMaster.java +++ b/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/AsterixApplicationMaster.java @@ -46,7 +46,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import org.apache.asterix.common.config.GlobalConfig; -import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.common.utils.StorageConstants; import org.apache.asterix.event.schema.yarnCluster.Cluster; import org.apache.asterix.event.schema.yarnCluster.MasterNode; @@ -89,6 +88,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.util.Records; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Level; import org.apache.log4j.Logger; @@ -383,7 +383,7 @@ public class AsterixApplicationMaster { LOG.info("Path suffix: " + instanceConfPath); } - public boolean init() throws ParseException, IOException, AsterixException, YarnException { + public boolean init() throws ParseException, IOException, AlgebricksException, YarnException { try { localizeDFSResources(); clusterDesc = Utils.parseYarnClusterConfig(CLUSTER_DESC_PATH);
