asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sjaco...@apache.org
Subject [23/23] asterixdb git commit: ASTERIXDB-1711: remove more mentions of Asterix
Date Fri, 16 Dec 2016 18:12:09 GMT
ASTERIXDB-1711: remove more mentions of Asterix

Change-Id: I21666fd54075ac56de8aab76bb7d5cdbec020121
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1387
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Steven Jacobs <sjaco002@ucr.edu>


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

Branch: refs/heads/master
Commit: f76d9c3752abbd13e9847cb6a86cfcc34e71477d
Parents: bc3d1b0
Author: Till Westmann <tillw@apache.org>
Authored: Fri Dec 16 09:24:54 2016 -0800
Committer: Steven Jacobs <sjaco002@ucr.edu>
Committed: Fri Dec 16 10:11:02 2016 -0800

----------------------------------------------------------------------
 .../ActiveSourceOperatorNodePushable.java       |    4 +-
 .../active/message/ActiveManagerMessage.java    |    6 +-
 .../base/AsterixOperatorAnnotations.java        |   26 -
 .../algebra/base/OperatorAnnotation.java        |   26 +
 .../physical/BTreeSearchPOperator.java          |    4 +-
 .../operators/physical/CommitRuntime.java       |    4 +-
 .../physical/ExternalDataLookupPOperator.java   |    4 +-
 .../physical/InvertedIndexPOperator.java        |   24 +-
 .../physical/RTreeSearchPOperator.java          |    4 +-
 .../jobgen/QueryLogicalExpressionJobGen.java    |    6 +-
 .../asterix/optimizer/base/AnalysisUtil.java    |   18 +-
 .../asterix/optimizer/base/FuzzyUtils.java      |    8 +-
 ...quivalenceClassForRecordConstructorRule.java |    8 +-
 ...ixExtractFunctionsFromJoinConditionRule.java |    6 +-
 .../rules/AsterixInlineVariablesRule.java       |   24 +-
 .../AsterixIntroduceGroupByCombinerRule.java    |    4 +-
 .../rules/ByNameToByHandleFieldAccessRule.java  |   14 +-
 .../rules/ByNameToByIndexFieldAccessRule.java   |   10 +-
 .../CancelUnnestWithNestedListifyRule.java      |    8 +-
 .../optimizer/rules/ConstantFoldingRule.java    |   20 +-
 .../optimizer/rules/CountVarToCountOneRule.java |    4 +-
 .../rules/DisjunctivePredicateToJoinRule.java   |    8 +-
 .../rules/FeedScanCollectionToUnnest.java       |    4 +-
 .../FullTextContainsParameterCheckRule.java     |   14 +-
 .../asterix/optimizer/rules/FuzzyEqRule.java    |    4 +-
 .../asterix/optimizer/rules/FuzzyJoinRule.java  |    6 +-
 .../rules/InjectTypeCastForSwitchCaseRule.java  |    6 +-
 .../rules/InjectTypeCastForUnionRule.java       |    4 +-
 .../rules/InlineUnnestFunctionRule.java         |    8 +-
 .../rules/IntroduceAutogenerateIDRule.java      |   12 +-
 ...eDynamicTypeCastForExternalFunctionRule.java |   14 +-
 .../rules/IntroduceDynamicTypeCastRule.java     |    6 +-
 ...aterializationForInsertWithSelfScanRule.java |    4 +-
 ...IntroduceSecondaryIndexInsertDeleteRule.java |   22 +-
 ...roduceUnnestForCollectionToSequenceRule.java |    6 +-
 .../rules/ListifyUnnestingFunctionRule.java     |    6 +-
 .../optimizer/rules/LoadRecordFieldsRule.java   |   18 +-
 .../rules/MetaFunctionToMetaVariableRule.java   |   12 +-
 .../optimizer/rules/NestGroupByRule.java        |    6 +-
 .../PullPositionalVariableFromUnnestRule.java   |    4 +-
 .../PushAggFuncIntoStandaloneAggregateRule.java |   12 +-
 .../PushAggregateIntoNestedSubplanRule.java     |   14 +-
 .../optimizer/rules/PushFieldAccessRule.java    |   10 +-
 .../rules/PushSimilarityFunctionsBelowJoin.java |   10 +-
 ...moveLeftOuterUnnestForLeftOuterJoinRule.java |    8 +-
 .../rules/RemoveRedundantListifyRule.java       |   12 +-
 .../optimizer/rules/ResolveVariableRule.java    |   18 +-
 .../rules/SetAsterixPhysicalOperatorsRule.java  |   10 +-
 .../rules/SetClosedRecordConstructorsRule.java  |   10 +-
 .../rules/SetupCommitExtensionOpRule.java       |    8 +-
 .../optimizer/rules/SimilarityCheckRule.java    |   16 +-
 .../optimizer/rules/UnnestToDataScanRule.java   |    6 +-
 .../am/AbstractIntroduceAccessMethodRule.java   |   28 +-
 .../optimizer/rules/am/AccessMethodUtils.java   |   10 +-
 .../optimizer/rules/am/BTreeAccessMethod.java   |    4 +-
 .../am/IntroduceLSMComponentFilterRule.java     |   18 +-
 .../rules/am/InvertedIndexAccessMethod.java     |   74 +-
 .../optimizer/rules/am/OptimizableFuncExpr.java |    6 +-
 .../rules/am/OptimizableOperatorSubTree.java    |    7 +-
 .../optimizer/rules/am/RTreeAccessMethod.java   |    6 +-
 .../subplan/InlineAllNtsInSubplanVisitor.java   |   10 +-
 ...ineSubplanInputForNestedTupleSourceRule.java |   12 +-
 .../TranslateIntervalExpressionRule.java        |   44 +-
 .../rules/typecast/StaticTypeCastUtil.java      |   18 +-
 .../rules/util/EquivalenceClassUtils.java       |    6 +-
 .../translator/AbstractLangTranslator.java      |    6 +-
 .../AqlPlusExpressionToPlanTranslator.java      |   60 +-
 .../LangExpressionToPlanTranslator.java         |   94 +-
 .../SqlppExpressionToPlanTranslator.java        |   18 +-
 .../translator/util/PlanTranslationUtil.java    |    8 +-
 .../apache/asterix/api/common/APIFramework.java |   12 +-
 .../AppRuntimeContextProviderForRecovery.java   |   96 ++
 ...rixAppRuntimeContextProviderForRecovery.java |   96 --
 .../common/AsterixHyracksIntegrationUtil.java   |    6 +-
 .../api/http/servlet/ClusterAPIServlet.java     |   16 +-
 .../api/http/servlet/DiagnosticsAPIServlet.java |    4 +-
 .../http/servlet/QueryWebInterfaceServlet.java  |    6 +-
 .../api/http/servlet/VersionAPIServlet.java     |    4 +-
 .../app/cc/AsterixResourceIdManager.java        |   68 -
 .../asterix/app/cc/ResourceIdManager.java       |   68 +
 .../external/ExternalIndexingOperations.java    |   92 +-
 .../app/external/FeedWorkCollection.java        |    4 +-
 .../app/nc/AsterixNCAppRuntimeContext.java      |  476 ------
 .../asterix/app/nc/NCAppRuntimeContext.java     |  476 ++++++
 .../apache/asterix/app/result/ResultReader.java |    4 +-
 .../asterix/app/translator/QueryTranslator.java |   14 +-
 .../apache/asterix/file/DatasetOperations.java  |   32 +-
 .../apache/asterix/file/IndexOperations.java    |   16 +-
 .../asterix/file/JobSpecificationUtils.java     |    6 +-
 .../file/SecondaryBTreeOperationsHelper.java    |   46 +-
 .../file/SecondaryIndexOperationsHelper.java    |   37 +-
 .../SecondaryInvertedIndexOperationsHelper.java |   34 +-
 .../file/SecondaryRTreeOperationsHelper.java    |   46 +-
 .../bootstrap/CCApplicationEntryPoint.java      |   32 +-
 .../bootstrap/NCApplicationEntryPoint.java      |   24 +-
 .../asterix/messaging/NCMessageBroker.java      |    6 +-
 .../apache/asterix/util/FlushDatasetUtils.java  |    6 +-
 .../api/http/servlet/VersionAPIServletTest.java |    8 +-
 .../app/bootstrap/TestNodeController.java       |   52 +-
 .../aql/translator/QueryTranslatorTest.java     |   12 +-
 .../asterix/test/dataflow/LogMarkerTest.java    |    4 +-
 .../asterix/test/logging/CheckpointingTest.java |   10 +-
 .../asterix/test/runtime/ExecutionTest.java     |    4 +-
 .../asterix/test/runtime/ExecutionTestUtil.java |    8 +-
 .../test/runtime/SqlppExecutionTest.java        |    4 +-
 .../common/api/AsterixThreadExecutor.java       |   43 -
 .../asterix/common/api/IAppRuntimeContext.java  |  110 ++
 .../common/api/IAsterixAppRuntimeContext.java   |  110 --
 .../asterix/common/api/ThreadExecutor.java      |   43 +
 .../config/AbstractAsterixProperties.java       |   71 -
 .../common/config/AbstractProperties.java       |   71 +
 .../common/config/AsterixBuildProperties.java   |  117 --
 .../config/AsterixCompilerProperties.java       |   75 -
 .../config/AsterixExtensionProperties.java      |   32 -
 .../config/AsterixExternalProperties.java       |  117 --
 .../common/config/AsterixFeedProperties.java    |   82 -
 .../config/AsterixMetadataProperties.java       |  107 --
 .../config/AsterixPropertiesAccessor.java       |  349 ----
 .../config/AsterixReplicationProperties.java    |  284 ----
 .../common/config/AsterixStorageProperties.java |  120 --
 .../config/AsterixTransactionProperties.java    |  149 --
 .../asterix/common/config/BuildProperties.java  |  117 ++
 .../common/config/CompilerProperties.java       |   75 +
 .../common/config/ExtensionProperties.java      |   32 +
 .../common/config/ExternalProperties.java       |  117 ++
 .../asterix/common/config/FeedProperties.java   |   82 +
 .../config/IAsterixPropertiesProvider.java      |   39 -
 .../common/config/IPropertiesProvider.java      |   39 +
 .../common/config/MessagingProperties.java      |    4 +-
 .../common/config/MetadataProperties.java       |  107 ++
 .../common/config/PropertiesAccessor.java       |  349 ++++
 .../common/config/ReplicationProperties.java    |  284 ++++
 .../common/config/StorageProperties.java        |  120 ++
 .../common/config/TransactionProperties.java    |  149 ++
 .../common/context/AsterixFileMapManager.java   |   96 --
 .../AsterixVirtualBufferCacheProvider.java      |    4 +-
 .../CorrelatedPrefixMergePolicyFactory.java     |    4 +-
 .../common/context/DatasetLifecycleManager.java |    6 +-
 .../context/DatasetVirtualBufferCaches.java     |    6 +-
 .../asterix/common/context/FileMapManager.java  |   96 ++
 .../context/TransactionSubsystemProvider.java   |    4 +-
 .../common/dataflow/AsterixLSMIndexUtil.java    |   56 -
 ...erixLSMInsertDeleteOperatorNodePushable.java |  202 ---
 ...rtedIndexInsertDeleteOperatorDescriptor.java |   72 -
 ...ixLSMTreeInsertDeleteOperatorDescriptor.java |   94 --
 .../dataflow/IApplicationContextInfo.java       |   63 +
 .../IAsterixApplicationContextInfo.java         |   63 -
 .../asterix/common/dataflow/LSMIndexUtil.java   |   56 +
 .../LSMInsertDeleteOperatorNodePushable.java    |  202 +++
 ...rtedIndexInsertDeleteOperatorDescriptor.java |   72 +
 .../LSMTreeInsertDeleteOperatorDescriptor.java  |   94 ++
 .../replication/AsterixReplicationJob.java      |   37 -
 .../asterix/common/replication/Replica.java     |    4 +-
 .../common/replication/ReplicationJob.java      |   37 +
 .../IAppRuntimeContextProvider.java             |   54 +
 .../IAsterixAppRuntimeContextProvider.java      |   54 -
 .../transactions/IAsterixResourceIdManager.java |   29 -
 .../common/transactions/IResourceIdManager.java |   29 +
 .../transactions/ITransactionSubsystem.java     |    2 +-
 .../transactions/LogManagerProperties.java      |    4 +-
 .../asterix/common/transactions/Resource.java   |    2 +-
 .../memory/ConcurrentFramePoolUnitTest.java     |   22 +-
 .../adapter/factory/GenericAdapterFactory.java  |    4 +-
 .../api/IExternalDataSourceFactory.java         |    4 +-
 .../feed/management/FeedEventsListener.java     |   10 +-
 .../external/library/ExternalFunction.java      |    8 +-
 .../FeedCollectOperatorDescriptor.java          |    4 +-
 .../FeedCollectOperatorNodePushable.java        |    4 +-
 .../operators/FeedIntakeOperatorDescriptor.java |    6 +-
 .../FeedIntakeOperatorNodePushable.java         |    4 +-
 .../FeedMessageOperatorNodePushable.java        |    6 +-
 .../operators/FeedMetaComputeNodePushable.java  |    4 +-
 .../operators/FeedMetaStoreNodePushable.java    |   12 +-
 .../apache/asterix/external/util/HDFSUtils.java |    8 +-
 .../adapter/TestTypedAdapterFactory.java        |    6 +-
 .../lang/common/util/CommonFunctionMapUtil.java |    4 +-
 .../asterix/lang/common/util/FunctionUtil.java  |    6 +-
 .../lang/sqlpp/util/FunctionMapUtil.java        |    6 +-
 .../sqlpp/visitor/SqlppAstPrintVisitor.java     |    4 +-
 .../asterix/metadata/MetadataManager.java       |    8 +-
 .../apache/asterix/metadata/MetadataNode.java   |   14 +-
 .../metadata/bootstrap/MetadataBootstrap.java   |   22 +-
 .../metadata/cluster/ClusterManager.java        |    8 +-
 .../metadata/dataset/hints/DatasetHints.java    |    4 +-
 .../metadata/declared/MetadataProvider.java     |  128 +-
 .../metadata/feeds/FeedMetadataUtil.java        |    8 +-
 .../AsterixExternalScalarFunctionInfo.java      |   42 -
 .../functions/ExternalFunctionCompilerUtil.java |    7 +-
 .../functions/ExternalScalarFunctionInfo.java   |   42 +
 .../functions/MetadataBuiltinFunctions.java     |   24 +-
 .../AqlMergeAggregationExpressionFactory.java   |    8 +-
 .../AqlPartialAggregationTypeComputer.java      |   10 +-
 .../data/common/ExpressionTypeComputer.java     |   10 +-
 .../om/functions/AsterixBuiltinFunctions.java   | 1540 ------------------
 .../functions/AsterixExternalFunctionInfo.java  |   93 --
 .../asterix/om/functions/AsterixFunction.java   |   61 -
 .../om/functions/AsterixFunctionIdentifier.java |   48 -
 .../om/functions/AsterixFunctionInfo.java       |   79 -
 .../asterix/om/functions/BuiltinFunctions.java  | 1540 ++++++++++++++++++
 .../om/functions/ExternalFunctionInfo.java      |   93 ++
 .../asterix/om/functions/FunctionInfo.java      |   78 +
 .../management/ReplicaStateChecker.java         |    6 +-
 .../management/ReplicationChannel.java          |   18 +-
 .../management/ReplicationManager.java          |   24 +-
 .../recovery/RemoteRecoveryManager.java         |   16 +-
 .../storage/ReplicaResourcesManager.java        |    4 +-
 .../FirstElementAggregateDescriptor.java        |    5 +-
 .../collections/ListifyAggregateDescriptor.java |    5 +-
 .../LocalFirstElementAggregateDescriptor.java   |    5 +-
 .../AbstractScalarAggregateDescriptor.java      |    4 +-
 .../scalar/ScalarAvgAggregateDescriptor.java    |    4 +-
 .../scalar/ScalarCountAggregateDescriptor.java  |    4 +-
 .../scalar/ScalarMaxAggregateDescriptor.java    |    4 +-
 .../scalar/ScalarMinAggregateDescriptor.java    |    4 +-
 .../scalar/ScalarSqlAvgAggregateDescriptor.java |    4 +-
 .../ScalarSqlCountAggregateDescriptor.java      |    4 +-
 .../scalar/ScalarSqlMaxAggregateDescriptor.java |    4 +-
 .../scalar/ScalarSqlMinAggregateDescriptor.java |    4 +-
 .../scalar/ScalarSqlSumAggregateDescriptor.java |    4 +-
 .../scalar/ScalarSumAggregateDescriptor.java    |    4 +-
 ...bstractSerializableAvgAggregateFunction.java |    8 +-
 ...bstractSerializableSumAggregateFunction.java |    8 +-
 .../std/SerializableAvgAggregateDescriptor.java |    4 +-
 .../SerializableCountAggregateDescriptor.java   |    4 +-
 ...erializableGlobalAvgAggregateDescriptor.java |    4 +-
 ...alizableGlobalSqlAvgAggregateDescriptor.java |    4 +-
 ...zableIntermediateAvgAggregateDescriptor.java |    4 +-
 ...leIntermediateSqlAvgAggregateDescriptor.java |    4 +-
 ...SerializableLocalAvgAggregateDescriptor.java |    4 +-
 ...ializableLocalSqlAvgAggregateDescriptor.java |    4 +-
 ...ializableLocalSqlSumAggregateDescriptor.java |    4 +-
 ...SerializableLocalSumAggregateDescriptor.java |    4 +-
 .../SerializableSqlAvgAggregateDescriptor.java  |    4 +-
 ...SerializableSqlCountAggregateDescriptor.java |    4 +-
 .../SerializableSqlSumAggregateDescriptor.java  |    4 +-
 .../SerializableSqlSumAggregateFunction.java    |    4 +-
 .../std/SerializableSumAggregateDescriptor.java |    4 +-
 .../std/SerializableSumAggregateFunction.java   |    4 +-
 .../std/AbstractAvgAggregateFunction.java       |    6 +-
 .../std/AbstractSumAggregateFunction.java       |    8 +-
 .../aggregates/std/AvgAggregateDescriptor.java  |    4 +-
 .../std/CountAggregateDescriptor.java           |    4 +-
 .../std/GlobalAvgAggregateDescriptor.java       |    4 +-
 .../std/GlobalSqlAvgAggregateDescriptor.java    |    4 +-
 .../std/IntermediateAvgAggregateDescriptor.java |    4 +-
 .../IntermediateSqlAvgAggregateDescriptor.java  |    4 +-
 .../std/LocalAvgAggregateDescriptor.java        |    4 +-
 .../std/LocalMaxAggregateDescriptor.java        |    4 +-
 .../std/LocalMinAggregateDescriptor.java        |    4 +-
 .../std/LocalSqlAvgAggregateDescriptor.java     |    4 +-
 .../std/LocalSqlMaxAggregateDescriptor.java     |    4 +-
 .../std/LocalSqlMinAggregateDescriptor.java     |    4 +-
 .../std/LocalSqlSumAggregateDescriptor.java     |    4 +-
 .../std/LocalSumAggregateDescriptor.java        |    4 +-
 .../aggregates/std/MaxAggregateDescriptor.java  |    4 +-
 .../aggregates/std/MinAggregateDescriptor.java  |    4 +-
 .../std/SqlAvgAggregateDescriptor.java          |    4 +-
 .../std/SqlCountAggregateDescriptor.java        |    4 +-
 .../std/SqlMaxAggregateDescriptor.java          |    4 +-
 .../std/SqlMinAggregateDescriptor.java          |    4 +-
 .../std/SqlSumAggregateDescriptor.java          |    4 +-
 .../aggregates/std/SqlSumAggregateFunction.java |    4 +-
 .../aggregates/std/SumAggregateDescriptor.java  |    4 +-
 .../aggregates/std/SumAggregateFunction.java    |    4 +-
 .../stream/EmptyStreamAggregateDescriptor.java  |    4 +-
 .../NonEmptyStreamAggregateDescriptor.java      |    4 +-
 .../accessors/CircleCenterAccessor.java         |    4 +-
 .../accessors/CircleRadiusAccessor.java         |    4 +-
 .../accessors/LineRectanglePolygonAccessor.java |    4 +-
 .../accessors/PointXCoordinateAccessor.java     |    4 +-
 .../accessors/PointYCoordinateAccessor.java     |    4 +-
 .../accessors/TemporalDayAccessor.java          |    4 +-
 .../accessors/TemporalHourAccessor.java         |    4 +-
 .../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  |    4 +-
 .../accessors/TemporalMinuteAccessor.java       |    4 +-
 .../accessors/TemporalMonthAccessor.java        |    4 +-
 .../accessors/TemporalSecondAccessor.java       |    4 +-
 .../accessors/TemporalYearAccessor.java         |    4 +-
 .../evaluators/common/AsterixListAccessor.java  |  118 --
 .../common/AsterixOrderedListIterator.java      |   40 -
 .../common/AsterixUnorderedListIterator.java    |   40 -
 .../evaluators/common/CreateMBREvalFactory.java |    8 +-
 .../common/EditDistanceCheckEvaluator.java      |    6 +-
 .../common/EditDistanceContainsEvaluator.java   |    4 +-
 .../common/EditDistanceEvaluator.java           |   16 +-
 .../evaluators/common/GramTokensEvaluator.java  |    4 +-
 .../runtime/evaluators/common/ListAccessor.java |  118 ++
 .../evaluators/common/OrderedListIterator.java  |   40 +
 .../common/SimilarityJaccardEvaluator.java      |   14 +-
 .../SimilarityJaccardPrefixEvaluator.java       |   20 +-
 .../common/UnorderedListIterator.java           |   40 +
 .../comparisons/EqualsDescriptor.java           |    4 +-
 .../comparisons/GreaterThanDescriptor.java      |    4 +-
 .../GreaterThanOrEqualsDescriptor.java          |    4 +-
 .../comparisons/LessThanDescriptor.java         |    4 +-
 .../comparisons/LessThanOrEqualsDescriptor.java |    4 +-
 .../comparisons/NotEqualsDescriptor.java        |    4 +-
 ...BinaryBase64StringConstructorDescriptor.java |    4 +-
 .../ABinaryHexStringConstructorDescriptor.java  |    8 +-
 .../ABooleanConstructorDescriptor.java          |    4 +-
 .../ACircleConstructorDescriptor.java           |    4 +-
 .../ADateConstructorDescriptor.java             |    4 +-
 .../ADateTimeConstructorDescriptor.java         |    4 +-
 .../ADayTimeDurationConstructorDescriptor.java  |    4 +-
 .../ADoubleConstructorDescriptor.java           |    4 +-
 .../ADurationConstructorDescriptor.java         |    4 +-
 .../AFloatConstructorDescriptor.java            |    4 +-
 .../AInt16ConstructorDescriptor.java            |    4 +-
 .../AInt32ConstructorDescriptor.java            |    4 +-
 .../AInt64ConstructorDescriptor.java            |    4 +-
 .../AInt8ConstructorDescriptor.java             |    4 +-
 .../AIntervalConstructorDescriptor.java         |    4 +-
 ...ervalStartFromDateConstructorDescriptor.java |    4 +-
 ...lStartFromDateTimeConstructorDescriptor.java |    4 +-
 ...ervalStartFromTimeConstructorDescriptor.java |    4 +-
 .../ALineConstructorDescriptor.java             |    4 +-
 .../ANullConstructorDescriptor.java             |    4 +-
 .../APoint3DConstructorDescriptor.java          |    4 +-
 .../APointConstructorDescriptor.java            |    4 +-
 .../APolygonConstructorDescriptor.java          |    4 +-
 .../ARectangleConstructorDescriptor.java        |    4 +-
 .../AStringConstructorDescriptor.java           |    4 +-
 .../ATimeConstructorDescriptor.java             |    4 +-
 .../AUUIDFromStringConstructorDescriptor.java   |    4 +-
 ...AYearMonthDurationConstructorDescriptor.java |    4 +-
 .../ClosedRecordConstructorDescriptor.java      |    4 +-
 .../OpenRecordConstructorDescriptor.java        |    4 +-
 .../evaluators/functions/AndDescriptor.java     |    4 +-
 .../AnyCollectionMemberDescriptor.java          |    6 +-
 .../functions/CastTypeDescriptor.java           |    4 +-
 .../functions/CheckUnknownDescriptor.java       |    4 +-
 .../functions/CodePointToStringDescriptor.java  |    4 +-
 .../CountHashedGramTokensDescriptor.java        |    4 +-
 .../CountHashedWordTokensDescriptor.java        |    4 +-
 .../functions/CreateCircleDescriptor.java       |    4 +-
 .../functions/CreateLineDescriptor.java         |    4 +-
 .../functions/CreateMBRDescriptor.java          |    4 +-
 .../functions/CreatePointDescriptor.java        |    4 +-
 .../functions/CreatePolygonDescriptor.java      |   10 +-
 .../functions/CreateQueryUIDDescriptor.java     |    4 +-
 .../functions/CreateRectangleDescriptor.java    |    4 +-
 .../functions/CreateUUIDDescriptor.java         |    4 +-
 .../functions/DeepEqualityDescriptor.java       |    4 +-
 .../functions/EditDistanceCheckDescriptor.java  |    4 +-
 .../EditDistanceContainsDescriptor.java         |    4 +-
 .../functions/EditDistanceDescriptor.java       |    4 +-
 .../EditDistanceListIsFilterableDescriptor.java |    8 +-
 ...ditDistanceStringIsFilterableDescriptor.java |    4 +-
 ...EditDistanceStringIsFilterableEvaluator.java |   10 +-
 .../functions/FullTextContainsDescriptor.java   |    4 +-
 .../evaluators/functions/GetItemDescriptor.java |    8 +-
 .../functions/GramTokensDescriptor.java         |    4 +-
 .../functions/HashedGramTokensDescriptor.java   |    4 +-
 .../functions/HashedWordTokensDescriptor.java   |    4 +-
 .../functions/InjectFailureDescriptor.java      |    4 +-
 .../evaluators/functions/IsArrayDescriptor.java |    4 +-
 .../functions/IsBooleanDescriptor.java          |    4 +-
 .../functions/IsMissingDescriptor.java          |    4 +-
 .../evaluators/functions/IsNullDescriptor.java  |    4 +-
 .../functions/IsNumberDescriptor.java           |    4 +-
 .../functions/IsObjectDescriptor.java           |    4 +-
 .../functions/IsStringDescriptor.java           |    4 +-
 .../functions/IsSystemNullDescriptor.java       |    4 +-
 .../functions/IsUnknownDescriptor.java          |    4 +-
 .../evaluators/functions/LenDescriptor.java     |    4 +-
 .../evaluators/functions/NotDescriptor.java     |    4 +-
 .../functions/NumericACosDescriptor.java        |    4 +-
 .../functions/NumericASinDescriptor.java        |    4 +-
 .../functions/NumericATan2Descriptor.java       |    4 +-
 .../functions/NumericATanDescriptor.java        |    4 +-
 .../functions/NumericAbsDescriptor.java         |    4 +-
 .../functions/NumericAddDescriptor.java         |    4 +-
 .../functions/NumericCaretDescriptor.java       |    4 +-
 .../functions/NumericCeilingDescriptor.java     |    4 +-
 .../functions/NumericCosDescriptor.java         |    4 +-
 .../functions/NumericDivideDescriptor.java      |    4 +-
 .../functions/NumericExpDescriptor.java         |    4 +-
 .../functions/NumericFloorDescriptor.java       |    4 +-
 .../functions/NumericLnDescriptor.java          |    4 +-
 .../functions/NumericLogDescriptor.java         |    4 +-
 .../functions/NumericModuloDescriptor.java      |    4 +-
 .../functions/NumericMultiplyDescriptor.java    |    4 +-
 .../functions/NumericRoundDescriptor.java       |    4 +-
 .../NumericRoundHalfToEven2Descriptor.java      |    4 +-
 .../NumericRoundHalfToEvenDescriptor.java       |    4 +-
 .../functions/NumericSignDescriptor.java        |    4 +-
 .../functions/NumericSinDescriptor.java         |    4 +-
 .../functions/NumericSqrtDescriptor.java        |    4 +-
 .../functions/NumericSubDescriptor.java         |    4 +-
 .../functions/NumericSubtractDescriptor.java    |    4 +-
 .../functions/NumericTanDescriptor.java         |    4 +-
 .../functions/NumericTruncDescriptor.java       |    4 +-
 .../functions/NumericUnaryMinusDescriptor.java  |    4 +-
 .../evaluators/functions/OrDescriptor.java      |    4 +-
 .../OrderedListConstructorDescriptor.java       |    4 +-
 .../functions/PrefixLenJaccardDescriptor.java   |    4 +-
 .../SimilarityJaccardCheckDescriptor.java       |    4 +-
 .../functions/SimilarityJaccardDescriptor.java  |    4 +-
 .../SimilarityJaccardPrefixCheckDescriptor.java |    4 +-
 .../SimilarityJaccardPrefixDescriptor.java      |    4 +-
 .../SimilarityJaccardSortedCheckDescriptor.java |    4 +-
 .../SimilarityJaccardSortedDescriptor.java      |    4 +-
 .../functions/SpatialAreaDescriptor.java        |    4 +-
 .../functions/SpatialCellDescriptor.java        |    4 +-
 .../functions/SpatialDistanceDescriptor.java    |    4 +-
 .../functions/SpatialIntersectDescriptor.java   |    4 +-
 .../functions/StringConcatDescriptor.java       |    8 +-
 .../functions/StringContainsDescriptor.java     |    6 +-
 .../functions/StringEndsWithDescriptor.java     |    6 +-
 .../functions/StringEqualDescriptor.java        |    6 +-
 .../functions/StringInitCapDescriptor.java      |    4 +-
 .../functions/StringJoinDescriptor.java         |    8 +-
 .../functions/StringLTrim2Descriptor.java       |    4 +-
 .../functions/StringLTrimDescriptor.java        |    4 +-
 .../functions/StringLengthDescriptor.java       |    4 +-
 .../functions/StringLikeDescriptor.java         |    4 +-
 .../functions/StringLowerCaseDescriptor.java    |    4 +-
 .../functions/StringPositionDescriptor.java     |    4 +-
 .../functions/StringRTrim2Descriptor.java       |    4 +-
 .../functions/StringRTrimDescriptor.java        |    4 +-
 .../StringRegExpContainsDescriptor.java         |    4 +-
 .../StringRegExpContainsWithFlagDescriptor.java |    4 +-
 .../functions/StringRegExpLikeDescriptor.java   |    4 +-
 .../StringRegExpLikeWithFlagDescriptor.java     |    4 +-
 .../StringRegExpPositionDescriptor.java         |    4 +-
 .../StringRegExpPositionWithFlagDescriptor.java |    4 +-
 .../StringRegExpReplaceDescriptor.java          |    4 +-
 .../StringRegExpReplaceWithFlagsDescriptor.java |    4 +-
 .../functions/StringRepeatDescriptor.java       |    4 +-
 .../functions/StringSplitDescriptor.java        |    4 +-
 .../functions/StringStartsWithDescriptor.java   |    6 +-
 .../functions/StringToCodePointDescriptor.java  |    4 +-
 .../functions/StringTrim2Descriptor.java        |    4 +-
 .../functions/StringTrimDescriptor.java         |    4 +-
 .../functions/StringUpperCaseDescriptor.java    |    4 +-
 .../functions/Substring2Descriptor.java         |    4 +-
 .../functions/SubstringAfterDescriptor.java     |    4 +-
 .../functions/SubstringBeforeDescriptor.java    |    4 +-
 .../functions/SubstringDescriptor.java          |    4 +-
 .../functions/SwitchCaseDescriptor.java         |    4 +-
 .../evaluators/functions/UUIDDescriptor.java    |    4 +-
 .../UnorderedListConstructorDescriptor.java     |    4 +-
 .../functions/WordTokensDescriptor.java         |    4 +-
 .../binary/AbstractSubBinaryEvaluator.java      |    4 +-
 .../binary/BinaryConcatDescriptor.java          |    8 +-
 .../binary/BinaryLengthDescriptor.java          |    4 +-
 .../functions/binary/FindBinaryDescriptor.java  |    4 +-
 .../binary/FindBinaryFromDescriptor.java        |    4 +-
 .../functions/binary/ParseBinaryDescriptor.java |    4 +-
 .../functions/binary/PrintBinaryDescriptor.java |    4 +-
 .../binary/SubBinaryFromDescriptor.java         |    4 +-
 .../binary/SubBinaryFromToDescriptor.java       |    4 +-
 .../records/FieldAccessByIndexDescriptor.java   |    4 +-
 .../records/FieldAccessByIndexEvalFactory.java  |    6 +-
 .../records/FieldAccessByNameDescriptor.java    |    4 +-
 .../records/FieldAccessByNameEvalFactory.java   |    4 +-
 .../records/FieldAccessNestedDescriptor.java    |    4 +-
 .../records/FieldAccessNestedEvalFactory.java   |   10 +-
 .../records/GetRecordFieldValueDescriptor.java  |    4 +-
 .../records/GetRecordFieldValueEvalFactory.java |    4 +-
 .../records/GetRecordFieldsDescriptor.java      |    4 +-
 .../records/GetRecordFieldsEvalFactory.java     |    4 +-
 .../records/RecordAddFieldsDescriptor.java      |    4 +-
 .../records/RecordMergeDescriptor.java          |    4 +-
 .../records/RecordPairsDescriptor.java          |    4 +-
 .../records/RecordRemoveFieldsDescriptor.java   |    4 +-
 .../records/RecordRemoveFieldsEvalFactory.java  |    6 +-
 .../AdjustDateTimeForTimeZoneDescriptor.java    |    4 +-
 .../AdjustTimeForTimeZoneDescriptor.java        |    4 +-
 .../CalendarDuartionFromDateDescriptor.java     |    4 +-
 .../CalendarDurationFromDateTimeDescriptor.java |    4 +-
 .../temporal/CurrentDateDescriptor.java         |    4 +-
 .../temporal/CurrentDateTimeDescriptor.java     |    4 +-
 .../temporal/CurrentTimeDescriptor.java         |    4 +-
 .../temporal/DateFromDatetimeDescriptor.java    |    4 +-
 .../DateFromUnixTimeInDaysDescriptor.java       |    4 +-
 .../DatetimeFromDateAndTimeDescriptor.java      |    4 +-
 .../DatetimeFromUnixTimeInMsDescriptor.java     |    4 +-
 .../DatetimeFromUnixTimeInSecsDescriptor.java   |    4 +-
 .../functions/temporal/DayOfWeekDescriptor.java |    4 +-
 .../DayTimeDurationComparatorDescriptor.java    |    6 +-
 .../temporal/DurationEqualDescriptor.java       |    4 +-
 .../DurationFromIntervalDescriptor.java         |    4 +-
 .../DurationFromMillisecondsDescriptor.java     |    4 +-
 .../temporal/DurationFromMonthsDescriptor.java  |    4 +-
 .../temporal/GetDayTimeDurationDescriptor.java  |    4 +-
 .../GetOverlappingIntervalDescriptor.java       |    4 +-
 .../GetYearMonthDurationDescriptor.java         |    4 +-
 .../temporal/IntervalAfterDescriptor.java       |    4 +-
 .../temporal/IntervalBeforeDescriptor.java      |    4 +-
 .../temporal/IntervalBinDescriptor.java         |    4 +-
 .../temporal/IntervalCoveredByDescriptor.java   |    4 +-
 .../temporal/IntervalCoversDescriptor.java      |    4 +-
 .../temporal/IntervalEndedByDescriptor.java     |    4 +-
 .../temporal/IntervalEndsDescriptor.java        |    4 +-
 .../temporal/IntervalMeetsDescriptor.java       |    4 +-
 .../temporal/IntervalMetByDescriptor.java       |    4 +-
 .../IntervalOverlappedByDescriptor.java         |    4 +-
 .../temporal/IntervalOverlapsDescriptor.java    |    4 +-
 .../temporal/IntervalStartedByDescriptor.java   |    4 +-
 .../temporal/IntervalStartsDescriptor.java      |    4 +-
 ...llisecondsFromDayTimeDurationDescriptor.java |    4 +-
 .../MonthsFromYearMonthDurationDescriptor.java  |    4 +-
 .../temporal/OverlapBinsDescriptor.java         |    4 +-
 .../functions/temporal/OverlapDescriptor.java   |    4 +-
 .../functions/temporal/ParseDateDescriptor.java |    4 +-
 .../temporal/ParseDateTimeDescriptor.java       |    4 +-
 .../functions/temporal/ParseTimeDescriptor.java |    4 +-
 .../functions/temporal/PrintDateDescriptor.java |    4 +-
 .../temporal/PrintDateTimeDescriptor.java       |    4 +-
 .../functions/temporal/PrintTimeDescriptor.java |    4 +-
 .../temporal/TimeFromDatetimeDescriptor.java    |    4 +-
 .../TimeFromUnixTimeInMsDescriptor.java         |    4 +-
 .../UnixTimeFromDateInDaysDescriptor.java       |    4 +-
 .../UnixTimeFromDatetimeInMsDescriptor.java     |    4 +-
 .../UnixTimeFromDatetimeInSecsDescriptor.java   |    4 +-
 .../UnixTimeFromTimeInMsDescriptor.java         |    4 +-
 .../YearMonthDurationComparatorDescriptor.java  |    6 +-
 .../runtime/formats/NonTaggedDataFormat.java    |   40 +-
 .../job/listener/JobEventListenerFactory.java   |    6 +-
 ...tiTransactionJobletEventListenerFactory.java |    6 +-
 .../message/CompleteFailbackRequestMessage.java |    6 +-
 ...PreparePartitionsFailbackRequestMessage.java |    6 +-
 .../runtime/message/ReplicaEventMessage.java    |    6 +-
 .../message/ReportMaxResourceIdMessage.java     |   14 +-
 .../message/ResourceIdRequestMessage.java       |   12 +-
 .../ResourceIdRequestResponseMessage.java       |    6 +-
 .../TakeoverMetadataNodeRequestMessage.java     |    6 +-
 .../TakeoverPartitionsRequestMessage.java       |    6 +-
 ...SMInvertedIndexUpsertOperatorDescriptor.java |   67 -
 ...rixLSMPrimaryUpsertOperatorNodePushable.java |  322 ----
 ...xLSMSecondaryUpsertOperatorNodePushable.java |  132 --
 .../AsterixLSMTreeUpsertOperatorDescriptor.java |   82 -
 ...SMInvertedIndexUpsertOperatorDescriptor.java |   67 +
 .../LSMPrimaryUpsertOperatorNodePushable.java   |  322 ++++
 .../LSMSecondaryUpsertOperatorNodePushable.java |  132 ++
 .../LSMTreeUpsertOperatorDescriptor.java        |   82 +
 .../std/FlushDatasetOperatorDescriptor.java     |    4 +-
 .../std/TidRunningAggregateDescriptor.java      |    4 +-
 .../unnestingfunctions/std/RangeDescriptor.java |    4 +-
 .../std/ScanCollectionDescriptor.java           |   10 +-
 .../std/SubsetCollectionDescriptor.java         |    4 +-
 .../asterix/runtime/util/AppContextInfo.java    |  210 +++
 .../runtime/util/AsterixAppContextInfo.java     |  210 ---
 .../util/AsterixRuntimeComponentsProvider.java  |   79 -
 .../runtime/util/ClusterStateManager.java       |   38 +-
 .../runtime/util/RuntimeComponentsProvider.java |   79 +
 .../asterix/runtime/util/RuntimeUtils.java      |    4 +-
 ...imaryIndexModificationOperationCallback.java |    6 +-
 .../PrimaryIndexOperationTrackerProvider.java   |    4 +-
 .../SecondaryIndexOperationTrackerProvider.java |    4 +-
 .../ExternalBTreeLocalResourceMetadata.java     |    8 +-
 ...rnalBTreeWithBuddyLocalResourceMetadata.java |    8 +-
 .../ExternalRTreeLocalResourceMetadata.java     |    8 +-
 .../resource/LSMBTreeLocalResourceMetadata.java |    8 +-
 .../LSMInvertedIndexLocalResourceMetadata.java  |   10 +-
 .../resource/LSMRTreeLocalResourceMetadata.java |    8 +-
 .../PersistentLocalResourceRepository.java      |    8 +-
 ...ersistentLocalResourceRepositoryFactory.java |    6 +-
 .../service/recovery/RecoveryManager.java       |   12 +-
 .../AsterixRuntimeComponentsProvider.java       |   14 +-
 .../transaction/TransactionSubsystem.java       |   24 +-
 .../locking/TestRuntimeContextProvider.java     |   14 +-
 571 files changed, 7723 insertions(+), 7839 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveSourceOperatorNodePushable.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveSourceOperatorNodePushable.java b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveSourceOperatorNodePushable.java
