You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by dl...@apache.org on 2018/05/30 17:44:51 UTC

[24/24] asterixdb git commit: [ASTERIXDB-2393][COMP][RT] Add source location to error messages

[ASTERIXDB-2393][COMP][RT] Add source location to error messages

- user model changes: no
- storage format changes: no
- interface changes: no

Details:
- Add source locations to compiler and runtime error messages
- Add source location enforcement to the test framework
  and enable it for SqlppExecutionTest

Change-Id: Ie279ce345d1edcb5dea8e55cdb0233151c7bfd66
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2659
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/ee54cc02
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/ee54cc02
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/ee54cc02

Branch: refs/heads/master
Commit: ee54cc025483292f29d08dad2958e4bf9d1dda62
Parents: 1102ed5
Author: Dmitry Lychagin <dm...@couchbase.com>
Authored: Fri May 25 19:26:18 2018 -0700
Committer: Dmitry Lychagin <dm...@couchbase.com>
Committed: Wed May 30 10:44:02 2018 -0700

----------------------------------------------------------------------
 .../algebra/extension/ExtensionStatement.java   |   4 +-
 .../physical/BTreeSearchPOperator.java          |   6 +-
 .../operators/physical/CommitPOperator.java     |   1 +
 .../physical/ExternalDataLookupPOperator.java   |   6 +-
 .../physical/InvertedIndexPOperator.java        |   6 +-
 .../physical/RTreeSearchPOperator.java          |   6 +-
 .../jobgen/QueryLogicalExpressionJobGen.java    |   5 +-
 ...quivalenceClassForRecordConstructorRule.java |  10 +-
 .../AsterixIntroduceGroupByCombinerRule.java    |  41 +-
 .../rules/ByNameToByHandleFieldAccessRule.java  |  17 +-
 .../rules/ByNameToByIndexFieldAccessRule.java   |  13 +-
 .../CancelUnnestWithNestedListifyRule.java      |  11 +-
 .../rules/CheckFilterExpressionTypeRule.java    |   4 +-
 .../rules/CheckInsertUpsertReturningRule.java   |   5 +-
 .../rules/DisjunctivePredicateToJoinRule.java   |  11 +-
 .../rules/ExtractDistinctByExpressionsRule.java |   3 +-
 .../rules/ExtractOrderExpressionsRule.java      |   4 +-
 .../rules/FeedScanCollectionToUnnest.java       |   3 +-
 .../rules/FixReplicateOperatorOutputsRule.java  |   4 +-
 .../FullTextContainsParameterCheckRule.java     |  41 +-
 .../asterix/optimizer/rules/FuzzyEqRule.java    |   8 +-
 .../asterix/optimizer/rules/FuzzyJoinRule.java  |   1 +
 .../rules/InjectTypeCastForSwitchCaseRule.java  |   1 +
 .../rules/InjectTypeCastForUnionRule.java       |  12 +-
 .../rules/IntroduceAutogenerateIDRule.java      |  35 +-
 ...eDynamicTypeCastForExternalFunctionRule.java |  12 +-
 .../rules/IntroduceDynamicTypeCastRule.java     |  20 +-
 ...aterializationForInsertWithSelfScanRule.java |   1 +
 ...ceRandomPartitioningFeedComputationRule.java |   1 +
 ...IntroduceSecondaryIndexInsertDeleteRule.java | 128 ++-
 ...ntroduceTransactionCommitByAssignOpRule.java |   6 +-
 ...roduceUnnestForCollectionToSequenceRule.java |  10 +-
 .../rules/ListifyUnnestingFunctionRule.java     |  23 +-
 .../optimizer/rules/LoadRecordFieldsRule.java   |   9 +-
 .../rules/MetaFunctionToMetaVariableRule.java   |  35 +-
 .../PullPositionalVariableFromUnnestRule.java   |   2 +
 .../PushAggFuncIntoStandaloneAggregateRule.java |   5 +-
 .../PushAggregateIntoNestedSubplanRule.java     |   5 +-
 .../optimizer/rules/PushFieldAccessRule.java    |  28 +-
 .../rules/PushLimitIntoOrderByRule.java         |   1 +
 ...moveLeftOuterUnnestForLeftOuterJoinRule.java |   5 +-
 .../rules/RemoveRedundantListifyRule.java       |   8 +-
 .../rules/SetAsterixPhysicalOperatorsRule.java  |  34 +-
 .../rules/SetClosedRecordConstructorsRule.java  |   6 +-
 .../rules/SetupCommitExtensionOpRule.java       |   1 +
 .../optimizer/rules/SimilarityCheckRule.java    |  22 +-
 .../SweepIllegalNonfunctionalFunctions.java     |   4 +-
 .../am/AbstractIntroduceAccessMethodRule.java   |   8 +-
 .../rules/am/AccessMethodJobGenParams.java      |   4 +-
 .../optimizer/rules/am/AccessMethodUtils.java   | 134 ++-
 .../optimizer/rules/am/BTreeAccessMethod.java   |  30 +-
 .../am/IntroduceLSMComponentFilterRule.java     |  39 +-
 .../am/IntroduceSelectAccessMethodRule.java     |  10 +-
 .../rules/am/InvertedIndexAccessMethod.java     |  60 +-
 .../rules/am/OptimizableOperatorSubTree.java    |  10 +-
 .../optimizer/rules/am/RTreeAccessMethod.java   |   3 +
 .../subplan/InlineAllNtsInSubplanVisitor.java   | 100 ++-
 ...neLeftNtsInSubplanJoinFlatteningVisitor.java |   9 +-
 ...ineSubplanInputForNestedTupleSourceRule.java | 111 ++-
 .../TranslateIntervalExpressionRule.java        |  10 +-
 .../rules/typecast/StaticTypeCastUtil.java      |   4 +-
 .../rules/util/EquivalenceClassUtils.java       |   8 +-
 .../AqlExpressionToPlanTranslator.java          |   2 +-
 .../asterix/translator/CompiledStatements.java  |  49 +-
 .../LangExpressionToPlanTranslator.java         | 554 ++++++++----
 .../SqlppExpressionToPlanTranslator.java        | 195 ++--
 .../translator/TranslationException.java        |  29 -
 .../translator/util/PlanTranslationUtil.java    |  29 +-
 .../asterix/translator/util/ValidateUtil.java   |  28 +-
 .../apache/asterix/api/common/APIFramework.java |  34 +-
 .../app/function/DatasetResourcesRewriter.java  |   5 +-
 .../asterix/app/function/DatasetRewriter.java   |   9 +-
 .../asterix/app/function/FeedRewriter.java      |  13 +-
 .../asterix/app/function/FunctionRewriter.java  |  21 +-
 .../app/function/StorageComponentsRewriter.java |   5 +-
 .../asterix/app/translator/QueryTranslator.java | 304 ++++---
 .../org/apache/asterix/utils/RebalanceUtil.java |   6 +-
 .../app/bootstrap/TestNodeController.java       |   9 +-
 .../test/common/CancellationTestExecutor.java   |   3 +-
 .../asterix/test/common/TestExecutor.java       |  30 +-
 .../asterix/test/dataflow/TestDataset.java      |   3 +-
 .../ddl/SecondaryBTreeOperationsHelperTest.java |   4 +-
 .../async-deferred/AsyncDeferredQueries.xml     |   1 +
 .../queries_sqlpp/objects/ObjectsQueries.xml    |   3 +
 .../resources/runtimets/testsuite_sqlpp.xml     |  40 +-
 .../LSMInsertDeleteOperatorNodePushable.java    |  13 +-
 .../LSMTreeInsertDeleteOperatorDescriptor.java  |   2 +-
 .../common/exceptions/AsterixException.java     |  15 +-
 .../common/exceptions/CompilationException.java |   9 +
 .../asterix/common/exceptions/ErrorCode.java    |  10 +
 .../common/exceptions/MetadataException.java    |   9 +
 .../common/exceptions/RuntimeDataException.java |   9 +
 .../main/resources/asx_errormsg/en.properties   |  10 +
 ...ilesIndexModificationOperatorDescriptor.java |   2 +-
 .../asterix/external/parser/ParseException.java |   9 +-
 .../common/EditDistanceCheckEvaluator.java      |   9 +-
 .../common/EditDistanceContainsEvaluator.java   |  12 +-
 .../common/EditDistanceEvaluator.java           |  17 +-
 .../functions/EditDistanceCheckDescriptor.java  |   2 +-
 .../EditDistanceContainsDescriptor.java         |   2 +-
 .../functions/EditDistanceDescriptor.java       |   2 +-
 .../functions/PrefixLenDescriptor.java          |   6 +-
 .../functions/PrefixLenJaccardDescriptor.java   |   2 +-
 .../functions/SimilarityDescriptor.java         |  12 +-
 .../functions/SpatialIntersectDescriptor.java   |  28 +-
 .../aggregates/STUnionAggregateDescriptor.java  |   2 +-
 .../aggregates/STUnionAggregateFunction.java    |  12 +-
 .../functions/AbstractGetValDescriptor.java     |   4 +-
 .../AbstractSTDoubleGeometryDescriptor.java     |   4 +-
 .../AbstractSTGeometryNDescriptor.java          |   8 +-
 .../AbstractSTSingleGeometryDescriptor.java     |   2 +-
 .../functions/ParseGeoJSONDescriptor.java       |   5 +-
 .../functions/STGeomFromTextDescriptor.java     |   5 +-
 .../functions/STGeomFromTextSRIDDescriptor.java |   9 +-
 .../functions/STGeomFromWKBDescriptor.java      |   5 +-
 .../functions/STMakeEnvelopeDescriptorSRID.java |   3 +-
 .../functions/STPolygonizeDescriptor.java       |   5 +-
 .../functions/STRelateDescriptor.java           |  10 +-
 .../asterix/lang/aql/clause/DistinctClause.java |   4 +-
 .../asterix/lang/aql/clause/ForClause.java      |   4 +-
 .../asterix/lang/aql/clause/JoinClause.java     |   3 +-
 .../lang/aql/clause/MetaVariableClause.java     |   4 +-
 .../lang/aql/rewrites/AqlQueryRewriter.java     |   2 +-
 .../lang/common/base/AbstractClause.java        |  23 +
 .../lang/common/base/AbstractExpression.java    |   3 +-
 .../common/base/AbstractLangExpression.java     |  35 +
 .../lang/common/base/AbstractStatement.java     |  23 +
 .../lang/common/base/ILangExpression.java       |   5 +-
 .../lang/common/clause/GroupbyClause.java       |   4 +-
 .../asterix/lang/common/clause/LetClause.java   |   4 +-
 .../asterix/lang/common/clause/LimitClause.java |   4 +-
 .../lang/common/clause/OrderbyClause.java       |   4 +-
 .../lang/common/clause/UpdateClause.java        |   4 +-
 .../asterix/lang/common/clause/WhereClause.java |   4 +-
 .../expression/AbstractTypeExpression.java      |  25 +
 .../lang/common/expression/LiteralExpr.java     |  10 -
 .../expression/OrderedListTypeDefinition.java   |   2 +-
 .../common/expression/RecordTypeDefinition.java |   2 +-
 .../expression/TypeReferenceExpression.java     |   2 +-
 .../expression/UnorderedListTypeDefinition.java |   2 +-
 .../lang/common/statement/CompactStatement.java |   3 +-
 .../common/statement/ConnectFeedStatement.java  |   3 +-
 .../statement/CreateDataverseStatement.java     |   3 +-
 .../statement/CreateFeedPolicyStatement.java    |   3 +-
 .../common/statement/CreateFeedStatement.java   |   3 +-
 .../statement/CreateFunctionStatement.java      |   3 +-
 .../common/statement/CreateIndexStatement.java  |   3 +-
 .../lang/common/statement/DatasetDecl.java      |   3 +-
 .../lang/common/statement/DataverseDecl.java    |   3 +-
 .../statement/DataverseDropStatement.java       |   3 +-
 .../lang/common/statement/DeleteStatement.java  |   3 +-
 .../statement/DisconnectFeedStatement.java      |   3 +-
 .../common/statement/DropDatasetStatement.java  |   3 +-
 .../common/statement/FeedDropStatement.java     |   3 +-
 .../statement/FeedPolicyDropStatement.java      |   3 +-
 .../lang/common/statement/FunctionDecl.java     |   3 +-
 .../common/statement/FunctionDropStatement.java |   3 +-
 .../common/statement/IndexDropStatement.java    |   3 +-
 .../lang/common/statement/InsertStatement.java  |   3 +-
 .../lang/common/statement/LoadStatement.java    |   3 +-
 .../statement/NodeGroupDropStatement.java       |   3 +-
 .../lang/common/statement/NodegroupDecl.java    |   3 +-
 .../asterix/lang/common/statement/Query.java    |   3 +-
 .../RefreshExternalDatasetStatement.java        |   3 +-
 .../lang/common/statement/SetStatement.java     |   3 +-
 .../common/statement/StartFeedStatement.java    |   4 +-
 .../common/statement/StopFeedStatement.java     |   4 +-
 .../asterix/lang/common/statement/TypeDecl.java |   3 +-
 .../common/statement/TypeDropStatement.java     |   3 +-
 .../lang/common/statement/UpdateStatement.java  |   3 +-
 .../lang/common/statement/WriteStatement.java   |   3 +-
 .../asterix/lang/common/util/FunctionUtil.java  |  18 +-
 .../visitor/AbstractInlineUdfsVisitor.java      |  15 +-
 .../CloneAndSubstituteVariablesVisitor.java     |  30 +-
 asterixdb/asterix-lang-sqlpp/pom.xml            |   4 +
 .../clause/AbstractBinaryCorrelateClause.java   |   4 +-
 .../asterix/lang/sqlpp/clause/FromClause.java   |   7 +-
 .../asterix/lang/sqlpp/clause/FromTerm.java     |   4 +-
 .../asterix/lang/sqlpp/clause/HavingClause.java |   4 +-
 .../asterix/lang/sqlpp/clause/Projection.java   |   4 +-
 .../asterix/lang/sqlpp/clause/SelectBlock.java  |   4 +-
 .../asterix/lang/sqlpp/clause/SelectClause.java |   4 +-
 .../lang/sqlpp/clause/SelectElement.java        |   4 +-
 .../lang/sqlpp/clause/SelectRegular.java        |   4 +-
 .../lang/sqlpp/clause/SelectSetOperation.java   |   4 +-
 .../lang/sqlpp/parser/SqlppParseException.java  |  36 +
 .../lang/sqlpp/rewrites/SqlppQueryRewriter.java |   3 +-
 .../visitor/GenerateColumnNameVisitor.java      |   4 +-
 .../visitor/OperatorExpressionVisitor.java      |  45 +-
 .../rewrites/visitor/SetOperationVisitor.java   |  12 +-
 .../SqlppBuiltinFunctionRewriteVisitor.java     |  14 +-
 .../SqlppDistinctAggregationSugarVisitor.java   |  16 +-
 .../SqlppGroupByAggregationSugarVisitor.java    |  33 +-
 .../rewrites/visitor/SqlppGroupByVisitor.java   |   9 +-
 .../visitor/VariableCheckAndRewriteVisitor.java |  56 +-
 .../sqlpp/util/ExpressionToVariableUtil.java    |  10 +-
 .../lang/sqlpp/util/FunctionMapUtil.java        |  20 +-
 .../lang/sqlpp/util/SqlppRewriteUtil.java       |   1 +
 .../lang/sqlpp/visitor/DeepCopyVisitor.java     | 132 ++-
 .../sqlpp/visitor/SqlppAstPrintVisitor.java     |   2 +-
 ...SqlppCloneAndSubstituteVariablesVisitor.java |  55 +-
 .../visitor/SqlppDeleteRewriteVisitor.java      |  13 +-
 .../AbstractSqlppExpressionScopingVisitor.java  |  51 +-
 .../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 885 +++++++++++--------
 .../asterix/lang/extension/EchoStatement.java   |   4 +-
 asterixdb/asterix-metadata/pom.xml              |   4 +
 .../asterix/metadata/entities/Dataset.java      |  11 +-
 .../utils/ExternalIndexingOperations.java       |  22 +-
 .../asterix/metadata/utils/IndexUtil.java       |  28 +-
 .../utils/SecondaryBTreeOperationsHelper.java   |  20 +-
 ...econdaryCorrelatedBTreeOperationsHelper.java |  12 +-
 ...CorrelatedInvertedIndexOperationsHelper.java |  16 +-
 ...econdaryCorrelatedRTreeOperationsHelper.java |  10 +-
 ...daryCorrelatedTreeIndexOperationsHelper.java |  17 +-
 .../utils/SecondaryIndexOperationsHelper.java   |  27 +-
 .../SecondaryInvertedIndexOperationsHelper.java |  21 +-
 .../utils/SecondaryRTreeOperationsHelper.java   |  13 +-
 .../SecondaryTreeIndexOperationsHelper.java     |   3 +
 .../data/common/ExpressionTypeComputer.java     |   8 +-
 .../MergeAggregationExpressionFactory.java      |   6 +-
 .../asterix/formats/base/IDataFormat.java       |  10 +-
 .../exceptions/IncompatibleTypeException.java   |  13 +
 .../exceptions/InvalidExpressionException.java  |  13 +
 .../om/exceptions/TypeMismatchException.java    |  14 +
 .../UnsupportedItemTypeException.java           |  11 +
 .../om/exceptions/UnsupportedTypeException.java |  11 +
 .../functions/AbstractFunctionDescriptor.java   |  15 +-
 .../om/functions/IFunctionDescriptor.java       |   6 +-
 .../base/AbstractResultTypeComputer.java        |  16 +-
 .../om/typecomputer/base/TypeCastUtils.java     |   2 +-
 .../AbstractIfMissingOrNullTypeComputer.java    |   4 +-
 .../impl/AbstractStringTypeComputer.java        |   6 +-
 .../impl/BooleanFunctionTypeComputer.java       |   4 +-
 .../impl/ClosedRecordConstructorResultType.java |   3 +-
 .../impl/CollectionMemberResultType.java        |   7 +-
 .../impl/FieldAccessByIndexResultType.java      |   8 +-
 .../impl/FieldAccessByNameResultType.java       |   8 +-
 .../impl/FieldAccessNestedResultType.java       |  15 +-
 .../FullTextContainsResultTypeComputer.java     |  13 +-
 .../impl/InjectFailureTypeComputer.java         |   8 +-
 .../impl/MinMaxAggTypeComputer.java             |   6 +-
 .../impl/NonTaggedGetItemResultType.java        |   9 +-
 .../impl/NumericAddSubMulDivTypeComputer.java   |  32 +-
 .../impl/NumericAggTypeComputer.java            |   6 +-
 .../impl/NumericDivideTypeComputer.java         |  26 +-
 ...NumericDoubleOutputFunctionTypeComputer.java |   6 +-
 .../NumericInt8OutputFunctionTypeComputer.java  |   6 +-
 .../impl/NumericRound2TypeComputer.java         |  12 +-
 .../impl/NumericUnaryFunctionTypeComputer.java  |   6 +-
 .../impl/RecordAddFieldsTypeComputer.java       |   7 +-
 .../impl/RecordMergeTypeComputer.java           |  20 +-
 .../impl/RecordPairsTypeComputer.java           |   6 +-
 .../impl/RecordRemoveFieldsTypeComputer.java    |  35 +-
 .../ScalarVersionOfAggregateResultType.java     |   6 +-
 .../om/typecomputer/impl/SleepTypeComputer.java |   6 +-
 .../impl/StringIntToStringTypeComputer.java     |  10 +-
 .../impl/SubsetCollectionTypeComputer.java      |   9 +-
 .../impl/SubstringTypeComputer.java             |  10 +-
 .../typecomputer/impl/SwitchCaseComputer.java   |   3 +-
 .../om/typecomputer/impl/TypeComputeUtils.java  |  18 +-
 .../impl/UnaryBinaryInt64TypeComputer.java      |   6 +-
 .../impl/UnaryMinusTypeComputer.java            |   6 +-
 .../impl/UnaryStringInt64TypeComputer.java      |   6 +-
 .../FirstElementAggregateDescriptor.java        |   2 +-
 .../collections/FirstElementEvalFactory.java    |   8 +-
 .../collections/ListifyAggregateDescriptor.java |   2 +-
 .../ListifyAggregateFunctionEvalFactory.java    |   9 +-
 .../LocalFirstElementAggregateDescriptor.java   |   2 +-
 .../AbstractScalarAggregateDescriptor.java      |   2 +-
 .../AbstractSerializableAggregateFunction.java  |  31 +
 ...bstractSerializableAvgAggregateFunction.java |  15 +-
 ...tractSerializableCountAggregateFunction.java |   9 +-
 ...bstractSerializableSumAggregateFunction.java |  15 +-
 .../std/SerializableAvgAggregateDescriptor.java |   2 +-
 .../std/SerializableAvgAggregateFunction.java   |   7 +-
 .../SerializableCountAggregateDescriptor.java   |   2 +-
 .../std/SerializableCountAggregateFunction.java |   7 +-
 ...erializableGlobalAvgAggregateDescriptor.java |   2 +-
 .../SerializableGlobalAvgAggregateFunction.java |   7 +-
 ...alizableGlobalSqlAvgAggregateDescriptor.java |   2 +-
 ...rializableGlobalSqlAvgAggregateFunction.java |   7 +-
 ...zableIntermediateAvgAggregateDescriptor.java |   2 +-
 ...lizableIntermediateAvgAggregateFunction.java |   7 +-
 ...leIntermediateSqlAvgAggregateDescriptor.java |   2 +-
 ...ableIntermediateSqlAvgAggregateFunction.java |   7 +-
 ...SerializableLocalAvgAggregateDescriptor.java |   2 +-
 .../SerializableLocalAvgAggregateFunction.java  |   7 +-
 ...ializableLocalSqlAvgAggregateDescriptor.java |   2 +-
 ...erializableLocalSqlAvgAggregateFunction.java |   7 +-
 ...ializableLocalSqlSumAggregateDescriptor.java |   2 +-
 ...SerializableLocalSumAggregateDescriptor.java |   2 +-
 .../SerializableSqlAvgAggregateDescriptor.java  |   2 +-
 .../SerializableSqlAvgAggregateFunction.java    |   7 +-
 ...SerializableSqlCountAggregateDescriptor.java |   2 +-
 .../SerializableSqlCountAggregateFunction.java  |   7 +-
 .../SerializableSqlSumAggregateDescriptor.java  |   2 +-
 .../SerializableSqlSumAggregateFunction.java    |   8 +-
 .../std/SerializableSumAggregateDescriptor.java |   2 +-
 .../std/SerializableSumAggregateFunction.java   |   8 +-
 .../std/AbstractAggregateFunction.java          |  31 +
 .../std/AbstractAvgAggregateFunction.java       |  15 +-
 .../std/AbstractCountAggregateFunction.java     |   9 +-
 .../std/AbstractMinMaxAggregateFunction.java    |  11 +-
 .../std/AbstractSumAggregateFunction.java       |  16 +-
 .../aggregates/std/AvgAggregateDescriptor.java  |   2 +-
 .../aggregates/std/AvgAggregateFunction.java    |   5 +-
 .../std/CountAggregateDescriptor.java           |   2 +-
 .../aggregates/std/CountAggregateFunction.java  |   5 +-
 .../std/GlobalAvgAggregateDescriptor.java       |   2 +-
 .../std/GlobalAvgAggregateFunction.java         |   7 +-
 .../std/GlobalSqlAvgAggregateDescriptor.java    |   2 +-
 .../std/GlobalSqlAvgAggregateFunction.java      |   7 +-
 .../std/IntermediateAvgAggregateDescriptor.java |   2 +-
 .../std/IntermediateAvgAggregateFunction.java   |   7 +-
 .../IntermediateSqlAvgAggregateDescriptor.java  |   2 +-
 .../IntermediateSqlAvgAggregateFunction.java    |   7 +-
 .../std/LocalAvgAggregateDescriptor.java        |   2 +-
 .../std/LocalAvgAggregateFunction.java          |   7 +-
 .../std/LocalMaxAggregateDescriptor.java        |   2 +-
 .../std/LocalMinAggregateDescriptor.java        |   2 +-
 .../std/LocalSqlAvgAggregateDescriptor.java     |   2 +-
 .../std/LocalSqlAvgAggregateFunction.java       |   7 +-
 .../std/LocalSqlMaxAggregateDescriptor.java     |   2 +-
 .../std/LocalSqlMinAggregateDescriptor.java     |   2 +-
 .../std/LocalSqlSumAggregateDescriptor.java     |   2 +-
 .../std/LocalSumAggregateDescriptor.java        |   2 +-
 .../aggregates/std/MaxAggregateDescriptor.java  |   2 +-
 .../aggregates/std/MinAggregateDescriptor.java  |   2 +-
 .../aggregates/std/MinMaxAggregateFunction.java |   7 +-
 .../std/SqlAvgAggregateDescriptor.java          |   2 +-
 .../aggregates/std/SqlAvgAggregateFunction.java |   7 +-
 .../std/SqlCountAggregateDescriptor.java        |   2 +-
 .../std/SqlCountAggregateFunction.java          |   7 +-
 .../std/SqlMaxAggregateDescriptor.java          |   2 +-
 .../std/SqlMinAggregateDescriptor.java          |   2 +-
 .../std/SqlMinMaxAggregateFunction.java         |   7 +-
 .../std/SqlSumAggregateDescriptor.java          |   2 +-
 .../aggregates/std/SqlSumAggregateFunction.java |  10 +-
 .../aggregates/std/SumAggregateDescriptor.java  |   2 +-
 .../aggregates/std/SumAggregateFunction.java    |  10 +-
 .../stream/EmptyStreamAggregateDescriptor.java  |   3 +-
 .../NonEmptyStreamAggregateDescriptor.java      |   3 +-
 .../accessors/CircleCenterAccessor.java         |   2 +-
 .../accessors/CircleRadiusAccessor.java         |   2 +-
 .../accessors/LineRectanglePolygonAccessor.java |   4 +-
 .../accessors/PointXCoordinateAccessor.java     |   2 +-
 .../accessors/PointYCoordinateAccessor.java     |   2 +-
 .../accessors/TemporalDayAccessor.java          |   2 +-
 .../accessors/TemporalHourAccessor.java         |   2 +-
 .../accessors/TemporalIntervalEndAccessor.java  |   4 +-
 .../TemporalIntervalEndDateAccessor.java        |   4 +-
 .../TemporalIntervalEndDatetimeAccessor.java    |   4 +-
 .../TemporalIntervalEndTimeAccessor.java        |   4 +-
 .../TemporalIntervalStartAccessor.java          |   4 +-
 .../TemporalIntervalStartDateAccessor.java      |   4 +-
 .../TemporalIntervalStartDatetimeAccessor.java  |   4 +-
 .../TemporalIntervalStartTimeAccessor.java      |   4 +-
 .../accessors/TemporalMillisecondAccessor.java  |   2 +-
 .../accessors/TemporalMinuteAccessor.java       |   2 +-
 .../accessors/TemporalMonthAccessor.java        |   2 +-
 .../accessors/TemporalSecondAccessor.java       |   2 +-
 .../accessors/TemporalYearAccessor.java         |   2 +-
 .../AbstractComparisonEvaluator.java            |   9 +-
 .../comparisons/AbstractIfEqualsEvaluator.java  |   5 +-
 .../AbstractValueComparisonEvaluator.java       |   8 +-
 .../comparisons/ComparisonHelper.java           |  30 +-
 .../comparisons/EqualsDescriptor.java           |   2 +-
 .../comparisons/GreaterThanDescriptor.java      |   2 +-
 .../GreaterThanOrEqualsDescriptor.java          |   2 +-
 .../comparisons/LessThanDescriptor.java         |   2 +-
 .../comparisons/LessThanOrEqualsDescriptor.java |   2 +-
 .../comparisons/MissingIfEqualsDescriptor.java  |   2 +-
 .../comparisons/NanIfEqualsDescriptor.java      |   2 +-
 .../comparisons/NegInfIfEqualsDescriptor.java   |   2 +-
 .../comparisons/NotEqualsDescriptor.java        |   2 +-
 .../comparisons/NullIfEqualsDescriptor.java     |   2 +-
 .../comparisons/PosInfIfEqualsDescriptor.java   |   2 +-
 ...BinaryBase64StringConstructorDescriptor.java |   2 +-
 .../ABinaryHexStringConstructorDescriptor.java  |  12 +-
 .../ABooleanConstructorDescriptor.java          |   2 +-
 .../ACircleConstructorDescriptor.java           |   4 +-
 .../ADateConstructorDescriptor.java             |   7 +-
 .../ADateTimeConstructorDescriptor.java         |   8 +-
 .../ADayTimeDurationConstructorDescriptor.java  |   4 +-
 .../ADoubleConstructorDescriptor.java           |   2 +-
 .../ADurationConstructorDescriptor.java         |   4 +-
 .../AFloatConstructorDescriptor.java            |   4 +-
 .../AInt16ConstructorDescriptor.java            |  10 +-
 .../AInt32ConstructorDescriptor.java            |  10 +-
 .../AInt64ConstructorDescriptor.java            |   2 +-
 .../AInt8ConstructorDescriptor.java             |  10 +-
 .../AIntervalConstructorDescriptor.java         |   9 +-
 ...ervalStartFromDateConstructorDescriptor.java |   8 +-
 ...lStartFromDateTimeConstructorDescriptor.java |  10 +-
 ...ervalStartFromTimeConstructorDescriptor.java |  12 +-
 .../ALineConstructorDescriptor.java             |   4 +-
 .../APoint3DConstructorDescriptor.java          |   4 +-
 .../APointConstructorDescriptor.java            |   4 +-
 .../APolygonConstructorDescriptor.java          |   6 +-
 .../ARectangleConstructorDescriptor.java        |   6 +-
 .../AStringConstructorDescriptor.java           |   2 +-
 .../ATimeConstructorDescriptor.java             |   6 +-
 .../AUUIDFromStringConstructorDescriptor.java   |   5 +-
 ...AYearMonthDurationConstructorDescriptor.java |   4 +-
 .../AbstractBooleanConstructorEvaluator.java    |  11 +-
 .../AbstractDoubleConstructorEvaluator.java     |  11 +-
 .../AbstractInt64ConstructorEvaluator.java      |  11 +-
 .../AbstractStringConstructorEvaluator.java     |  11 +-
 .../functions/AbstractBinaryStringBoolEval.java |   6 +-
 .../functions/AbstractBinaryStringEval.java     |  10 +-
 .../functions/AbstractBinaryStringIntEval.java  |   6 +-
 .../AbstractBinaryStringStringEval.java         |   6 +-
 .../AbstractNumericArithmeticEval.java          |  40 +-
 .../functions/AbstractQuadStringStringEval.java |  13 +-
 .../AbstractStringStringStringIntEval.java      |  13 +-
 .../functions/AbstractTripleStringBoolEval.java |   7 +-
 .../functions/AbstractTripleStringEval.java     |  12 +-
 .../functions/AbstractTripleStringIntEval.java  |   7 +-
 .../AbstractTripleStringStringEval.java         |   7 +-
 .../AbstractUnaryNumericDoubleFunctionEval.java |   5 +-
 .../AbstractUnaryNumericFunctionEval.java       |   7 +-
 .../AbstractUnaryStringStringEval.java          |   8 +-
 .../evaluators/functions/AndDescriptor.java     |   2 +-
 .../AnyCollectionMemberDescriptor.java          |   7 +-
 .../functions/CheckUnknownDescriptor.java       |   2 +-
 .../functions/CodePointToStringDescriptor.java  |   3 +-
 .../functions/CreateCircleDescriptor.java       |   4 +-
 .../functions/CreateLineDescriptor.java         |   4 +-
 .../functions/CreatePointDescriptor.java        |   4 +-
 .../functions/CreatePolygonDescriptor.java      |   8 +-
 .../functions/CreateRectangleDescriptor.java    |   4 +-
 .../evaluators/functions/GetItemDescriptor.java |   6 +-
 .../GetJobParameterByNameDescriptor.java        |   2 +-
 .../functions/InjectFailureDescriptor.java      |   2 +-
 .../evaluators/functions/LenDescriptor.java     |   2 +-
 .../evaluators/functions/NotDescriptor.java     |   2 +-
 .../functions/NumericACosDescriptor.java        |   2 +-
 .../functions/NumericASinDescriptor.java        |   2 +-
 .../functions/NumericATanDescriptor.java        |   2 +-
 .../functions/NumericAbsDescriptor.java         |   2 +-
 .../functions/NumericAddDescriptor.java         |   2 +-
 .../functions/NumericCeilingDescriptor.java     |   2 +-
 .../functions/NumericCosDescriptor.java         |   2 +-
 .../functions/NumericDegreesDescriptor.java     |   2 +-
 .../functions/NumericDivDescriptor.java         |   4 +-
 .../functions/NumericDivideDescriptor.java      |   2 +-
 .../functions/NumericExpDescriptor.java         |   2 +-
 .../functions/NumericFloorDescriptor.java       |   2 +-
 .../functions/NumericLnDescriptor.java          |   2 +-
 .../functions/NumericLogDescriptor.java         |   2 +-
 .../functions/NumericModuloDescriptor.java      |   4 +-
 .../functions/NumericMultiplyDescriptor.java    |   4 +-
 .../functions/NumericPowerDescriptor.java       |   6 +-
 .../functions/NumericRadiansDescriptor.java     |   2 +-
 .../functions/NumericRoundDescriptor.java       |   2 +-
 .../NumericRoundHalfToEven2Descriptor.java      |   4 +-
 .../NumericRoundHalfToEvenDescriptor.java       |   2 +-
 .../functions/NumericSignDescriptor.java        |   2 +-
 .../functions/NumericSinDescriptor.java         |   2 +-
 .../functions/NumericSqrtDescriptor.java        |   2 +-
 .../functions/NumericSubtractDescriptor.java    |   2 +-
 .../functions/NumericTanDescriptor.java         |   2 +-
 .../functions/NumericTruncDescriptor.java       |  14 +-
 .../functions/NumericUnaryMinusDescriptor.java  |   2 +-
 .../evaluators/functions/OrDescriptor.java      |   2 +-
 .../functions/SpatialAreaDescriptor.java        |   4 +-
 .../functions/SpatialCellDescriptor.java        |   8 +-
 .../functions/SpatialDistanceDescriptor.java    |   4 +-
 .../functions/StringConcatDescriptor.java       |   5 +-
 .../functions/StringContainsDescriptor.java     |   3 +-
 .../functions/StringEndsWithDescriptor.java     |   3 +-
 .../functions/StringEqualDescriptor.java        |   3 +-
 .../functions/StringInitCapDescriptor.java      |   3 +-
 .../functions/StringJoinDescriptor.java         |   7 +-
 .../functions/StringLTrim2Descriptor.java       |   2 +-
 .../functions/StringLTrimDescriptor.java        |   3 +-
 .../functions/StringLengthDescriptor.java       |   2 +-
 .../functions/StringLikeDescriptor.java         |   2 +-
 .../functions/StringLowerCaseDescriptor.java    |   3 +-
 .../functions/StringPositionDescriptor.java     |   2 +-
 .../functions/StringRTrim2Descriptor.java       |   2 +-
 .../functions/StringRTrimDescriptor.java        |   3 +-
 .../StringRegExpContainsDescriptor.java         |   2 +-
 .../StringRegExpContainsWithFlagDescriptor.java |   2 +-
 .../functions/StringRegExpLikeDescriptor.java   |   2 +-
 .../StringRegExpLikeWithFlagDescriptor.java     |   2 +-
 .../StringRegExpPositionDescriptor.java         |   4 +-
 .../StringRegExpPositionWithFlagDescriptor.java |   2 +-
 .../StringRegExpReplaceDescriptor.java          |   4 +-
 .../StringRegExpReplaceWithFlagsDescriptor.java |   2 +-
 .../functions/StringRepeatDescriptor.java       |   4 +-
 .../functions/StringReplaceDescriptor.java      |   2 +-
 .../StringReplaceWithLimitDescriptor.java       |   3 +-
 .../functions/StringReverseDescriptor.java      |   2 +-
 .../functions/StringSplitDescriptor.java        |   6 +-
 .../functions/StringStartsWithDescriptor.java   |   3 +-
 .../functions/StringToCodePointDescriptor.java  |   2 +-
 .../functions/StringTrim2Descriptor.java        |   2 +-
 .../functions/StringTrimDescriptor.java         |   3 +-
 .../functions/StringUpperCaseDescriptor.java    |   3 +-
 .../functions/Substring2Descriptor.java         |   2 +-
 .../functions/SubstringAfterDescriptor.java     |   4 +-
 .../functions/SubstringBeforeDescriptor.java    |   4 +-
 .../functions/SubstringDescriptor.java          |   2 +-
 .../functions/ToBigIntDescriptor.java           |   2 +-
 .../functions/ToBooleanDescriptor.java          |   2 +-
 .../functions/ToDoubleDescriptor.java           |   2 +-
 .../functions/ToNumberDescriptor.java           |   2 +-
 .../functions/ToStringDescriptor.java           |   2 +-
 .../binary/AbstractBinaryScalarEvaluator.java   |  32 +-
 .../binary/AbstractFindBinaryEvaluator.java     |   5 +-
 .../binary/AbstractSubBinaryEvaluator.java      |   5 +-
 .../binary/BinaryConcatDescriptor.java          |   7 +-
 .../binary/BinaryLengthDescriptor.java          |   2 +-
 .../functions/binary/FindBinaryDescriptor.java  |   2 +-
 .../binary/FindBinaryFromDescriptor.java        |   2 +-
 .../functions/binary/ParseBinaryDescriptor.java |   4 +-
 .../functions/binary/PrintBinaryDescriptor.java |   4 +-
 .../binary/SubBinaryFromDescriptor.java         |   2 +-
 .../binary/SubBinaryFromToDescriptor.java       |   2 +-
 .../records/FieldAccessByIndexDescriptor.java   |   2 +-
 .../records/FieldAccessByIndexEvalFactory.java  |  13 +-
 .../records/FieldAccessByNameDescriptor.java    |   2 +-
 .../records/FieldAccessByNameEvalFactory.java   |   7 +-
 .../records/FieldAccessNestedDescriptor.java    |   2 +-
 .../records/FieldAccessNestedEvalFactory.java   |  27 +-
 .../records/GetRecordFieldValueDescriptor.java  |   2 +-
 .../records/GetRecordFieldValueEvalFactory.java |   7 +-
 .../records/GetRecordFieldsDescriptor.java      |   2 +-
 .../records/GetRecordFieldsEvalFactory.java     |   8 +-
 .../records/RecordAddFieldsDescriptor.java      |   7 +-
 .../records/RecordConcatDescriptor.java         |   2 +-
 .../records/RecordConcatEvalFactory.java        |   9 +-
 .../records/RecordConcatStrictDescriptor.java   |   2 +-
 .../records/RecordPairsDescriptor.java          |   2 +-
 .../records/RecordRemoveFieldsDescriptor.java   |   3 +-
 .../records/RecordRemoveFieldsEvalFactory.java  |  10 +-
 .../AbstractIntervalLogicFuncDescriptor.java    |   8 +-
 .../AdjustDateTimeForTimeZoneDescriptor.java    |   6 +-
 .../AdjustTimeForTimeZoneDescriptor.java        |   6 +-
 .../CalendarDuartionFromDateDescriptor.java     |   4 +-
 .../CalendarDurationFromDateTimeDescriptor.java |   4 +-
 .../temporal/DateFromDatetimeDescriptor.java    |   2 +-
 .../DatetimeFromDateAndTimeDescriptor.java      |   4 +-
 .../DatetimeFromUnixTimeInMsDescriptor.java     |   2 +-
 .../DatetimeFromUnixTimeInSecsDescriptor.java   |   2 +-
 .../functions/temporal/DayOfWeekDescriptor.java |   2 +-
 .../DayTimeDurationComparatorDescriptor.java    |   6 +-
 .../temporal/DurationEqualDescriptor.java       |   4 +-
 .../DurationFromIntervalDescriptor.java         |   2 +-
 .../DurationFromMillisecondsDescriptor.java     |   2 +-
 .../temporal/GetDayTimeDurationDescriptor.java  |   2 +-
 .../GetOverlappingIntervalDescriptor.java       |   9 +-
 .../GetYearMonthDurationDescriptor.java         |   2 +-
 .../temporal/IntervalBinDescriptor.java         |  15 +-
 .../functions/temporal/IntervalLogic.java       |   7 +-
 ...llisecondsFromDayTimeDurationDescriptor.java |   2 +-
 .../MonthsFromYearMonthDurationDescriptor.java  |   2 +-
 .../temporal/OverlapBinsDescriptor.java         |  21 +-
 .../functions/temporal/ParseDateDescriptor.java |   7 +-
 .../temporal/ParseDateTimeDescriptor.java       |   6 +-
 .../functions/temporal/ParseTimeDescriptor.java |   7 +-
 .../functions/temporal/PrintDateDescriptor.java |   4 +-
 .../temporal/PrintDateTimeDescriptor.java       |   4 +-
 .../functions/temporal/PrintTimeDescriptor.java |   4 +-
 .../temporal/TimeFromDatetimeDescriptor.java    |   2 +-
 .../UnixTimeFromDateInDaysDescriptor.java       |   2 +-
 .../UnixTimeFromDatetimeInMsDescriptor.java     |   2 +-
 .../UnixTimeFromDatetimeInSecsDescriptor.java   |   2 +-
 .../UnixTimeFromTimeInMsDescriptor.java         |   2 +-
 .../YearMonthDurationComparatorDescriptor.java  |   6 +-
 .../exceptions/IncompatibleTypeException.java   |  12 +-
 .../exceptions/InvalidDataFormatException.java  |  14 +-
 .../runtime/exceptions/OverflowException.java   |  12 +-
 .../exceptions/TypeMismatchException.java       |  16 +
 .../runtime/exceptions/UnderflowException.java  |  11 +-
 .../UnsupportedItemTypeException.java           |  11 +-
 .../exceptions/UnsupportedTypeException.java    |  11 +-
 .../runtime/formats/NonTaggedDataFormat.java    |  21 +-
 .../std/ScanCollectionDescriptor.java           |   9 +-
 .../testframework/context/TestCaseContext.java  |   5 +
 .../src/main/resources/Catalog.xsd              |  19 +
 .../runtime/CommitRuntimeFactory.java           |   4 +-
 .../common/exceptions/AlgebricksException.java  |  59 +-
 .../exceptions/NotImplementedException.java     |  10 +-
 .../core/algebra/base/ILogicalExpression.java   |   3 +
 .../core/algebra/base/ILogicalOperator.java     |   3 +
 .../expressions/AbstractLogicalExpression.java  |  11 +
 .../AggregateFunctionCallExpression.java        |   1 +
 .../algebra/expressions/ConstantExpression.java |   1 +
 .../ScalarFunctionCallExpression.java           |   1 +
 .../StatefulFunctionCallExpression.java         |   5 +-
 .../UnnestingFunctionCallExpression.java        |   1 +
 .../VariableReferenceExpression.java            |   4 +-
 .../logical/AbstractLogicalOperator.java        |  12 +
 ...pressionDeepCopyWithNewVariablesVisitor.java |  21 +-
 ...OperatorDeepCopyWithNewVariablesVisitor.java |   8 +
 .../physical/AbstractUnnestPOperator.java       |   1 +
 .../operators/physical/AggregatePOperator.java  |   1 +
 .../operators/physical/AssignPOperator.java     |   2 +-
 .../operators/physical/BulkloadPOperator.java   |   6 +-
 .../physical/DataSourceScanPOperator.java       |   6 +-
 .../physical/DistributeResultPOperator.java     |   4 +-
 .../physical/EmptyTupleSourcePOperator.java     |   1 +
 .../physical/ExternalGroupByPOperator.java      |   8 +-
 .../physical/HybridHashJoinPOperator.java       |  92 +-
 .../physical/InMemoryHashJoinPOperator.java     |  13 +-
 .../physical/IndexBulkloadPOperator.java        |   6 +-
 .../IndexInsertDeleteUpsertPOperator.java       |  35 +-
 .../physical/InsertDeleteUpsertPOperator.java   |  34 +-
 .../operators/physical/IntersectPOperator.java  |   2 +-
 .../physical/MaterializePOperator.java          |   1 +
 .../MicroPreSortedDistinctByPOperator.java      |   6 +-
 .../MicroPreclusteredGroupByPOperator.java      |   1 +
 .../physical/MicroUnionAllPOperator.java        |   1 +
 .../physical/NestedLoopJoinPOperator.java       |  15 +-
 .../physical/NestedTupleSourcePOperator.java    |   1 +
 .../physical/PreSortedDistinctByPOperator.java  |   6 +-
 .../physical/PreclusteredGroupByPOperator.java  |   9 +-
 .../operators/physical/ReplicatePOperator.java  |   6 +-
 .../physical/RunningAggregatePOperator.java     |   1 +
 .../operators/physical/SinkPOperator.java       |   1 +
 .../operators/physical/SinkWritePOperator.java  |   6 +-
 .../physical/SortGroupByPOperator.java          |   9 +-
 .../operators/physical/SplitPOperator.java      |   5 +-
 .../operators/physical/StableSortPOperator.java |  18 +-
 .../physical/StreamLimitPOperator.java          |   1 +
 .../physical/StreamProjectPOperator.java        |   1 +
 .../physical/StreamSelectPOperator.java         |   1 +
 .../StringStreamingScriptPOperator.java         |   1 +
 .../operators/physical/SubplanPOperator.java    |   1 +
 .../operators/physical/TokenizePOperator.java   |   6 +-
 .../operators/physical/UnionAllPOperator.java   |   1 +
 .../physical/WriteResultPOperator.java          |   7 +-
 .../algebra/util/OperatorManipulationUtil.java  |   1 +
 .../algebricks/algebricks-rewriter/pom.xml      |   5 +
 .../rules/AbstractDecorrelationRule.java        |   5 +-
 .../rewriter/rules/AbstractExtractExprRule.java |   1 +
 .../rules/AbstractIntroduceCombinerRule.java    |  11 +-
 .../AbstractIntroduceGroupByCombinerRule.java   |  11 +-
 .../rules/BreakSelectIntoConjunctsRule.java     |   4 +
 .../rules/ComplexJoinInferenceRule.java         |   1 +
 .../rules/ComplexUnnestToProductRule.java       |   1 +
 .../rewriter/rules/ConsolidateSelectsRule.java  |   1 +
 .../rewriter/rules/CopyLimitDownRule.java       |   5 +
 .../rules/EnforceOrderByAfterSubplan.java       |   1 +
 .../rules/EnforceStructuralPropertiesRule.java  |   9 +-
 .../rules/ExtractCommonExpressionsRule.java     |  18 +-
 .../rules/ExtractCommonOperatorsRule.java       |  11 +-
 .../ExtractFunctionsFromJoinConditionRule.java  |   7 +-
 .../rules/ExtractGbyExpressionsRule.java        |   8 +-
 .../rules/ExtractGroupByDecorVariablesRule.java |   4 +-
 .../FactorRedundantGroupAndDecorVarsRule.java   |   8 +-
 .../rewriter/rules/PushFunctionsBelowJoin.java  |   4 +-
 .../rules/subplan/EliminateSubplanRule.java     |   3 +
 .../subplan/IntroduceGroupByForSubplanRule.java |  14 +-
 .../IntroduceLeftOuterJoinForSubplanRule.java   |   1 +
 .../rules/subplan/NestedSubplanToJoinRule.java  |   7 +-
 .../runtime/base/IPushRuntimeFactory.java       |   4 +
 ...estedPlansAccumulatingAggregatorFactory.java |   4 +-
 .../NestedPlansRunningAggregatorFactory.java    |   4 +-
 ...AbstractOneInputOneOutputRuntimeFactory.java |   3 +-
 .../base/AbstractPushRuntimeFactory.java        |  35 +
 .../operators/base/SinkRuntimeFactory.java      |   3 +-
 .../operators/std/AssignRuntimeFactory.java     |   2 +-
 .../std/EmptyTupleSourceRuntimeFactory.java     |   4 +-
 .../std/NestedTupleSourceRuntimeFactory.java    |   4 +-
 .../operators/std/PrinterRuntimeFactory.java    |   4 +-
 .../operators/std/SinkWriterRuntimeFactory.java |   4 +-
 .../union/MicroUnionAllRuntimeFactory.java      |   4 +-
 .../api/dataflow/IOperatorDescriptor.java       |  30 +-
 .../api/exceptions/HyracksDataException.java    |  16 +
 .../api/exceptions/HyracksException.java        |  21 +-
 .../hyracks/api/exceptions/SourceLocation.java  |  44 +
 .../hyracks/api/util/ErrorMessageUtil.java      |  15 +-
 .../api/test/HyracksDataExceptionTest.java      |   2 +-
 .../std/base/AbstractOperatorDescriptor.java    |  13 +
 ...AccumulatingAggregatorDescriptorFactory.java |   2 +-
 .../AbstractAggregatorDescriptorFactory.java    |  36 +
 .../join/HybridHashJoinOperatorDescriptor.java  |   3 +-
 ...timizedHybridHashJoinOperatorDescriptor.java |   5 +-
 681 files changed, 5101 insertions(+), 2664 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/extension/ExtensionStatement.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/extension/ExtensionStatement.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/extension/ExtensionStatement.java
index 724b284..15267aa 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/extension/ExtensionStatement.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/extension/ExtensionStatement.java
@@ -18,7 +18,7 @@
  */
 package org.apache.asterix.algebra.extension;
 
-import org.apache.asterix.lang.common.base.Statement;
+import org.apache.asterix.lang.common.base.AbstractStatement;
 import org.apache.asterix.metadata.declared.MetadataProvider;
 import org.apache.asterix.translator.IRequestParameters;
 import org.apache.asterix.translator.IStatementExecutor;
@@ -29,7 +29,7 @@ import org.apache.hyracks.api.exceptions.HyracksDataException;
 /**
  * An interface that provides an extension mechanism to extend a language with additional statements
  */
-public abstract class ExtensionStatement implements Statement {
+public abstract class ExtensionStatement extends AbstractStatement {
 
     @Override
     public final Kind getKind() {

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/BTreeSearchPOperator.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/BTreeSearchPOperator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/BTreeSearchPOperator.java
index 39d33f0..94d3461 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/BTreeSearchPOperator.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/BTreeSearchPOperator.java
@@ -139,9 +139,11 @@ public class BTreeSearchPOperator extends IndexSearchPOperator {
                 jobGenParams.getIndexName(), lowKeyIndexes, highKeyIndexes, jobGenParams.isLowKeyInclusive(),
                 jobGenParams.isHighKeyInclusive(), propagateFilter, minFilterFieldIndexes, maxFilterFieldIndexes,
                 tupleFilterFactory, outputLimit, unnestMap.getGenerateCallBackProceedResultVar());
+        IOperatorDescriptor opDesc = btreeSearch.first;
+        opDesc.setSourceLocation(unnestMap.getSourceLocation());
 
-        builder.contributeHyracksOperator(unnestMap, btreeSearch.first);
-        builder.contributeAlgebricksPartitionConstraint(btreeSearch.first, btreeSearch.second);
+        builder.contributeHyracksOperator(unnestMap, opDesc);
+        builder.contributeAlgebricksPartitionConstraint(opDesc, btreeSearch.second);
 
         ILogicalOperator srcExchange = unnestMap.getInputs().get(0).getValue();
         builder.contributeGraphEdge(srcExchange, 0, unnestMap, 0);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitPOperator.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitPOperator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitPOperator.java
index f06fe45..a24a83b 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitPOperator.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitPOperator.java
@@ -85,6 +85,7 @@ public class CommitPOperator extends AbstractPhysicalOperator {
 
         //get dataset splits
         IPushRuntimeFactory runtime = dataset.getCommitRuntimeFactory(metadataProvider, primaryKeyFields, isSink);
+        runtime.setSourceLocation(op.getSourceLocation());
         builder.contributeMicroOperator(op, runtime, recDesc);
         ILogicalOperator src = op.getInputs().get(0).getValue();
         builder.contributeGraphEdge(src, 0, op, 0);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/ExternalDataLookupPOperator.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/ExternalDataLookupPOperator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/ExternalDataLookupPOperator.java
index 1d79455..fc899c6 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/ExternalDataLookupPOperator.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/ExternalDataLookupPOperator.java
@@ -135,8 +135,10 @@ public class ExternalDataLookupPOperator extends AbstractScanPOperator {
         Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> externalLoopup =
                 metadataProvider.buildExternalDataLookupRuntime(builder.getJobSpec(), dataset, ridIndexes, retainInput,
                         typeEnv, opSchema, context, metadataProvider, retainMissing);
-        builder.contributeHyracksOperator(unnestMap, externalLoopup.first);
-        builder.contributeAlgebricksPartitionConstraint(externalLoopup.first, externalLoopup.second);
+        IOperatorDescriptor opDesc = externalLoopup.first;
+        opDesc.setSourceLocation(unnestMap.getSourceLocation());
+        builder.contributeHyracksOperator(unnestMap, opDesc);
+        builder.contributeAlgebricksPartitionConstraint(opDesc, externalLoopup.second);
         ILogicalOperator srcExchange = unnestMap.getInputs().get(0).getValue();
         builder.contributeGraphEdge(srcExchange, 0, unnestMap, 0);
     }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/InvertedIndexPOperator.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/InvertedIndexPOperator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/InvertedIndexPOperator.java
index eeb6688..7b5eb83 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/InvertedIndexPOperator.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/InvertedIndexPOperator.java
@@ -120,10 +120,12 @@ public class InvertedIndexPOperator extends IndexSearchPOperator {
                         jobGenParams.getIndexName(), jobGenParams.getSearchKeyType(), keyIndexes,
                         jobGenParams.getSearchModifierType(), jobGenParams.getSimilarityThreshold(),
                         minFilterFieldIndexes, maxFilterFieldIndexes, jobGenParams.getIsFullTextSearch(), frameLimit);
+        IOperatorDescriptor opDesc = invIndexSearch.first;
+        opDesc.setSourceLocation(unnestMapOp.getSourceLocation());
 
         // Contribute operator in hyracks job.
-        builder.contributeHyracksOperator(unnestMapOp, invIndexSearch.first);
-        builder.contributeAlgebricksPartitionConstraint(invIndexSearch.first, invIndexSearch.second);
+        builder.contributeHyracksOperator(unnestMapOp, opDesc);
+        builder.contributeAlgebricksPartitionConstraint(opDesc, invIndexSearch.second);
         ILogicalOperator srcExchange = unnestMapOp.getInputs().get(0).getValue();
         builder.contributeGraphEdge(srcExchange, 0, unnestMapOp, 0);
     }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/RTreeSearchPOperator.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/RTreeSearchPOperator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/RTreeSearchPOperator.java
index 949be23..a80e5b3 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/RTreeSearchPOperator.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/RTreeSearchPOperator.java
@@ -102,9 +102,11 @@ public class RTreeSearchPOperator extends IndexSearchPOperator {
                 builder.getJobSpec(), outputVars, opSchema, typeEnv, context, jobGenParams.getRetainInput(), retainNull,
                 dataset, jobGenParams.getIndexName(), keyIndexes, propagateIndexFilter, minFilterFieldIndexes,
                 maxFilterFieldIndexes, unnestMap.getGenerateCallBackProceedResultVar());
+        IOperatorDescriptor opDesc = rtreeSearch.first;
+        opDesc.setSourceLocation(unnestMap.getSourceLocation());
 
-        builder.contributeHyracksOperator(unnestMap, rtreeSearch.first);
-        builder.contributeAlgebricksPartitionConstraint(rtreeSearch.first, rtreeSearch.second);
+        builder.contributeHyracksOperator(unnestMap, opDesc);
+        builder.contributeAlgebricksPartitionConstraint(opDesc, rtreeSearch.second);
         ILogicalOperator srcExchange = unnestMap.getInputs().get(0).getValue();
         builder.contributeGraphEdge(srcExchange, 0, unnestMap, 0);
     }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/jobgen/QueryLogicalExpressionJobGen.java
----------------------------------------------------------------------
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 02d79c4..32f8001 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
@@ -194,10 +194,11 @@ public class QueryLogicalExpressionJobGen implements ILogicalExpressionJobGen {
         }
     }
 
-    private IFunctionDescriptor resolveFunction(ILogicalExpression expr, IVariableTypeEnvironment env,
+    private IFunctionDescriptor resolveFunction(AbstractFunctionCallExpression expr, IVariableTypeEnvironment env,
             JobGenContext context) throws AlgebricksException {
-        FunctionIdentifier fnId = ((AbstractFunctionCallExpression) expr).getFunctionIdentifier();
+        FunctionIdentifier fnId = expr.getFunctionIdentifier();
         IFunctionDescriptor fd = functionManager.lookupFunction(fnId);
+        fd.setSourceLocation(expr.getSourceLocation());
         IFunctionTypeInferer fnTypeInfer = functionManager.lookupFunctionTypeInferer(fnId);
         if (fnTypeInfer != null) {
             CompilerProperties compilerProps = ((IApplicationContext) context.getAppContext()).getCompilerProperties();

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AddEquivalenceClassForRecordConstructorRule.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AddEquivalenceClassForRecordConstructorRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AddEquivalenceClassForRecordConstructorRule.java
index b9b5340..8219bcd 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AddEquivalenceClassForRecordConstructorRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AddEquivalenceClassForRecordConstructorRule.java
@@ -112,14 +112,16 @@ public class AddEquivalenceClassForRecordConstructorRule implements IAlgebraicRe
                 LogicalVariable fieldVar = varExpr.getVariableReference();
                 Map<LogicalVariable, EquivalenceClass> ecs = context.getEquivalenceClassMap(assignOp);
                 if (ecs == null) {
-                    ecs = new HashMap<LogicalVariable, EquivalenceClass>();
+                    ecs = new HashMap<>();
                     context.putEquivalenceClassMap(assignOp, ecs);
                 }
-                ILogicalExpression expr = new ScalarFunctionCallExpression(
+                VariableReferenceExpression recordVarRef = new VariableReferenceExpression(recordVar);
+                recordVarRef.setSourceLocation(funcExpr.getSourceLocation());
+                ScalarFunctionCallExpression expr = new ScalarFunctionCallExpression(
                         FunctionUtil.getFunctionInfo(BuiltinFunctions.FIELD_ACCESS_BY_INDEX),
-                        new MutableObject<ILogicalExpression>(new VariableReferenceExpression(recordVar)),
-                        new MutableObject<ILogicalExpression>(
+                        new MutableObject<>(recordVarRef), new MutableObject<>(
                                 new ConstantExpression(new AsterixConstantValue(new AInt32(parameterIndex / 2))))); // Every two parameters corresponds to a field.
+                expr.setSourceLocation(funcExpr.getSourceLocation());
                 EquivalenceClass equivClass = new EquivalenceClass(Collections.singletonList(fieldVar), fieldVar,
                         Collections.singletonList(expr));
                 ecs.put(fieldVar, equivClass);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AsterixIntroduceGroupByCombinerRule.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AsterixIntroduceGroupByCombinerRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AsterixIntroduceGroupByCombinerRule.java
index 5a70d3c..8bfd120 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AsterixIntroduceGroupByCombinerRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AsterixIntroduceGroupByCombinerRule.java
@@ -36,6 +36,7 @@ import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
 import org.apache.hyracks.algebricks.core.algebra.operators.logical.GroupByOperator;
 import org.apache.hyracks.algebricks.core.algebra.operators.logical.SelectOperator;
 import org.apache.hyracks.algebricks.rewriter.rules.AbstractIntroduceGroupByCombinerRule;
+import org.apache.hyracks.api.exceptions.SourceLocation;
 
 public class AsterixIntroduceGroupByCombinerRule extends AbstractIntroduceGroupByCombinerRule {
 
@@ -43,36 +44,46 @@ public class AsterixIntroduceGroupByCombinerRule extends AbstractIntroduceGroupB
     @Override
     protected void processNullTest(IOptimizationContext context, GroupByOperator nestedGby,
             List<LogicalVariable> aggregateVarsProducedByCombiner) {
+        SourceLocation sourceLoc = nestedGby.getSourceLocation();
         IFunctionInfo finfoEq = context.getMetadataProvider().lookupFunction(BuiltinFunctions.IS_SYSTEM_NULL);
         SelectOperator selectNonSystemNull;
 
         if (aggregateVarsProducedByCombiner.size() == 1) {
-            ILogicalExpression isSystemNullTest =
-                    new ScalarFunctionCallExpression(finfoEq, new MutableObject<ILogicalExpression>(
-                            new VariableReferenceExpression(aggregateVarsProducedByCombiner.get(0))));
+            VariableReferenceExpression aggVarRef =
+                    new VariableReferenceExpression(aggregateVarsProducedByCombiner.get(0));
+            aggVarRef.setSourceLocation(sourceLoc);
+            ScalarFunctionCallExpression isSystemNullTest =
+                    new ScalarFunctionCallExpression(finfoEq, new MutableObject<>(aggVarRef));
+            isSystemNullTest.setSourceLocation(sourceLoc);
             IFunctionInfo finfoNot = context.getMetadataProvider().lookupFunction(AlgebricksBuiltinFunctions.NOT);
             ScalarFunctionCallExpression nonSystemNullTest =
-                    new ScalarFunctionCallExpression(finfoNot, new MutableObject<ILogicalExpression>(isSystemNullTest));
-            selectNonSystemNull =
-                    new SelectOperator(new MutableObject<ILogicalExpression>(nonSystemNullTest), false, null);
+                    new ScalarFunctionCallExpression(finfoNot, new MutableObject<>(isSystemNullTest));
+            nonSystemNullTest.setSourceLocation(sourceLoc);
+            selectNonSystemNull = new SelectOperator(new MutableObject<>(nonSystemNullTest), false, null);
+            selectNonSystemNull.setSourceLocation(sourceLoc);
         } else {
-            List<Mutable<ILogicalExpression>> isSystemNullTestList = new ArrayList<Mutable<ILogicalExpression>>();
+            List<Mutable<ILogicalExpression>> isSystemNullTestList = new ArrayList<>();
             for (LogicalVariable aggVar : aggregateVarsProducedByCombiner) {
-                ILogicalExpression isSystemNullTest = new ScalarFunctionCallExpression(finfoEq,
-                        new MutableObject<ILogicalExpression>(new VariableReferenceExpression(aggVar)));
+                VariableReferenceExpression aggVarRef = new VariableReferenceExpression(aggVar);
+                aggVarRef.setSourceLocation(sourceLoc);
+                ScalarFunctionCallExpression isSystemNullTest =
+                        new ScalarFunctionCallExpression(finfoEq, new MutableObject<>(aggVarRef));
+                isSystemNullTest.setSourceLocation(sourceLoc);
                 IFunctionInfo finfoNot = context.getMetadataProvider().lookupFunction(AlgebricksBuiltinFunctions.NOT);
-                ScalarFunctionCallExpression nonSystemNullTest = new ScalarFunctionCallExpression(finfoNot,
-                        new MutableObject<ILogicalExpression>(isSystemNullTest));
-                isSystemNullTestList.add(new MutableObject<ILogicalExpression>(nonSystemNullTest));
+                ScalarFunctionCallExpression nonSystemNullTest =
+                        new ScalarFunctionCallExpression(finfoNot, new MutableObject<>(isSystemNullTest));
+                nonSystemNullTest.setSourceLocation(sourceLoc);
+                isSystemNullTestList.add(new MutableObject<>(nonSystemNullTest));
             }
             IFunctionInfo finfoAnd = context.getMetadataProvider().lookupFunction(AlgebricksBuiltinFunctions.AND);
-            selectNonSystemNull = new SelectOperator(new MutableObject<ILogicalExpression>(
-                    new ScalarFunctionCallExpression(finfoAnd, isSystemNullTestList)), false, null);
+            selectNonSystemNull = new SelectOperator(
+                    new MutableObject<>(new ScalarFunctionCallExpression(finfoAnd, isSystemNullTestList)), false, null);
+            selectNonSystemNull.setSourceLocation(sourceLoc);
         }
 
         //add the not-system-null check into the nested pipeline
         Mutable<ILogicalOperator> ntsBeforeNestedGby = nestedGby.getInputs().get(0);
-        nestedGby.getInputs().set(0, new MutableObject<ILogicalOperator>(selectNonSystemNull));
+        nestedGby.getInputs().set(0, new MutableObject<>(selectNonSystemNull));
         selectNonSystemNull.getInputs().add(ntsBeforeNestedGby);
     }
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByHandleFieldAccessRule.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByHandleFieldAccessRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByHandleFieldAccessRule.java
index 5cf6769..b0c3bdf 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByHandleFieldAccessRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByHandleFieldAccessRule.java
@@ -38,6 +38,7 @@ import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceE
 import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
 import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
 import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.api.exceptions.SourceLocation;
 
 public class ByNameToByHandleFieldAccessRule implements IAlgebraicRewriteRule {
 
@@ -65,6 +66,7 @@ public class ByNameToByHandleFieldAccessRule implements IAlgebraicRewriteRule {
         AbstractFunctionCallExpression fce =
                 (AbstractFunctionCallExpression) fieldAccessOp.getExpressions().get(0).getValue();
         ILogicalExpression a1 = fce.getArguments().get(0).getValue();
+        SourceLocation sourceLoc = fieldAccessOp.getSourceLocation();
 
         VariableReferenceExpression x;
         if (a1.getExpressionTag() == LogicalExpressionTag.VARIABLE) {
@@ -76,7 +78,9 @@ public class ByNameToByHandleFieldAccessRule implements IAlgebraicRewriteRule {
             ArrayList<Mutable<ILogicalExpression>> exprArray = new ArrayList<Mutable<ILogicalExpression>>(1);
             exprArray.add(new MutableObject<ILogicalExpression>(a1));
             AssignOperator assignVar = new AssignOperator(varArray, exprArray);
+            assignVar.setSourceLocation(sourceLoc);
             x = new VariableReferenceExpression(var1);
+            x.setSourceLocation(sourceLoc);
             assignVar.getInputs().add(opUnder);
             opUnder = new MutableObject<ILogicalOperator>(assignVar);
         }
@@ -88,24 +92,33 @@ public class ByNameToByHandleFieldAccessRule implements IAlgebraicRewriteRule {
                 new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.TYPE_OF));
         typeOf.getArguments().add(new MutableObject<ILogicalExpression>(x));
         AssignOperator typAssign = new AssignOperator(t, new MutableObject<ILogicalExpression>(typeOf));
+        typAssign.setSourceLocation(sourceLoc);
         typAssign.getInputs().add(opUnder);
 
         // let $w := get-handle($t, path-expression)
         LogicalVariable w = context.newVar();
         AbstractFunctionCallExpression getHandle =
                 new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.GET_HANDLE));
-        getHandle.getArguments().add(new MutableObject<ILogicalExpression>(new VariableReferenceExpression(t)));
+        getHandle.setSourceLocation(sourceLoc);
+        VariableReferenceExpression tRef = new VariableReferenceExpression(t);
+        tRef.setSourceLocation(sourceLoc);
+        getHandle.getArguments().add(new MutableObject<ILogicalExpression>(tRef));
         // the accessed field
         getHandle.getArguments().add(new MutableObject<ILogicalExpression>(fce.getArguments().get(1).getValue()));
         AssignOperator handleAssign = new AssignOperator(w, new MutableObject<ILogicalExpression>(getHandle));
+        handleAssign.setSourceLocation(sourceLoc);
         handleAssign.getInputs().add(new MutableObject<ILogicalOperator>(typAssign));
 
         // let $y := get-data(x, $w)
         AbstractFunctionCallExpression getData =
                 new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.GET_DATA));
+        getData.setSourceLocation(sourceLoc);
         VariableReferenceExpression ref2 = new VariableReferenceExpression(x.getVariableReference());
+        ref2.setSourceLocation(sourceLoc);
         getData.getArguments().add(new MutableObject<ILogicalExpression>(ref2));
-        getData.getArguments().add(new MutableObject<ILogicalExpression>(new VariableReferenceExpression(w)));
+        VariableReferenceExpression wRef = new VariableReferenceExpression(w);
+        wRef.setSourceLocation(sourceLoc);
+        getData.getArguments().add(new MutableObject<ILogicalExpression>(wRef));
         fieldAccessOp.getExpressions().get(0).setValue(getData);
         List<Mutable<ILogicalOperator>> faInputs = fieldAccessOp.getInputs();
         faInputs.clear();

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByIndexFieldAccessRule.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByIndexFieldAccessRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByIndexFieldAccessRule.java
index 19cd4b6..9c478ee 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByIndexFieldAccessRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ByNameToByIndexFieldAccessRule.java
@@ -47,6 +47,7 @@ import org.apache.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCall
 import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
 import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
 import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.api.exceptions.SourceLocation;
 
 public class ByNameToByIndexFieldAccessRule implements IAlgebraicRewriteRule {
 
@@ -100,10 +101,14 @@ public class ByNameToByIndexFieldAccessRule implements IAlgebraicRewriteRule {
         if (firstArg.getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) {
             return false;
         }
+        SourceLocation sourceLoc = firstArg.getSourceLocation();
         LogicalVariable var1 = context.newVar();
         AssignOperator assignOp = new AssignOperator(new ArrayList<>(Collections.singletonList(var1)),
                 new ArrayList<>(Collections.singletonList(new MutableObject<>(firstArg))));
-        fce.getArguments().get(0).setValue(new VariableReferenceExpression(var1));
+        assignOp.setSourceLocation(sourceLoc);
+        VariableReferenceExpression var1Ref = new VariableReferenceExpression(var1);
+        var1Ref.setSourceLocation(sourceLoc);
+        fce.getArguments().get(0).setValue(var1Ref);
         assignOp.getInputs().add(new MutableObject<>(op.getInputs().get(0).getValue()));
         op.getInputs().get(0).setValue(assignOp);
         context.computeAndSetTypeEnvironmentForOperator(assignOp);
@@ -148,8 +153,10 @@ public class ByNameToByIndexFieldAccessRule implements IAlgebraicRewriteRule {
         if (k < 0) {
             return null;
         }
-        return new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.FIELD_ACCESS_BY_INDEX),
-                fce.getArguments().get(0),
+        ScalarFunctionCallExpression faExpr = new ScalarFunctionCallExpression(
+                FunctionUtil.getFunctionInfo(BuiltinFunctions.FIELD_ACCESS_BY_INDEX), fce.getArguments().get(0),
                 new MutableObject<>(new ConstantExpression(new AsterixConstantValue(new AInt32(k)))));
+        faExpr.setSourceLocation(fce.getSourceLocation());
+        return faExpr;
     }
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CancelUnnestWithNestedListifyRule.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CancelUnnestWithNestedListifyRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CancelUnnestWithNestedListifyRule.java
index 6cc87ad..567e6c3 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CancelUnnestWithNestedListifyRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CancelUnnestWithNestedListifyRule.java
@@ -51,6 +51,7 @@ import org.apache.hyracks.algebricks.core.algebra.operators.physical.RunningAggr
 import org.apache.hyracks.algebricks.core.algebra.properties.UnpartitionedPropertyComputer;
 import org.apache.hyracks.algebricks.core.algebra.util.OperatorManipulationUtil;
 import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.api.exceptions.SourceLocation;
 
 import com.google.common.collect.ImmutableSet;
 
@@ -225,8 +226,11 @@ public class CancelUnnestWithNestedListifyRule implements IAlgebraicRewriteRule
         ArrayList<LogicalVariable> assgnVars = new ArrayList<LogicalVariable>(1);
         assgnVars.add(unnest1.getVariable());
         ArrayList<Mutable<ILogicalExpression>> assgnExprs = new ArrayList<Mutable<ILogicalExpression>>(1);
-        assgnExprs.add(new MutableObject<ILogicalExpression>(new VariableReferenceExpression(paramVar)));
+        VariableReferenceExpression paramRef = new VariableReferenceExpression(paramVar);
+        paramRef.setSourceLocation(arg0.getSourceLocation());
+        assgnExprs.add(new MutableObject<ILogicalExpression>(paramRef));
         AssignOperator assign = new AssignOperator(assgnVars, assgnExprs);
+        assign.setSourceLocation(arg0.getSourceLocation());
 
         LogicalVariable posVar = unnest1.getPositionalVariable();
         if (posVar == null) {
@@ -252,6 +256,7 @@ public class CancelUnnestWithNestedListifyRule implements IAlgebraicRewriteRule
             opRef.setValue(assign);
             assign.getInputs().add(aggInputOpRef);
             AssignOperator gbyKeyAssign = new AssignOperator(gbyKeyAssgnVars, gbyKeyAssgnExprs);
+            gbyKeyAssign.setSourceLocation(gby.getSourceLocation());
             gbyKeyAssign.getInputs().add(gby.getInputs().get(0));
             bottomOpRef.setValue(gbyKeyAssign);
 
@@ -266,6 +271,8 @@ public class CancelUnnestWithNestedListifyRule implements IAlgebraicRewriteRule
             nestedAssignVars.add(unnest1.getVariable());
             nestedAssignExprs.add(new MutableObject<ILogicalExpression>(arg0));
             AssignOperator nestedAssign = new AssignOperator(nestedAssignVars, nestedAssignExprs);
+            SourceLocation sourceLoc = unnest1.getSourceLocation();
+            nestedAssign.setSourceLocation(sourceLoc);
             nestedAssign.getInputs().add(opRef2);
 
             // Then create running aggregation for the positional variable
@@ -274,8 +281,10 @@ public class CancelUnnestWithNestedListifyRule implements IAlgebraicRewriteRule
             raggVars.add(posVar);
             StatefulFunctionCallExpression fce = new StatefulFunctionCallExpression(
                     FunctionUtil.getFunctionInfo(BuiltinFunctions.TID), UnpartitionedPropertyComputer.INSTANCE);
+            fce.setSourceLocation(sourceLoc);
             raggExprs.add(new MutableObject<ILogicalExpression>(fce));
             RunningAggregateOperator raggOp = new RunningAggregateOperator(raggVars, raggExprs);
+            raggOp.setSourceLocation(sourceLoc);
             raggOp.setExecutionMode(unnest1.getExecutionMode());
             RunningAggregatePOperator raggPOp = new RunningAggregatePOperator();
             raggOp.setPhysicalOperator(raggPOp);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CheckFilterExpressionTypeRule.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CheckFilterExpressionTypeRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CheckFilterExpressionTypeRule.java
index 444e5bc..1eb3e75 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CheckFilterExpressionTypeRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CheckFilterExpressionTypeRule.java
@@ -19,6 +19,8 @@
 
 package org.apache.asterix.optimizer.rules;
 
+import org.apache.asterix.common.exceptions.CompilationException;
+import org.apache.asterix.common.exceptions.ErrorCode;
 import org.apache.asterix.om.types.ATypeTag;
 import org.apache.asterix.om.types.AUnionType;
 import org.apache.asterix.om.types.IAType;
@@ -62,7 +64,7 @@ public class CheckFilterExpressionTypeRule implements IAlgebraicRewriteRule {
         IAType condType = (IAType) env.getType(condition);
         if (condType.getTypeTag() != ATypeTag.BOOLEAN && condType.getTypeTag() != ATypeTag.ANY
                 && !isPossibleBoolean(condType)) {
-            throw new AlgebricksException(
+            throw new CompilationException(ErrorCode.COMPILATION_ERROR, condition.getSourceLocation(),
                     "The select condition " + condition.toString() + " should be of the boolean type.");
         }
         return false;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CheckInsertUpsertReturningRule.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CheckInsertUpsertReturningRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CheckInsertUpsertReturningRule.java
index 7c01ebd..5849d88 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CheckInsertUpsertReturningRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CheckInsertUpsertReturningRule.java
@@ -42,8 +42,9 @@ public class CheckInsertUpsertReturningRule implements IAlgebraicRewriteRule {
         if (checked) {
             return false;
         }
-        if (InsertUpsertCheckUtil.check(opRef.getValue())) {
-            throw new CompilationException(ErrorCode.COMPILATION_INVALID_RETURNING_EXPRESSION);
+        ILogicalOperator op = opRef.getValue();
+        if (InsertUpsertCheckUtil.check(op)) {
+            throw new CompilationException(ErrorCode.COMPILATION_INVALID_RETURNING_EXPRESSION, op.getSourceLocation());
         }
         checked = true;
         return false;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/DisjunctivePredicateToJoinRule.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/DisjunctivePredicateToJoinRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/DisjunctivePredicateToJoinRule.java
index 85ee0ef..952c12b 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/DisjunctivePredicateToJoinRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/DisjunctivePredicateToJoinRule.java
@@ -51,6 +51,7 @@ import org.apache.hyracks.algebricks.core.algebra.operators.logical.InnerJoinOpe
 import org.apache.hyracks.algebricks.core.algebra.operators.logical.SelectOperator;
 import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
 import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+import org.apache.hyracks.api.exceptions.SourceLocation;
 
 public class DisjunctivePredicateToJoinRule implements IAlgebraicRewriteRule {
 
@@ -117,6 +118,8 @@ public class DisjunctivePredicateToJoinRule implements IAlgebraicRewriteRule {
             }
         }
 
+        SourceLocation sourceLoc = select.getSourceLocation();
+
         AOrderedList list = new AOrderedList(new AOrderedListType(valType, "orderedlist"));
         for (AsterixConstantValue value : values) {
             list.add(value.getObject());
@@ -129,14 +132,19 @@ public class DisjunctivePredicateToJoinRule implements IAlgebraicRewriteRule {
         Mutable<ILogicalExpression> mutCExp = new MutableObject<>(cExp);
         IFunctionInfo scanFctInfo = BuiltinFunctions.getAsterixFunctionInfo(BuiltinFunctions.SCAN_COLLECTION);
         UnnestingFunctionCallExpression scanExp = new UnnestingFunctionCallExpression(scanFctInfo, mutCExp);
+        scanExp.setSourceLocation(sourceLoc);
         LogicalVariable scanVar = context.newVar();
         UnnestOperator unn = new UnnestOperator(scanVar, new MutableObject<>(scanExp));
+        unn.setSourceLocation(sourceLoc);
         unn.getInputs().add(new MutableObject<>(ets));
         context.computeAndSetTypeEnvironmentForOperator(unn);
 
         IFunctionInfo eqFctInfo = BuiltinFunctions.getAsterixFunctionInfo(AlgebricksBuiltinFunctions.EQ);
         AbstractFunctionCallExpression eqExp = new ScalarFunctionCallExpression(eqFctInfo);
-        eqExp.getArguments().add(new MutableObject<>(new VariableReferenceExpression(scanVar)));
+        eqExp.setSourceLocation(sourceLoc);
+        VariableReferenceExpression scanVarRef = new VariableReferenceExpression(scanVar);
+        scanVarRef.setSourceLocation(sourceLoc);
+        eqExp.getArguments().add(new MutableObject<>(scanVarRef));
         eqExp.getArguments().add(new MutableObject<>(varEx.cloneExpression()));
         eqExp.getAnnotations().put(IndexedNLJoinExpressionAnnotation.INSTANCE,
                 IndexedNLJoinExpressionAnnotation.INSTANCE);
@@ -145,6 +153,7 @@ public class DisjunctivePredicateToJoinRule implements IAlgebraicRewriteRule {
         eqExp.getAnnotations().put(BroadcastExpressionAnnotation.BROADCAST_ANNOTATION_KEY, bcast);
 
         InnerJoinOperator jOp = new InnerJoinOperator(new MutableObject<>(eqExp));
+        jOp.setSourceLocation(sourceLoc);
         jOp.getInputs().add(new MutableObject<>(unn));
         jOp.getInputs().add(select.getInputs().get(0));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ExtractDistinctByExpressionsRule.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ExtractDistinctByExpressionsRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ExtractDistinctByExpressionsRule.java
index 01b37a4..f340898 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ExtractDistinctByExpressionsRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ExtractDistinctByExpressionsRule.java
@@ -69,7 +69,8 @@ public class ExtractDistinctByExpressionsRule extends AbstractExtractExprRule {
                 continue;
             }
             LogicalVariable v = extractExprIntoAssignOpRef(expr.getValue(), opRef2, context);
-            ILogicalExpression newExpr = new VariableReferenceExpression(v);
+            VariableReferenceExpression newExpr = new VariableReferenceExpression(v);
+            newExpr.setSourceLocation(expr.getValue().getSourceLocation());
             newExprList.add(new MutableObject<ILogicalExpression>(newExpr));
             changed = true;
         }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ExtractOrderExpressionsRule.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ExtractOrderExpressionsRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ExtractOrderExpressionsRule.java
index 4fbd632..585077f 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ExtractOrderExpressionsRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ExtractOrderExpressionsRule.java
@@ -65,7 +65,9 @@ public class ExtractOrderExpressionsRule extends AbstractExtractExprRule {
             ILogicalExpression expr = orderPair.second.getValue();
             if (expr.getExpressionTag() != LogicalExpressionTag.VARIABLE && !AnalysisUtil.isAccessToFieldRecord(expr)) {
                 LogicalVariable v = extractExprIntoAssignOpRef(expr, opRef2, context);
-                orderPair.second.setValue(new VariableReferenceExpression(v));
+                VariableReferenceExpression vRef = new VariableReferenceExpression(v);
+                vRef.setSourceLocation(expr.getSourceLocation());
+                orderPair.second.setValue(vRef);
             }
         }
         context.computeAndSetTypeEnvironmentForOperator(oo);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FeedScanCollectionToUnnest.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FeedScanCollectionToUnnest.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FeedScanCollectionToUnnest.java
index fef2323..6b03d32 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FeedScanCollectionToUnnest.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FeedScanCollectionToUnnest.java
@@ -63,9 +63,10 @@ public class FeedScanCollectionToUnnest implements IAlgebraicRewriteRule {
         UnnestOperator unnest = (UnnestOperator) op;
         ILogicalExpression unnestExpr = unnest.getExpressionRef().getValue();
         if (needsScanCollection(unnestExpr, op)) {
-            ILogicalExpression newExpr =
+            UnnestingFunctionCallExpression newExpr =
                     new UnnestingFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.SCAN_COLLECTION),
                             new MutableObject<ILogicalExpression>(unnestExpr));
+            newExpr.setSourceLocation(unnestExpr.getSourceLocation());
             unnest.getExpressionRef().setValue(newExpr);
             context.addToDontApplySet(this, op);
             return true;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ee54cc02/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FixReplicateOperatorOutputsRule.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FixReplicateOperatorOutputsRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FixReplicateOperatorOutputsRule.java
index c594ff8..e580e65 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FixReplicateOperatorOutputsRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FixReplicateOperatorOutputsRule.java
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.asterix.algebra.operators.CommitOperator;
+import org.apache.asterix.common.exceptions.AsterixException;
 import org.apache.asterix.common.exceptions.ErrorCode;
 import org.apache.commons.lang3.mutable.Mutable;
 import org.apache.commons.lang3.mutable.MutableInt;
@@ -102,7 +103,8 @@ public class FixReplicateOperatorOutputsRule implements IAlgebraicRewriteRule {
                         && ((DelegateOperator) op).getDelegate() instanceof CommitOperator)) {
             for (Map.Entry<AbstractReplicateOperator, MutableInt> entry : replicateOperators.entrySet()) {
                 if (entry.getKey().getOutputs().size() != entry.getValue().getValue()) {
-                    throw new AlgebricksException(ErrorCode.ASTERIX, ErrorCode.COMPILATION_FAILED_DUE_TO_REPLICATE_OP);
+                    throw new AsterixException(ErrorCode.COMPILATION_FAILED_DUE_TO_REPLICATE_OP,
+                            op.getSourceLocation());
                 }
             }
             return false;