index 51ed40d..b49ff72 100644
--- a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveSourceOperatorNodePushable.java
+++ b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveSourceOperatorNodePushable.java
@@ -19,7 +19,7 @@
 package org.apache.asterix.active;
 
 import org.apache.asterix.active.message.ActivePartitionMessage;
-import org.apache.asterix.common.api.IAsterixAppRuntimeContext;
+import org.apache.asterix.common.api.IAppRuntimeContext;
 import org.apache.hyracks.api.comm.IFrameWriter;
 import org.apache.hyracks.api.context.IHyracksTaskContext;
 import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -36,7 +36,7 @@ public abstract class ActiveSourceOperatorNodePushable extends AbstractUnaryOutp
 
     public ActiveSourceOperatorNodePushable(IHyracksTaskContext ctx, ActiveRuntimeId runtimeId) {
         this.ctx = ctx;
-        activeManager = (ActiveManager) ((IAsterixAppRuntimeContext) ctx.getJobletContext().getApplicationContext()
+        activeManager = (ActiveManager) ((IAppRuntimeContext) ctx.getJobletContext().getApplicationContext()
                 .getApplicationObject()).getActiveManager();
         this.runtimeId = runtimeId;
     }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/message/ActiveManagerMessage.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/message/ActiveManagerMessage.java b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/message/ActiveManagerMessage.java
index b18b669..241c932 100644
--- a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/message/ActiveManagerMessage.java
+++ b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/message/ActiveManagerMessage.java
@@ -21,7 +21,7 @@ package org.apache.asterix.active.message;
 import java.io.Serializable;
 
 import org.apache.asterix.active.ActiveManager;
-import org.apache.asterix.common.api.IAsterixAppRuntimeContext;
+import org.apache.asterix.common.api.IAppRuntimeContext;
 import org.apache.asterix.common.messaging.api.IApplicationMessage;
 import org.apache.hyracks.api.exceptions.HyracksDataException;
 import org.apache.hyracks.api.service.IControllerService;
@@ -56,8 +56,8 @@ public class ActiveManagerMessage implements IApplicationMessage {
     @Override
     public void handle(IControllerService cs) throws HyracksDataException, InterruptedException {
         NodeControllerService ncs = (NodeControllerService) cs;
-        IAsterixAppRuntimeContext appContext =
-                (IAsterixAppRuntimeContext) ncs.getApplicationContext().getApplicationObject();
+        IAppRuntimeContext appContext =
+                (IAppRuntimeContext) ncs.getApplicationContext().getApplicationObject();
         ((ActiveManager) appContext.getActiveManager()).submit(this);
     }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/base/AsterixOperatorAnnotations.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/base/AsterixOperatorAnnotations.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/base/AsterixOperatorAnnotations.java
deleted file mode 100644
index 0f0ce95..0000000
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/base/AsterixOperatorAnnotations.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.asterix.algebra.base;
-
-public interface AsterixOperatorAnnotations {
-    public static final String FIELD_ACCESS = "FIELD_ACCESS";
-    public static final String PUSHED_FIELD_ACCESS = "PUSHED_FIELD_ACCESS";
-    public static final String PUSHED_RUNNABLE_FIELD_ACCESS = "PUSHED_RUNNABLE_FIELD_ACCESS";
-    public static final String FIELD_TYPE = "FIELD_TYPE";
-}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/base/OperatorAnnotation.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/base/OperatorAnnotation.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/base/OperatorAnnotation.java
new file mode 100644
index 0000000..60918fd
--- /dev/null
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/base/OperatorAnnotation.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.algebra.base;
+
+public interface OperatorAnnotation {
+    String FIELD_ACCESS = "FIELD_ACCESS";
+    String PUSHED_FIELD_ACCESS = "PUSHED_FIELD_ACCESS";
+    String PUSHED_RUNNABLE_FIELD_ACCESS = "PUSHED_RUNNABLE_FIELD_ACCESS";
+    String FIELD_TYPE = "FIELD_TYPE";
+}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/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 c9223b4..4db5430 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
@@ -26,7 +26,7 @@ import org.apache.asterix.metadata.declared.DataSourceIndex;
 import org.apache.asterix.metadata.declared.MetadataProvider;
 import org.apache.asterix.metadata.entities.Dataset;
 import org.apache.asterix.metadata.entities.Index;
-import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.asterix.optimizer.rules.am.BTreeJobGenParams;
 import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
 import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -106,7 +106,7 @@ public class BTreeSearchPOperator extends IndexSearchPOperator {
         }
         AbstractFunctionCallExpression unnestFuncExpr = (AbstractFunctionCallExpression) unnestExpr;
         FunctionIdentifier funcIdent = unnestFuncExpr.getFunctionIdentifier();
-        if (!funcIdent.equals(AsterixBuiltinFunctions.INDEX_SEARCH)) {
+        if (!funcIdent.equals(BuiltinFunctions.INDEX_SEARCH)) {
             return;
         }
         BTreeJobGenParams jobGenParams = new BTreeJobGenParams();

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitRuntime.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitRuntime.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitRuntime.java
index a1fa788..8c61300 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitRuntime.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitRuntime.java
@@ -21,7 +21,7 @@ package org.apache.asterix.algebra.operators.physical;
 
 import java.nio.ByteBuffer;
 
-import org.apache.asterix.common.api.IAsterixAppRuntimeContext;
+import org.apache.asterix.common.api.IAppRuntimeContext;
 import org.apache.asterix.common.exceptions.ACIDException;
 import org.apache.asterix.common.transactions.ILogManager;
 import org.apache.asterix.common.transactions.ILogMarkerCallback;
@@ -65,7 +65,7 @@ public class CommitRuntime extends AbstractOneInputOneOutputOneFramePushRuntime
     public CommitRuntime(IHyracksTaskContext ctx, JobId jobId, int datasetId, int[] primaryKeyFields,
             boolean isTemporaryDatasetWriteJob, boolean isWriteTransaction, int resourcePartition, boolean isSink) {
         this.ctx = ctx;
-        IAsterixAppRuntimeContext runtimeCtx = (IAsterixAppRuntimeContext) ctx.getJobletContext()
+        IAppRuntimeContext runtimeCtx = (IAppRuntimeContext) ctx.getJobletContext()
                 .getApplicationContext().getApplicationObject();
         this.transactionManager = runtimeCtx.getTransactionSubsystem().getTransactionManager();
         this.logMgr = runtimeCtx.getTransactionSubsystem().getLogManager();

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/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 81cc402..98bf45f 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
@@ -28,7 +28,7 @@ import org.apache.asterix.metadata.declared.DatasetDataSource;
 import org.apache.asterix.metadata.declared.MetadataProvider;
 import org.apache.asterix.metadata.entities.Dataset;
 import org.apache.asterix.metadata.entities.Index;
-import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.asterix.om.types.ARecordType;
 import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
 import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -132,7 +132,7 @@ public class ExternalDataLookupPOperator extends AbstractScanPOperator {
         }
         AbstractFunctionCallExpression funcExpr = (AbstractFunctionCallExpression) expr;
         FunctionIdentifier funcIdent = funcExpr.getFunctionIdentifier();
-        if (!funcIdent.equals(AsterixBuiltinFunctions.EXTERNAL_LOOKUP)) {
+        if (!funcIdent.equals(BuiltinFunctions.EXTERNAL_LOOKUP)) {
             return;
         }
         int[] ridIndexes = getKeyIndexes(ridVarList, inputSchemas);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/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 0d8c940..8bb1b22 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
@@ -22,10 +22,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.asterix.common.config.AsterixStorageProperties;
+import org.apache.asterix.common.config.StorageProperties;
 import org.apache.asterix.common.context.AsterixVirtualBufferCacheProvider;
-import org.apache.asterix.common.dataflow.AsterixLSMIndexUtil;
-import org.apache.asterix.common.dataflow.IAsterixApplicationContextInfo;
+import org.apache.asterix.common.dataflow.IApplicationContextInfo;
+import org.apache.asterix.common.dataflow.LSMIndexUtil;
 import org.apache.asterix.common.ioopcallbacks.LSMInvertedIndexIOOperationCallbackFactory;
 import org.apache.asterix.metadata.MetadataException;
 import org.apache.asterix.metadata.MetadataManager;
@@ -36,7 +36,7 @@ import org.apache.asterix.metadata.entities.Index;
 import org.apache.asterix.metadata.utils.DatasetUtils;
 import org.apache.asterix.om.base.IAObject;
 import org.apache.asterix.om.constants.AsterixConstantValue;
-import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.asterix.om.types.ARecordType;
 import org.apache.asterix.om.types.ATypeTag;
 import org.apache.asterix.om.types.IAType;
@@ -44,8 +44,8 @@ import org.apache.asterix.om.util.NonTaggedFormatUtil;
 import org.apache.asterix.optimizer.rules.am.InvertedIndexAccessMethod;
 import org.apache.asterix.optimizer.rules.am.InvertedIndexAccessMethod.SearchModifierType;
 import org.apache.asterix.optimizer.rules.am.InvertedIndexJobGenParams;
-import org.apache.asterix.runtime.util.AsterixAppContextInfo;
-import org.apache.asterix.runtime.util.AsterixRuntimeComponentsProvider;
+import org.apache.asterix.runtime.util.AppContextInfo;
+import org.apache.asterix.runtime.util.RuntimeComponentsProvider;
 import org.apache.asterix.transaction.management.opcallbacks.SecondaryIndexOperationTrackerProvider;
 import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
 import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -116,7 +116,7 @@ public class InvertedIndexPOperator extends IndexSearchPOperator {
             throw new IllegalStateException();
         }
         AbstractFunctionCallExpression unnestFuncExpr = (AbstractFunctionCallExpression) unnestExpr;
-        if (unnestFuncExpr.getFunctionIdentifier() != AsterixBuiltinFunctions.INDEX_SEARCH) {
+        if (unnestFuncExpr.getFunctionIdentifier() != BuiltinFunctions.INDEX_SEARCH) {
             return;
         }
         InvertedIndexJobGenParams jobGenParams = new InvertedIndexJobGenParams();
@@ -246,7 +246,7 @@ public class InvertedIndexPOperator extends IndexSearchPOperator {
                 }
             }
 
-            IAsterixApplicationContextInfo appContext = (IAsterixApplicationContextInfo) context.getAppContext();
+            IApplicationContextInfo appContext = (IApplicationContextInfo) context.getAppContext();
             Pair<IFileSplitProvider, AlgebricksPartitionConstraint> secondarySplitsAndConstraint = metadataProvider
                     .splitProviderAndPartitionConstraintsForDataset(dataset.getDataverseName(), datasetName, indexName,
                             dataset.getDatasetDetails().isTemp());
@@ -259,7 +259,7 @@ public class InvertedIndexPOperator extends IndexSearchPOperator {
                     .getBinaryTokenizerFactory(searchModifierType, searchKeyType, secondaryIndex);
             IIndexDataflowHelperFactory dataflowHelperFactory;
 
-            AsterixStorageProperties storageProperties = AsterixAppContextInfo.INSTANCE.getStorageProperties();
+            StorageProperties storageProperties = AppContextInfo.INSTANCE.getStorageProperties();
             Pair<ILSMMergePolicyFactory, Map<String, String>> compactionInfo = DatasetUtils
                     .getMergePolicyFactory(dataset, metadataProvider.getMetadataTxnContext());
             boolean temp = dataset.getDatasetDetails().isTemp();
@@ -267,7 +267,7 @@ public class InvertedIndexPOperator extends IndexSearchPOperator {
                 dataflowHelperFactory = new LSMInvertedIndexDataflowHelperFactory(
                         new AsterixVirtualBufferCacheProvider(dataset.getDatasetId()), compactionInfo.first,
                         compactionInfo.second, new SecondaryIndexOperationTrackerProvider(dataset.getDatasetId()),
-                        AsterixRuntimeComponentsProvider.RUNTIME_PROVIDER,
+                        RuntimeComponentsProvider.RUNTIME_PROVIDER,
                         LSMInvertedIndexIOOperationCallbackFactory.INSTANCE,
                         storageProperties.getBloomFilterFalsePositiveRate(), invertedIndexFields, filterTypeTraits,
                         filterCmpFactories, filterFields, filterFieldsForNonBulkLoadOps,
@@ -276,7 +276,7 @@ public class InvertedIndexPOperator extends IndexSearchPOperator {
                 dataflowHelperFactory = new PartitionedLSMInvertedIndexDataflowHelperFactory(
                         new AsterixVirtualBufferCacheProvider(dataset.getDatasetId()), compactionInfo.first,
                         compactionInfo.second, new SecondaryIndexOperationTrackerProvider(dataset.getDatasetId()),
-                        AsterixRuntimeComponentsProvider.RUNTIME_PROVIDER,
+                        RuntimeComponentsProvider.RUNTIME_PROVIDER,
                         LSMInvertedIndexIOOperationCallbackFactory.INSTANCE,
                         storageProperties.getBloomFilterFalsePositiveRate(), invertedIndexFields, filterTypeTraits,
                         filterCmpFactories, filterFields, filterFieldsForNonBulkLoadOps,
@@ -288,7 +288,7 @@ public class InvertedIndexPOperator extends IndexSearchPOperator {
                     invListsTypeTraits, invListsComparatorFactories, dataflowHelperFactory, queryTokenizerFactory,
                     searchModifierFactory, outputRecDesc, retainInput, retainMissing, context.getMissingWriterFactory(),
                     NoOpOperationCallbackFactory.INSTANCE, minFilterFieldIndexes, maxFilterFieldIndexes,
-                    AsterixLSMIndexUtil.getMetadataPageManagerFactory());
+                    LSMIndexUtil.getMetadataPageManagerFactory());
             return new Pair<>(invIndexSearchOp, secondarySplitsAndConstraint.second);
         } catch (MetadataException e) {
             throw new AlgebricksException(e);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/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 ca915c0..f9d4c80 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
@@ -24,7 +24,7 @@ import java.util.List;
 import org.apache.asterix.metadata.declared.DataSourceId;
 import org.apache.asterix.metadata.declared.MetadataProvider;
 import org.apache.asterix.metadata.entities.Dataset;
-import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.asterix.optimizer.rules.am.RTreeJobGenParams;
 import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
 import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -74,7 +74,7 @@ public class RTreeSearchPOperator extends IndexSearchPOperator {
         }
         AbstractFunctionCallExpression unnestFuncExpr = (AbstractFunctionCallExpression) unnestExpr;
         FunctionIdentifier funcIdent = unnestFuncExpr.getFunctionIdentifier();
-        if (!funcIdent.equals(AsterixBuiltinFunctions.INDEX_SEARCH)) {
+        if (!funcIdent.equals(BuiltinFunctions.INDEX_SEARCH)) {
             return;
         }
         RTreeJobGenParams jobGenParams = new RTreeJobGenParams();

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/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 37f59dd..54bb0bd 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
@@ -23,7 +23,7 @@ import java.util.List;
 import org.apache.asterix.common.functions.FunctionDescriptorTag;
 import org.apache.asterix.external.library.ExternalFunctionDescriptorProvider;
 import org.apache.asterix.formats.base.IDataFormat;
-import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.asterix.om.functions.IExternalFunctionInfo;
 import org.apache.asterix.om.functions.IFunctionDescriptor;
 import org.apache.asterix.runtime.formats.FormatUtils;
@@ -170,8 +170,8 @@ public class QueryLogicalExpressionJobGen implements ILogicalExpressionJobGen {
 
         switch (fd.getFunctionDescriptorTag()) {
             case AGGREGATE: {
-                if (AsterixBuiltinFunctions.isAggregateFunctionSerializable(fd.getIdentifier())) {
-                    AggregateFunctionCallExpression serialAggExpr = AsterixBuiltinFunctions
+                if (BuiltinFunctions.isAggregateFunctionSerializable(fd.getIdentifier())) {
+                    AggregateFunctionCallExpression serialAggExpr = BuiltinFunctions
                             .makeSerializableAggregateFunctionExpression(fd.getIdentifier(), expr.getArguments());
                     IFunctionDescriptor afdd = getFunctionDescriptor(serialAggExpr, env, context);
                     return afdd.createSerializableAggregateEvaluatorFactory(args);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AnalysisUtil.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AnalysisUtil.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AnalysisUtil.java
index 902da21..24fe8e78 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AnalysisUtil.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AnalysisUtil.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.asterix.metadata.declared.DataSourceId;
-import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.asterix.optimizer.rules.am.AccessMethodUtils;
 import org.apache.commons.lang3.mutable.Mutable;
 import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -89,7 +89,7 @@ public class AnalysisUtil {
             return false;
         }
         AbstractFunctionCallExpression fe = (AbstractFunctionCallExpression) e;
-        return AsterixBuiltinFunctions.isDatasetFunction(fe.getFunctionIdentifier());
+        return BuiltinFunctions.isDatasetFunction(fe.getFunctionIdentifier());
     }
 
     public static boolean isRunnableAccessToFieldRecord(ILogicalExpression expr) {
@@ -107,7 +107,7 @@ public class AnalysisUtil {
         if (expr.getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL) {
             AbstractFunctionCallExpression fc = (AbstractFunctionCallExpression) expr;
             FunctionIdentifier fid = fc.getFunctionIdentifier();
-            if (fid.equals(AsterixBuiltinFunctions.FIELD_ACCESS_BY_NAME)) {
+            if (fid.equals(BuiltinFunctions.FIELD_ACCESS_BY_NAME)) {
                 return true;
             }
         }
@@ -118,9 +118,9 @@ public class AnalysisUtil {
         if (expr.getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL) {
             AbstractFunctionCallExpression fc = (AbstractFunctionCallExpression) expr;
             FunctionIdentifier fid = fc.getFunctionIdentifier();
-            if (fid.equals(AsterixBuiltinFunctions.FIELD_ACCESS_BY_INDEX)
-                    || fid.equals(AsterixBuiltinFunctions.FIELD_ACCESS_BY_NAME)
-                    || fid.equals(AsterixBuiltinFunctions.FIELD_ACCESS_NESTED)) {
+            if (fid.equals(BuiltinFunctions.FIELD_ACCESS_BY_INDEX)
+                    || fid.equals(BuiltinFunctions.FIELD_ACCESS_BY_NAME)
+                    || fid.equals(BuiltinFunctions.FIELD_ACCESS_NESTED)) {
                 return true;
             }
         }
@@ -142,9 +142,9 @@ public class AnalysisUtil {
     private static List<FunctionIdentifier> fieldAccessFunctions = new ArrayList<FunctionIdentifier>();
 
     static {
-        fieldAccessFunctions.add(AsterixBuiltinFunctions.GET_DATA);
-        fieldAccessFunctions.add(AsterixBuiltinFunctions.GET_HANDLE);
-        fieldAccessFunctions.add(AsterixBuiltinFunctions.TYPE_OF);
+        fieldAccessFunctions.add(BuiltinFunctions.GET_DATA);
+        fieldAccessFunctions.add(BuiltinFunctions.GET_HANDLE);
+        fieldAccessFunctions.add(BuiltinFunctions.TYPE_OF);
     }
 
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/FuzzyUtils.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/FuzzyUtils.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/FuzzyUtils.java
index f8182d3..42a9c25 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/FuzzyUtils.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/FuzzyUtils.java
@@ -25,7 +25,7 @@ import org.apache.asterix.metadata.declared.MetadataProvider;
 import org.apache.asterix.om.base.AFloat;
 import org.apache.asterix.om.base.AInt32;
 import org.apache.asterix.om.base.IAObject;
-import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.asterix.om.types.ATypeTag;
 import org.apache.commons.lang3.mutable.Mutable;
 import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
@@ -49,7 +49,7 @@ public class FuzzyUtils {
     public static FunctionIdentifier getTokenizer(ATypeTag inputTag) {
         switch (inputTag) {
             case STRING:
-                return AsterixBuiltinFunctions.COUNTHASHED_WORD_TOKENS;
+                return BuiltinFunctions.COUNTHASHED_WORD_TOKENS;
             case UNORDEREDLIST:
             case ORDEREDLIST:
             case ANY:
@@ -82,9 +82,9 @@ public class FuzzyUtils {
 
     public static FunctionIdentifier getFunctionIdentifier(String simFuncName) {
         if (simFuncName.equals(JACCARD_FUNCTION_NAME)) {
-            return AsterixBuiltinFunctions.SIMILARITY_JACCARD;
+            return BuiltinFunctions.SIMILARITY_JACCARD;
         } else if (simFuncName.equals(EDIT_DISTANCE_FUNCTION_NAME)) {
-            return AsterixBuiltinFunctions.EDIT_DISTANCE;
+            return BuiltinFunctions.EDIT_DISTANCE;
         }
         return null;
     }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/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 ac47b58..b9b5340 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
@@ -27,7 +27,7 @@ import java.util.Map;
 import org.apache.asterix.lang.common.util.FunctionUtil;
 import org.apache.asterix.om.base.AInt32;
 import org.apache.asterix.om.constants.AsterixConstantValue;
-import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.commons.lang3.mutable.Mutable;
 import org.apache.commons.lang3.mutable.MutableObject;
 import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -88,8 +88,8 @@ public class AddEquivalenceClassForRecordConstructorRule implements IAlgebraicRe
             if (expr.getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL) {
                 AbstractFunctionCallExpression funcExpr = (AbstractFunctionCallExpression) expr;
                 FunctionIdentifier fid = funcExpr.getFunctionIdentifier();
-                if (fid == AsterixBuiltinFunctions.CLOSED_RECORD_CONSTRUCTOR
-                        || fid == AsterixBuiltinFunctions.OPEN_RECORD_CONSTRUCTOR) {
+                if (fid == BuiltinFunctions.CLOSED_RECORD_CONSTRUCTOR
+                        || fid == BuiltinFunctions.OPEN_RECORD_CONSTRUCTOR) {
                     changed |= propagateEquivalenceClassesForRecordConstructor(vars.get(exprIndex), funcExpr, assignOp,
                             context);
                 }
@@ -116,7 +116,7 @@ public class AddEquivalenceClassForRecordConstructorRule implements IAlgebraicRe
                     context.putEquivalenceClassMap(assignOp, ecs);
                 }
                 ILogicalExpression expr = new ScalarFunctionCallExpression(
-                        FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.FIELD_ACCESS_BY_INDEX),
+                        FunctionUtil.getFunctionInfo(BuiltinFunctions.FIELD_ACCESS_BY_INDEX),
                         new MutableObject<ILogicalExpression>(new VariableReferenceExpression(recordVar)),
                         new MutableObject<ILogicalExpression>(
                                 new ConstantExpression(new AsterixConstantValue(new AInt32(parameterIndex / 2))))); // Every two parameters corresponds to a field.

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AsterixExtractFunctionsFromJoinConditionRule.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AsterixExtractFunctionsFromJoinConditionRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AsterixExtractFunctionsFromJoinConditionRule.java
index b339778..0124d25 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AsterixExtractFunctionsFromJoinConditionRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AsterixExtractFunctionsFromJoinConditionRule.java
@@ -18,7 +18,7 @@
  */
 package org.apache.asterix.optimizer.rules;
 
-import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
 import org.apache.hyracks.algebricks.rewriter.rules.ExtractFunctionsFromJoinConditionRule;
 
@@ -26,12 +26,12 @@ public class AsterixExtractFunctionsFromJoinConditionRule extends ExtractFunctio
 
     @Override
     protected boolean processArgumentsToFunction(FunctionIdentifier fi) {
-        return fi.equals(AsterixBuiltinFunctions.GET_ITEM);
+        return fi.equals(BuiltinFunctions.GET_ITEM);
     }
 
     @Override
     protected boolean isComparisonFunction(FunctionIdentifier fi) {
-        return AsterixBuiltinFunctions.isSimilarityFunction(fi);
+        return BuiltinFunctions.isSimilarityFunction(fi);
     }
 
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AsterixInlineVariablesRule.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AsterixInlineVariablesRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AsterixInlineVariablesRule.java
index 74640a6..100ed58 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AsterixInlineVariablesRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/AsterixInlineVariablesRule.java
@@ -18,7 +18,7 @@
  */
 package org.apache.asterix.optimizer.rules;
 
-import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.hyracks.algebricks.rewriter.rules.InlineVariablesRule;
 
 public class AsterixInlineVariablesRule extends InlineVariablesRule {
@@ -27,16 +27,16 @@ public class AsterixInlineVariablesRule extends InlineVariablesRule {
         // Do not inline field accesses and spatial functions because doing so would interfere with our access method rewrites.
         // TODO: For now we must also exclude record constructor functions to avoid breaking our type casting rules
         // IntroduceStaticTypeCastRule and IntroduceDynamicTypeCastRule.
-        doNotInlineFuncs.add(AsterixBuiltinFunctions.FIELD_ACCESS_BY_NAME);
-        doNotInlineFuncs.add(AsterixBuiltinFunctions.FIELD_ACCESS_BY_INDEX);
-        doNotInlineFuncs.add(AsterixBuiltinFunctions.CLOSED_RECORD_CONSTRUCTOR);
-        doNotInlineFuncs.add(AsterixBuiltinFunctions.OPEN_RECORD_CONSTRUCTOR);
-        doNotInlineFuncs.add(AsterixBuiltinFunctions.CAST_TYPE);
-        doNotInlineFuncs.add(AsterixBuiltinFunctions.CREATE_CIRCLE);
-        doNotInlineFuncs.add(AsterixBuiltinFunctions.CREATE_LINE);
-        doNotInlineFuncs.add(AsterixBuiltinFunctions.CREATE_MBR);
-        doNotInlineFuncs.add(AsterixBuiltinFunctions.CREATE_POINT);
-        doNotInlineFuncs.add(AsterixBuiltinFunctions.CREATE_POLYGON);
-        doNotInlineFuncs.add(AsterixBuiltinFunctions.CREATE_RECTANGLE);
+        doNotInlineFuncs.add(BuiltinFunctions.FIELD_ACCESS_BY_NAME);
+        doNotInlineFuncs.add(BuiltinFunctions.FIELD_ACCESS_BY_INDEX);
+        doNotInlineFuncs.add(BuiltinFunctions.CLOSED_RECORD_CONSTRUCTOR);
+        doNotInlineFuncs.add(BuiltinFunctions.OPEN_RECORD_CONSTRUCTOR);
+        doNotInlineFuncs.add(BuiltinFunctions.CAST_TYPE);
+        doNotInlineFuncs.add(BuiltinFunctions.CREATE_CIRCLE);
+        doNotInlineFuncs.add(BuiltinFunctions.CREATE_LINE);
+        doNotInlineFuncs.add(BuiltinFunctions.CREATE_MBR);
+        doNotInlineFuncs.add(BuiltinFunctions.CREATE_POINT);
+        doNotInlineFuncs.add(BuiltinFunctions.CREATE_POLYGON);
+        doNotInlineFuncs.add(BuiltinFunctions.CREATE_RECTANGLE);
     }
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/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 98fb0ef..ca54904 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
@@ -24,7 +24,7 @@ import java.util.List;
 import org.apache.commons.lang3.mutable.Mutable;
 import org.apache.commons.lang3.mutable.MutableObject;
 
-import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
 import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
 import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
@@ -43,7 +43,7 @@ public class AsterixIntroduceGroupByCombinerRule extends AbstractIntroduceGroupB
     @Override
     protected void processNullTest(IOptimizationContext context, GroupByOperator nestedGby,
             List<LogicalVariable> aggregateVarsProducedByCombiner) {
-        IFunctionInfo finfoEq = context.getMetadataProvider().lookupFunction(AsterixBuiltinFunctions.IS_SYSTEM_NULL);
+        IFunctionInfo finfoEq = context.getMetadataProvider().lookupFunction(BuiltinFunctions.IS_SYSTEM_NULL);
         SelectOperator selectNonSystemNull;
 
         if (aggregateVarsProducedByCombiner.size() == 1) {

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/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 677e65f..957e164 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
@@ -21,9 +21,9 @@ package org.apache.asterix.optimizer.rules;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.asterix.algebra.base.AsterixOperatorAnnotations;
+import org.apache.asterix.algebra.base.OperatorAnnotation;
 import org.apache.asterix.lang.common.util.FunctionUtil;
-import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.commons.lang3.mutable.Mutable;
 import org.apache.commons.lang3.mutable.MutableObject;
 import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
@@ -53,7 +53,7 @@ public class ByNameToByHandleFieldAccessRule implements IAlgebraicRewriteRule {
             return false;
         }
         AssignOperator assign = (AssignOperator) op;
-        if (assign.getAnnotations().get(AsterixOperatorAnnotations.PUSHED_FIELD_ACCESS) == null) {
+        if (assign.getAnnotations().get(OperatorAnnotation.PUSHED_FIELD_ACCESS) == null) {
             return false;
         }
         byNameToByHandle(assign, context);
@@ -85,7 +85,7 @@ public class ByNameToByHandleFieldAccessRule implements IAlgebraicRewriteRule {
         LogicalVariable t = context.newVar();
 
         AbstractFunctionCallExpression typeOf = new ScalarFunctionCallExpression(
-                FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.TYPE_OF));
+                FunctionUtil.getFunctionInfo(BuiltinFunctions.TYPE_OF));
         typeOf.getArguments().add(new MutableObject<ILogicalExpression>(x));
         AssignOperator typAssign = new AssignOperator(t, new MutableObject<ILogicalExpression>(typeOf));
         typAssign.getInputs().add(opUnder);
@@ -93,7 +93,7 @@ public class ByNameToByHandleFieldAccessRule implements IAlgebraicRewriteRule {
         // let $w := get-handle($t, path-expression)
         LogicalVariable w = context.newVar();
         AbstractFunctionCallExpression getHandle = new ScalarFunctionCallExpression(
-                FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.GET_HANDLE));
+                FunctionUtil.getFunctionInfo(BuiltinFunctions.GET_HANDLE));
         getHandle.getArguments().add(new MutableObject<ILogicalExpression>(new VariableReferenceExpression(t)));
         // the accessed field
         getHandle.getArguments().add(new MutableObject<ILogicalExpression>(fce.getArguments().get(1).getValue()));
@@ -102,7 +102,7 @@ public class ByNameToByHandleFieldAccessRule implements IAlgebraicRewriteRule {
 
         // let $y := get-data(x, $w)
         AbstractFunctionCallExpression getData = new ScalarFunctionCallExpression(
-                FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.GET_DATA));
+                FunctionUtil.getFunctionInfo(BuiltinFunctions.GET_DATA));
         VariableReferenceExpression ref2 = new VariableReferenceExpression(x.getVariableReference());
         getData.getArguments().add(new MutableObject<ILogicalExpression>(ref2));
         getData.getArguments().add(new MutableObject<ILogicalExpression>(new VariableReferenceExpression(w)));
@@ -113,7 +113,7 @@ public class ByNameToByHandleFieldAccessRule implements IAlgebraicRewriteRule {
 
         // fieldAccess.setAnnotation(OperatorAnnotation.FIELD_ACCESS,
         // fce.getArguments().get(0));
-        fieldAccessOp.removeAnnotation(AsterixOperatorAnnotations.PUSHED_FIELD_ACCESS);
+        fieldAccessOp.removeAnnotation(OperatorAnnotation.PUSHED_FIELD_ACCESS);
     }
 
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/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 3ba7084..be8a14b 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
@@ -22,12 +22,12 @@ package org.apache.asterix.optimizer.rules;
 import java.util.ArrayList;
 import java.util.Collections;
 
-import org.apache.asterix.algebra.base.AsterixOperatorAnnotations;
+import org.apache.asterix.algebra.base.OperatorAnnotation;
 import org.apache.asterix.om.util.ConstantExpressionUtil;
 import org.apache.asterix.lang.common.util.FunctionUtil;
 import org.apache.asterix.om.base.AInt32;
 import org.apache.asterix.om.constants.AsterixConstantValue;
-import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.asterix.om.types.ARecordType;
 import org.apache.asterix.om.types.ATypeTag;
 import org.apache.asterix.om.types.AUnionType;
@@ -61,7 +61,7 @@ public class ByNameToByIndexFieldAccessRule implements IAlgebraicRewriteRule {
             throws AlgebricksException {
         ILogicalOperator op = opRef.getValue();
         if (op.acceptExpressionTransform(exprRef -> rewriteExpressionReference(op, exprRef, context))) {
-            op.removeAnnotation(AsterixOperatorAnnotations.PUSHED_FIELD_ACCESS);
+            op.removeAnnotation(OperatorAnnotation.PUSHED_FIELD_ACCESS);
             context.computeAndSetTypeEnvironmentForOperator(op);
             return true;
         }
@@ -83,7 +83,7 @@ public class ByNameToByIndexFieldAccessRule implements IAlgebraicRewriteRule {
             }
         }
         AbstractFunctionCallExpression fce = (AbstractFunctionCallExpression) expr;
-        if (fce.getFunctionIdentifier() != AsterixBuiltinFunctions.FIELD_ACCESS_BY_NAME) {
+        if (fce.getFunctionIdentifier() != BuiltinFunctions.FIELD_ACCESS_BY_NAME) {
             return changed;
         }
         changed |= extractFirstArg(fce, op, context);
@@ -149,7 +149,7 @@ public class ByNameToByIndexFieldAccessRule implements IAlgebraicRewriteRule {
             return null;
         }
         return new ScalarFunctionCallExpression(
-                FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.FIELD_ACCESS_BY_INDEX), fce.getArguments().get(0),
+                FunctionUtil.getFunctionInfo(BuiltinFunctions.FIELD_ACCESS_BY_INDEX), fce.getArguments().get(0),
                 new MutableObject<>(new ConstantExpression(new AsterixConstantValue(new AInt32(k)))));
     }
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/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 2de6bc4..cf926d1 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
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.asterix.lang.common.util.FunctionUtil;
-import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.commons.lang3.mutable.Mutable;
 import org.apache.commons.lang3.mutable.MutableObject;
 import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -153,7 +153,7 @@ public class CancelUnnestWithNestedListifyRule implements IAlgebraicRewriteRule
                 break;
             case FUNCTION_CALL:
                 if (((AbstractFunctionCallExpression) expr)
-                        .getFunctionIdentifier() != AsterixBuiltinFunctions.SCAN_COLLECTION) {
+                        .getFunctionIdentifier() != BuiltinFunctions.SCAN_COLLECTION) {
                     return false;
                 }
                 AbstractFunctionCallExpression functionCall = (AbstractFunctionCallExpression) expr;
@@ -210,7 +210,7 @@ public class CancelUnnestWithNestedListifyRule implements IAlgebraicRewriteRule
             return false;
         }
         AbstractFunctionCallExpression f = (AbstractFunctionCallExpression) aggFun;
-        if (!AsterixBuiltinFunctions.LISTIFY.equals(f.getFunctionIdentifier())) {
+        if (!BuiltinFunctions.LISTIFY.equals(f.getFunctionIdentifier())) {
             return false;
         }
         if (f.getArguments().size() != 1) {
@@ -273,7 +273,7 @@ public class CancelUnnestWithNestedListifyRule implements IAlgebraicRewriteRule
             List<Mutable<ILogicalExpression>> raggExprs = new ArrayList<Mutable<ILogicalExpression>>();
             raggVars.add(posVar);
             StatefulFunctionCallExpression fce = new StatefulFunctionCallExpression(
-                    FunctionUtil.getFunctionInfo(AsterixBuiltinFunctions.TID), UnpartitionedPropertyComputer.INSTANCE);
+                    FunctionUtil.getFunctionInfo(BuiltinFunctions.TID), UnpartitionedPropertyComputer.INSTANCE);
             raggExprs.add(new MutableObject<ILogicalExpression>(fce));
             RunningAggregateOperator raggOp = new RunningAggregateOperator(raggVars, raggExprs);
             raggOp.setExecutionMode(unnest1.getExecutionMode());

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f76d9c37/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java
index a49f0e8..d2982e8 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java
@@ -37,7 +37,7 @@ import org.apache.asterix.formats.nontagged.TypeTraitProvider;
 import org.apache.asterix.jobgen.QueryLogicalExpressionJobGen;
 import org.apache.asterix.om.base.IAObject;
 import org.apache.asterix.om.constants.AsterixConstantValue;
-import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.BuiltinFunctions;
 import org.apache.asterix.om.typecomputer.base.TypeCastUtils;
 import org.apache.asterix.om.types.ARecordType;
 import org.apache.asterix.om.types.ATypeTag;
@@ -84,12 +84,12 @@ public class ConstantFoldingRule implements IAlgebraicRewriteRule {
     // Function Identifier sets that the ConstantFolding rule should skip to apply.
     // Most of them are record-related functions.
     private static final ImmutableSet<FunctionIdentifier> FUNC_ID_SET_THAT_SHOULD_NOT_BE_APPLIED =
-            ImmutableSet.of(AsterixBuiltinFunctions.RECORD_MERGE, AsterixBuiltinFunctions.ADD_FIELDS,
-                    AsterixBuiltinFunctions.REMOVE_FIELDS, AsterixBuiltinFunctions.GET_RECORD_FIELDS,
-                    AsterixBuiltinFunctions.GET_RECORD_FIELD_VALUE, AsterixBuiltinFunctions.FIELD_ACCESS_NESTED,
-                    AsterixBuiltinFunctions.GET_ITEM, AsterixBuiltinFunctions.OPEN_RECORD_CONSTRUCTOR,
-                    AsterixBuiltinFunctions.FIELD_ACCESS_BY_INDEX, AsterixBuiltinFunctions.CAST_TYPE,
-                    AsterixBuiltinFunctions.META, AsterixBuiltinFunctions.META_KEY);
+            ImmutableSet.of(BuiltinFunctions.RECORD_MERGE, BuiltinFunctions.ADD_FIELDS,
+                    BuiltinFunctions.REMOVE_FIELDS, BuiltinFunctions.GET_RECORD_FIELDS,
+                    BuiltinFunctions.GET_RECORD_FIELD_VALUE, BuiltinFunctions.FIELD_ACCESS_NESTED,
+                    BuiltinFunctions.GET_ITEM, BuiltinFunctions.OPEN_RECORD_CONSTRUCTOR,
+                    BuiltinFunctions.FIELD_ACCESS_BY_INDEX, BuiltinFunctions.CAST_TYPE,
+                    BuiltinFunctions.META, BuiltinFunctions.META_KEY);
 
     /** Throws exceptions in substituiteProducedVariable, setVarType, and one getVarType method. */
     private static final IVariableTypeEnvironment _emptyTypeEnv = new IVariableTypeEnvironment() {
@@ -191,8 +191,8 @@ public class ConstantFoldingRule implements IAlgebraicRewriteRule {
             }
 
             //Current List SerDe assumes a strongly typed list, so we do not constant fold the list constructors if they are not strongly typed
-            if (expr.getFunctionIdentifier().equals(AsterixBuiltinFunctions.UNORDERED_LIST_CONSTRUCTOR)
-                    || expr.getFunctionIdentifier().equals(AsterixBuiltinFunctions.ORDERED_LIST_CONSTRUCTOR)) {
+            if (expr.getFunctionIdentifier().equals(BuiltinFunctions.UNORDERED_LIST_CONSTRUCTOR)
+                    || expr.getFunctionIdentifier().equals(BuiltinFunctions.ORDERED_LIST_CONSTRUCTOR)) {
                 AbstractCollectionType listType = (AbstractCollectionType) TypeCastUtils.getRequiredType(expr);
                 if (listType != null && (listType.getItemType().getTypeTag() == ATypeTag.ANY
                         || listType.getItemType() instanceof AbstractCollectionType)) {
@@ -202,7 +202,7 @@ public class ConstantFoldingRule implements IAlgebraicRewriteRule {
                     return new Pair<Boolean, ILogicalExpression>(false, null);
                 }
             }
-            if (expr.getFunctionIdentifier().equals(AsterixBuiltinFunctions.FIELD_ACCESS_BY_NAME)) {
+            if (expr.getFunctionIdentifier().equals(BuiltinFunctions.FIELD_ACCESS_BY_NAME)) {
                 ARecordType rt = (ARecordType) _emptyTypeEnv.getType(expr.getArguments().get(0).getValue());
                 String str = ConstantExpressionUtil.getStringConstant(expr.getArguments().get(1).getValue());
                 int k = rt.getFieldIndex(str);


Mime
View raw message